diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index a7af9d7f6324..0782826a4dc9 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -281,9 +281,10 @@
//update the datacore records! This is goig to be a bit costly.
var/mob_ref = WEAKREF(src)
for(var/list/L in list(GLOB.data_core.general, GLOB.data_core.medical, GLOB.data_core.security, GLOB.data_core.locked))
- for(var/datum/data/record/R in L)
- if(R.fields["ref"] == mob_ref)
- R.fields["name"] = newname
+ for(var/datum/data/record/record_entry in L)
+ if(record_entry.fields["ref"] == mob_ref)
+ record_entry.fields["name"] = newname
+ record_entry.name = newname
break
//update our pda and id if we have them on our person
diff --git a/code/controllers/subsystem/nanoui.dm b/code/controllers/subsystem/nanoui.dm
index d89474dd50f1..85ad0d32aaf4 100644
--- a/code/controllers/subsystem/nanoui.dm
+++ b/code/controllers/subsystem/nanoui.dm
@@ -1,5 +1,6 @@
SUBSYSTEM_DEF(nano)
name = "Nano UI"
+ flags = SS_NO_INIT
wait = 2 SECONDS
priority = SS_PRIORITY_NANOUI
runlevels = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY
diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm
index 1d04692c0360..607a6e517a7c 100644
--- a/code/datums/ammo/misc.dm
+++ b/code/datums/ammo/misc.dm
@@ -191,7 +191,7 @@
for(var/obj/item/reagent_container/food/drinks/cans/souto/S in P.contents)
M.put_in_active_hand(S)
for(var/mob/O in viewers(GLOB.world_view_size, P)) //find all people in view.
- O.show_message(SPAN_DANGER("[M] catches the [S]!"), SHOW_MESSAGE_VISIBLE) //Tell them the can was caught.
+ O.show_message(SPAN_DANGER("[M] catches [S]!"), SHOW_MESSAGE_VISIBLE) //Tell them the can was caught.
return //Can was caught.
if(ishuman(M))
var/mob/living/carbon/human/H = M
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 02cbc5b2d019..933b547aa1f2 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -32,12 +32,12 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
)
departments += marines_by_squad
var/list/manifest_out = list()
- for(var/datum/data/record/t in GLOB.data_core.general)
- if(t.fields["mob_faction"] != FACTION_MARINE) //we process only USCM humans
+ for(var/datum/data/record/record_entry in GLOB.data_core.general)
+ if(record_entry.fields["mob_faction"] != FACTION_MARINE) //we process only USCM humans
continue
- var/name = t.fields["name"]
- var/rank = t.fields["rank"]
- var/squad = t.fields["squad"]
+ var/name = record_entry.fields["name"]
+ var/rank = record_entry.fields["rank"]
+ var/squad = record_entry.fields["squad"]
if(isnull(name) || isnull(rank))
continue
var/has_department = FALSE
@@ -85,14 +85,14 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
var/dept_flags = NO_FLAGS //Is there anybody in the department?.
var/list/squad_sublists = GLOB.ROLES_SQUAD_ALL.Copy() //Are there any marines in the squad?
- for(var/datum/data/record/t in GLOB.data_core.general)
- if(t.fields["mob_faction"] != FACTION_MARINE) //we process only USCM humans
+ for(var/datum/data/record/record_entry in GLOB.data_core.general)
+ if(record_entry.fields["mob_faction"] != FACTION_MARINE) //we process only USCM humans
continue
- var/name = t.fields["name"]
- var/rank = t.fields["rank"]
- var/real_rank = t.fields["real_rank"]
- var/squad_name = t.fields["squad"]
+ var/name = record_entry.fields["name"]
+ var/rank = record_entry.fields["rank"]
+ var/real_rank = record_entry.fields["real_rank"]
+ var/squad_name = record_entry.fields["squad"]
if(isnull(name) || isnull(rank) || isnull(real_rank))
continue
@@ -104,7 +104,7 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
break
isactive[name] = active ? "Active" : "Inactive"
else
- isactive[name] = t.fields["p_stat"]
+ isactive[name] = record_entry.fields["p_stat"]
//cael - to prevent multiple appearances of a player/job combination, add a continue after each line
if(real_rank in GLOB.ROLES_CIC)
@@ -216,14 +216,14 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
var/datum/data/record/foundrecord
var/use_name = isnull(ref)
- for(var/datum/data/record/t in GLOB.data_core.general)
+ for(var/datum/data/record/record_entry in GLOB.data_core.general)
if(use_name)
- if(t.fields["name"] == name)
- foundrecord = t
+ if(record_entry.fields["name"] == name)
+ foundrecord = record_entry
break
else
- if(t.fields["ref"] == ref)
- foundrecord = t
+ if(record_entry.fields["ref"] == ref)
+ foundrecord = record_entry
break
if(foundrecord)
@@ -239,102 +239,106 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
return TRUE
return FALSE
-/datum/datacore/proc/manifest_inject(mob/living/carbon/human/H)
+/datum/datacore/proc/manifest_inject(mob/living/carbon/human/target)
var/assignment
- if(H.job)
- assignment = H.job
+ if(target.job)
+ assignment = target.job
else
assignment = "Unassigned"
- var/id = add_zero(num2hex(H.gid), 6) //this was the best they could come up with? A large random number? *sigh*
+ var/id = add_zero(num2hex(target.gid), 6) //this was the best they could come up with? A large random number? *sigh*
//var/icon/front = new(get_id_photo(H), dir = SOUTH)
//var/icon/side = new(get_id_photo(H), dir = WEST)
//General Record
- var/datum/data/record/G = new()
- G.fields["id"] = id
- G.fields["name"] = H.real_name
- G.fields["real_rank"] = H.job
- G.fields["rank"] = assignment
- G.fields["squad"] = H.assigned_squad ? H.assigned_squad.name : null
- G.fields["age"] = H.age
- G.fields["p_stat"] = "Active"
- G.fields["m_stat"] = "Stable"
- G.fields["sex"] = H.gender
- G.fields["species"] = H.get_species()
- G.fields["origin"] = H.origin
- G.fields["faction"] = H.personal_faction
- G.fields["mob_faction"] = H.faction
- G.fields["religion"] = H.religion
- G.fields["ref"] = WEAKREF(H)
- //G.fields["photo_front"] = front
- //G.fields["photo_side"] = side
-
- if(H.gen_record && !jobban_isbanned(H, "Records"))
- G.fields["notes"] = H.gen_record
+ var/datum/data/record/record_general = new()
+ record_general.fields["id"] = id
+ record_general.fields["name"] = target.real_name
+ record_general.name = target.real_name
+ record_general.fields["real_rank"] = target.job
+ record_general.fields["rank"] = assignment
+ record_general.fields["squad"] = target.assigned_squad ? target.assigned_squad.name : null
+ record_general.fields["age"] = target.age
+ record_general.fields["p_stat"] = "Active"
+ record_general.fields["m_stat"] = "Stable"
+ record_general.fields["sex"] = target.gender
+ record_general.fields["species"] = target.get_species()
+ record_general.fields["origin"] = target.origin
+ record_general.fields["faction"] = target.personal_faction
+ record_general.fields["mob_faction"] = target.faction
+ record_general.fields["religion"] = target.religion
+ record_general.fields["ref"] = WEAKREF(target)
+ //record_general.fields["photo_front"] = front
+ //record_general.fields["photo_side"] = side
+
+ if(target.gen_record && !jobban_isbanned(target, "Records"))
+ record_general.fields["notes"] = target.gen_record
else
- G.fields["notes"] = "No notes found."
- general += G
+ record_general.fields["notes"] = "No notes found."
+ general += record_general
//Medical Record
- var/datum/data/record/M = new()
- M.fields["id"] = id
- M.fields["name"] = H.real_name
- M.fields["b_type"] = H.blood_type
- M.fields["mi_dis"] = "None"
- M.fields["mi_dis_d"] = "No minor disabilities have been declared."
- M.fields["ma_dis"] = "None"
- M.fields["ma_dis_d"] = "No major disabilities have been diagnosed."
- M.fields["alg"] = "None"
- M.fields["alg_d"] = "No allergies have been detected in this patient."
- M.fields["cdi"] = "None"
- M.fields["cdi_d"] = "No diseases have been diagnosed at the moment."
- M.fields["last_scan_time"] = null
- M.fields["last_scan_result"] = "No scan data on record" // body scanner results
- M.fields["autodoc_data"] = list()
- M.fields["autodoc_manual"] = list()
- M.fields["ref"] = WEAKREF(H)
-
- if(H.med_record && !jobban_isbanned(H, "Records"))
- M.fields["notes"] = H.med_record
+ var/datum/data/record/record_medical = new()
+ record_medical.fields["id"] = id
+ record_medical.fields["name"] = target.real_name
+ record_medical.name = target.name
+ record_medical.fields["b_type"] = target.blood_type
+ record_medical.fields["mi_dis"] = "None"
+ record_medical.fields["mi_dis_d"] = "No minor disabilities have been declared."
+ record_medical.fields["ma_dis"] = "None"
+ record_medical.fields["ma_dis_d"] = "No major disabilities have been diagnosed."
+ record_medical.fields["alg"] = "None"
+ record_medical.fields["alg_d"] = "No allergies have been detected in this patient."
+ record_medical.fields["cdi"] = "None"
+ record_medical.fields["cdi_d"] = "No diseases have been diagnosed at the moment."
+ record_medical.fields["last_scan_time"] = null
+ record_medical.fields["last_scan_result"] = "No scan data on record" // body scanner results
+ record_medical.fields["autodoc_data"] = list()
+ record_medical.fields["autodoc_manual"] = list()
+ record_medical.fields["ref"] = WEAKREF(target)
+
+ if(target.med_record && !jobban_isbanned(target, "Records"))
+ record_medical.fields["notes"] = target.med_record
else
- M.fields["notes"] = "No notes found."
- medical += M
+ record_medical.fields["notes"] = "No notes found."
+ medical += record_medical
//Security Record
- var/datum/data/record/S = new()
- S.fields["id"] = id
- S.fields["name"] = H.real_name
- S.fields["criminal"] = "None"
- S.fields["incident"] = ""
- S.fields["ref"] = WEAKREF(H)
+ var/datum/data/record/record_security = new()
+ record_security.fields["id"] = id
+ record_security.fields["name"] = target.real_name
+ record_security.name = target.real_name
+ record_security.fields["criminal"] = "None"
+ record_security.fields["incident"] = ""
+ record_security.fields["ref"] = WEAKREF(target)
- if(H.sec_record && !jobban_isbanned(H, "Records"))
- var/new_comment = list("entry" = H.sec_record, "created_by" = list("name" = "\[REDACTED\]", "rank" = "Military Police"), "deleted_by" = null, "deleted_at" = null, "created_at" = "Pre-Deployment")
- S.fields["comments"] = list("1" = new_comment)
- S.fields["notes"] = H.sec_record
- security += S
+ if(target.sec_record && !jobban_isbanned(target, "Records"))
+ var/new_comment = list("entry" = target.sec_record, "created_by" = list("name" = "\[REDACTED\]", "rank" = "Military Police"), "deleted_by" = null, "deleted_at" = null, "created_at" = "Pre-Deployment")
+ record_security.fields["comments"] = list("1" = new_comment)
+ record_security.fields["notes"] = target.sec_record
+ security += record_security
//Locked Record
- var/datum/data/record/L = new()
- L.fields["id"] = md5("[H.real_name][H.job]")
- L.fields["name"] = H.real_name
- L.fields["rank"] = H.job
- L.fields["age"] = H.age
- L.fields["sex"] = H.gender
- L.fields["b_type"] = H.b_type
- L.fields["species"] = H.get_species()
- L.fields["origin"] = H.origin
- L.fields["faction"] = H.personal_faction
- L.fields["religion"] = H.religion
- L.fields["ref"] = WEAKREF(H)
-
- if(H.exploit_record && !jobban_isbanned(H, "Records"))
- L.fields["exploit_record"] = H.exploit_record
+ var/datum/data/record/record_locked = new()
+ record_locked.fields["id"] = md5("[target.real_name][target.job]")
+ record_locked.fields["name"] = target.real_name
+ record_locked.name = target.real_name
+ record_locked.fields["rank"] = target.job
+ record_locked.fields["age"] = target.age
+ record_locked.fields["sex"] = target.gender
+ record_locked.fields["b_type"] = target.b_type
+ record_locked.fields["species"] = target.get_species()
+ record_locked.fields["origin"] = target.origin
+ record_locked.fields["faction"] = target.personal_faction
+ record_locked.fields["religion"] = target.religion
+ record_locked.fields["ref"] = WEAKREF(target)
+
+ if(target.exploit_record && !jobban_isbanned(target, "Records"))
+ record_locked.fields["exploit_record"] = target.exploit_record
else
- L.fields["exploit_record"] = "No additional information acquired."
- locked += L
+ record_locked.fields["exploit_record"] = "No additional information acquired."
+ locked += record_locked
/proc/get_id_photo(mob/living/carbon/human/H)
diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm
index 4e997292f74d..fb8d4b8a5a69 100644
--- a/code/datums/emergency_calls/cryo_marines.dm
+++ b/code/datums/emergency_calls/cryo_marines.dm
@@ -50,34 +50,34 @@
human.client?.prefs.copy_all_to(human, JOB_SQUAD_LEADER, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/leader/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Squad Leader in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
else if (heavies < max_heavies && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(human.client, JOB_SQUAD_SPECIALIST, time_required_for_job))))
heavies++
human.client?.prefs.copy_all_to(human, JOB_SQUAD_SPECIALIST, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/spec/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Weapons Specialist in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
else if (medics < max_medics && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(human.client, JOB_SQUAD_MEDIC, time_required_for_job))))
medics++
human.client?.prefs.copy_all_to(human, JOB_SQUAD_MEDIC, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/medic/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Hospital Corpsman in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
else if (engineers < max_engineers && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(human.client, JOB_SQUAD_ENGI, time_required_for_job))))
engineers++
human.client?.prefs.copy_all_to(human, JOB_SQUAD_ENGI, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/engineer/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are an Engineer in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
else
human.client?.prefs.copy_all_to(human, JOB_SQUAD_MARINE, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/pfc/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Rifleman in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
sleep(10)
diff --git a/code/datums/emergency_calls/cryo_marines_heavy.dm b/code/datums/emergency_calls/cryo_marines_heavy.dm
index 2081d9564c50..42f25a461254 100644
--- a/code/datums/emergency_calls/cryo_marines_heavy.dm
+++ b/code/datums/emergency_calls/cryo_marines_heavy.dm
@@ -41,31 +41,31 @@
leaders++
arm_equipment(H, /datum/equipment_preset/uscm/leader_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Squad Leader in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if (heavies < max_heavies && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(H.client, JOB_SQUAD_SPECIALIST, time_required_for_job))
heavies++
arm_equipment(H, /datum/equipment_preset/uscm/specialist_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Weapons Specialist in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if(smartgunners < max_smartgunners && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(H.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
smartgunners++
arm_equipment(H, /datum/equipment_preset/uscm/smartgunner_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Smartgunner in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if(engineers < max_engineers && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(H.client, JOB_SQUAD_ENGI, time_required_for_job))
engineers++
arm_equipment(H, /datum/equipment_preset/uscm/engineer_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are an Engineer in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if (medics < max_medics && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(H.client, JOB_SQUAD_MEDIC, time_required_for_job))
medics++
arm_equipment(H, /datum/equipment_preset/uscm/medic_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Hospital Corpsman in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else
arm_equipment(H, /datum/equipment_preset/uscm/private_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Rifleman in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
sleep(10)
to_chat(H, SPAN_BOLD("Objectives: [objectives]"))
diff --git a/code/datums/emergency_calls/cryo_spec.dm b/code/datums/emergency_calls/cryo_spec.dm
index 6cc7c905efbc..8d563b0693f8 100644
--- a/code/datums/emergency_calls/cryo_spec.dm
+++ b/code/datums/emergency_calls/cryo_spec.dm
@@ -34,7 +34,7 @@
human.client?.prefs.copy_all_to(human, JOB_SQUAD_SPECIALIST, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/spec/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Weapons Specialist in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
sleep(10)
diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm
index 9db46955a5ea..c6f71382b877 100644
--- a/code/datums/emergency_calls/emergency_call.dm
+++ b/code/datums/emergency_calls/emergency_call.dm
@@ -200,7 +200,7 @@
SSticker.mode.picked_calls += src
show_join_message() //Show our potential candidates the message to let them join.
- message_admins("Distress beacon: '[name]' activated [src.hostility? "[SPAN_WARNING("(THEY ARE HOSTILE)")]":"(they are friendly)"]. Looking for candidates.")
+ message_admins("Distress beacon: '[name]' activated [hostility? "[SPAN_WARNING("(THEY ARE HOSTILE)")]":"(they are friendly)"]. Looking for candidates.")
if(!quiet_launch)
marine_announcement("A distress beacon has been launched from the [MAIN_SHIP_NAME].", "Priority Alert", 'sound/AI/distressbeacon.ogg', logging = ARES_LOG_SECURITY)
diff --git a/code/datums/emergency_calls/tank_crew.dm b/code/datums/emergency_calls/tank_crew.dm
index fb437c179e48..f8d20051c244 100644
--- a/code/datums/emergency_calls/tank_crew.dm
+++ b/code/datums/emergency_calls/tank_crew.dm
@@ -24,11 +24,10 @@
sleep(5)
arm_equipment(H, /datum/equipment_preset/uscm/tank/full, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Vehicle Crewman in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(H, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
sleep(10)
to_chat(H, SPAN_BOLD("Objectives: [objectives]"))
GLOB.data_core.manifest_inject(H) //Put people in crew manifest
-
diff --git a/code/datums/emergency_calls/whiskey_outpost.dm b/code/datums/emergency_calls/whiskey_outpost.dm
index 5c46ace04d6c..c6a7e4947756 100644
--- a/code/datums/emergency_calls/whiskey_outpost.dm
+++ b/code/datums/emergency_calls/whiskey_outpost.dm
@@ -28,23 +28,23 @@
if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))
leader = mob
arm_equipment(mob, /datum/equipment_preset/dust_raider/leader, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are a Squad Leader in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are a Squad Leader in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if (heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST, time_required_for_job))
heavies++
arm_equipment(mob, /datum/equipment_preset/dust_raider/specialist, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are a Specialist in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are a Specialist in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if(smartgunners < max_smartgunners && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(mob.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
smartgunners++
arm_equipment(mob, /datum/equipment_preset/dust_raider/smartgunner, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are a Smartgunner in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are a Smartgunner in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if(engineers < max_engineers && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(mob.client, JOB_SQUAD_ENGI, time_required_for_job))
engineers++
arm_equipment(mob, /datum/equipment_preset/dust_raider/engineer, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are an Engineer in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are an Engineer in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if (medics < max_medics && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(mob.client, JOB_SQUAD_MEDIC, time_required_for_job))
medics++
arm_equipment(mob, /datum/equipment_preset/dust_raider/medic, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are a Hospital Corpsman in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are a Hospital Corpsman in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else
arm_equipment(mob, /datum/equipment_preset/dust_raider/private, TRUE, TRUE)
to_chat(mob, SPAN_BOLDNOTICE("You are a Rifleman in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 16825ab8a7ba..207310ac34c5 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -166,15 +166,15 @@
/datum/teleport/instant/science/teleportChecks()
if(istype(teleatom, /obj/item/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
- teleatom.visible_message(SPAN_DANGER("The [teleatom] bounces off of the portal!"))
+ teleatom.visible_message(SPAN_DANGER("[teleatom] bounces off of the portal!"))
return 0
if(length(teleatom.search_contents_for(/obj/item/disk/nuclear)))
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom
- MM.visible_message(SPAN_DANGER("The [MM] bounces off of the portal!"),SPAN_DANGER("Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."))
+ MM.visible_message(SPAN_DANGER("[MM] bounces off of the portal!"),SPAN_DANGER("Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."))
else
- teleatom.visible_message(SPAN_DANGER("The [teleatom] bounces off of the portal!"))
+ teleatom.visible_message(SPAN_DANGER("[teleatom] bounces off of the portal!"))
return 0
if(is_admin_level(destination.z))
diff --git a/code/defines/procs/records.dm b/code/defines/procs/records.dm
index a1e2ade2b709..a9d40f993629 100644
--- a/code/defines/procs/records.dm
+++ b/code/defines/procs/records.dm
@@ -1,48 +1,50 @@
/proc/CreateGeneralRecord()
- var/datum/data/record/G = new /datum/data/record()
- G.fields["name"] = "New Record"
- G.fields["id"] = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6))
- G.fields["rank"] = "Unassigned"
- G.fields["real_rank"] = "Unassigned"
- G.fields["sex"] = "Male"
- G.fields["age"] = "Unknown"
- G.fields["ethnicity"] = "Unknown"
- G.fields["p_stat"] = "Active"
- G.fields["m_stat"] = "Stable"
- G.fields["species"] = "Human"
- G.fields["origin"] = "Unknown"
- G.fields["faction"] = "Unknown"
- G.fields["mob_faction"] = "Unknown"
- G.fields["religion"] = "Unknown"
- GLOB.data_core.general += G
- return G
+ var/datum/data/record/general_record = new /datum/data/record()
+ general_record.fields["name"] = "New Record"
+ general_record.name = "New Record"
+ general_record.fields["id"] = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6))
+ general_record.fields["rank"] = "Unassigned"
+ general_record.fields["real_rank"] = "Unassigned"
+ general_record.fields["sex"] = "Male"
+ general_record.fields["age"] = "Unknown"
+ general_record.fields["ethnicity"] = "Unknown"
+ general_record.fields["p_stat"] = "Active"
+ general_record.fields["m_stat"] = "Stable"
+ general_record.fields["species"] = "Human"
+ general_record.fields["origin"] = "Unknown"
+ general_record.fields["faction"] = "Unknown"
+ general_record.fields["mob_faction"] = "Unknown"
+ general_record.fields["religion"] = "Unknown"
+ GLOB.data_core.general += general_record
+ return general_record
/proc/CreateSecurityRecord(name as text, id as text)
- var/datum/data/record/R = new /datum/data/record()
- R.fields["name"] = name
- R.fields["id"] = id
- R.name = text("Security Record #[id]")
- R.fields["incidents"] = "None"
- GLOB.data_core.security += R
- return R
+ var/datum/data/record/security_record = new /datum/data/record()
+ security_record.fields["name"] = name
+ security_record.fields["id"] = id
+ security_record.name = text("Security Record #[id]")
+ security_record.fields["incidents"] = "None"
+ GLOB.data_core.security += security_record
+ return security_record
-/proc/create_medical_record(mob/living/carbon/human/H)
- var/datum/data/record/M = new /datum/data/record()
- M.fields["id"] = null
- M.fields["name"] = H.real_name
- M.fields["b_type"] = H.b_type
- M.fields["mi_dis"] = "None"
- M.fields["mi_dis_d"] = "No minor disabilities have been declared."
- M.fields["ma_dis"] = "None"
- M.fields["ma_dis_d"] = "No major disabilities have been diagnosed."
- M.fields["alg"] = "None"
- M.fields["alg_d"] = "No allergies have been detected in this patient."
- M.fields["cdi"] = "None"
- M.fields["cdi_d"] = "No diseases have been diagnosed at the moment."
- M.fields["last_scan_time"] = null
- M.fields["last_scan_result"] = "No scan data on record"
- M.fields["autodoc_data"] = list()
- M.fields["autodoc_manual"] = list()
- M.fields["ref"] = WEAKREF(H)
- GLOB.data_core.medical += M
- return M
+/proc/create_medical_record(mob/living/carbon/human/person)
+ var/datum/data/record/medical_record = new /datum/data/record()
+ medical_record.fields["id"] = null
+ medical_record.fields["name"] = person.real_name
+ medical_record.name = person.real_name
+ medical_record.fields["b_type"] = person.b_type
+ medical_record.fields["mi_dis"] = "None"
+ medical_record.fields["mi_dis_d"] = "No minor disabilities have been declared."
+ medical_record.fields["ma_dis"] = "None"
+ medical_record.fields["ma_dis_d"] = "No major disabilities have been diagnosed."
+ medical_record.fields["alg"] = "None"
+ medical_record.fields["alg_d"] = "No allergies have been detected in this patient."
+ medical_record.fields["cdi"] = "None"
+ medical_record.fields["cdi_d"] = "No diseases have been diagnosed at the moment."
+ medical_record.fields["last_scan_time"] = null
+ medical_record.fields["last_scan_result"] = "No scan data on record"
+ medical_record.fields["autodoc_data"] = list()
+ medical_record.fields["autodoc_manual"] = list()
+ medical_record.fields["ref"] = WEAKREF(person)
+ GLOB.data_core.medical += medical_record
+ return medical_record
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 32cb026a0b25..d62d688fcfc5 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -98,7 +98,7 @@ update_flag
/obj/structure/machinery/portable_atmospherics/canister/attackby(obj/item/W as obj, mob/user as mob)
if(!HAS_TRAIT(W, TRAIT_TOOL_WRENCH) && !istype(W, /obj/item/tank) && !istype(W, /obj/item/device/analyzer))
- visible_message(SPAN_DANGER("[user] hits the [src] with a [W]!"))
+ visible_message(SPAN_DANGER("[user] hits [src] with [W]!"))
update_health(W.force)
src.add_fingerprint(user)
..()
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 715e9c2a86e5..55df45c70ccc 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -152,7 +152,7 @@
if(X.id == id)
X.score(side, 3)// 3 points for dunking a mob
// no break, to update multiple scoreboards
- visible_message(SPAN_DANGER("[user] dunks [M] into the [src]!"))
+ visible_message(SPAN_DANGER("[user] dunks [M] into [src]!"))
return
else if (istype(W, /obj/item) && get_dist(src,user)<2)
user.drop_inv_item_to_loc(W, loc)
@@ -160,7 +160,7 @@
if(X.id == id)
X.score(side)
// no break, to update multiple scoreboards
- visible_message(SPAN_NOTICE("[user] dunks [W] into the [src]!"))
+ visible_message(SPAN_NOTICE("[user] dunks [W] into [src]!"))
return
/obj/structure/holohoop/BlockedPassDirs(atom/movable/mover, target_dir)
diff --git a/code/game/machinery/computer/dropship_weapons.dm b/code/game/machinery/computer/dropship_weapons.dm
index fdab92ee4c13..d86b9fc28a28 100644
--- a/code/game/machinery/computer/dropship_weapons.dm
+++ b/code/game/machinery/computer/dropship_weapons.dm
@@ -64,7 +64,7 @@
power = MATRIX.power
else
- to_chat(user, SPAN_WARNING("matrix is not complete!"))
+ to_chat(user, SPAN_WARNING("Matrix is not complete!"))
/obj/structure/machinery/computer/dropship_weapons/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
var/data[0]
diff --git a/code/game/machinery/computer/research.dm b/code/game/machinery/computer/research.dm
index 2c8a5689b495..1ba696eeee9c 100644
--- a/code/game/machinery/computer/research.dm
+++ b/code/game/machinery/computer/research.dm
@@ -29,7 +29,7 @@
if(!N.grant)
return
GLOB.chemical_data.update_credits(N.grant)
- visible_message(SPAN_NOTICE("[user] scans the [N.name] on the [src], collecting the [N.grant] research credits."))
+ visible_message(SPAN_NOTICE("[user] scans the [N.name] on [src], collecting the [N.grant] research credits."))
N.grant = 0
qdel(N)
return
@@ -61,7 +61,7 @@
visible_message(SPAN_NOTICE("[user] swipes their ID card on \the [src], but it is refused."))
return
if(card.clearance_access <= GLOB.chemical_data.clearance_level || (card.clearance_access == 6 && GLOB.chemical_data.clearance_level >= 5 && GLOB.chemical_data.clearance_x_access))
- visible_message(SPAN_NOTICE("[user] swipes the clearance card on the [src], but nothing happens."))
+ visible_message(SPAN_NOTICE("[user] swipes the clearance card on [src], but nothing happens."))
return
if(user.real_name != card.registered_name)
visible_message(SPAN_WARNING("WARNING: ILLEGAL CLEARANCE USER DETECTED. CARD DATA HAS BEEN WIPED."))
@@ -220,4 +220,3 @@
GLOB.chemical_data.update_credits(purchase_cost * -1)
visible_message(SPAN_NOTICE("Clearance Level X Acquired."))
playsound(loc, pick('sound/machines/computer_typing1.ogg','sound/machines/computer_typing2.ogg','sound/machines/computer_typing3.ogg'), 5, 1)
-
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 4e362ef12fac..b03ba1e8e195 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -557,7 +557,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list(
if(istype(attacking_item, /obj/item/clothing/mask/cigarette))
if(isElectrified())
var/obj/item/clothing/mask/cigarette/L = attacking_item
- L.light(SPAN_NOTICE("[user] lights their [L] on an electrical arc from the [src]"))
+ L.light(SPAN_NOTICE("[user] lights their [L] on an electrical arc from [src]"))
return
if(!isRemoteControlling(user))
@@ -568,7 +568,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list(
add_fingerprint(user)
if(istype(attacking_item, /obj/item/weapon/zombie_claws) && (welded || locked))
- user.visible_message(SPAN_NOTICE("[user] starts tearing into the door on the [src]!"), \
+ user.visible_message(SPAN_NOTICE("[user] starts tearing into the door on [src]!"), \
SPAN_NOTICE("You start prying your hand into the gaps of the door with your fingers... This will take about 30 seconds."), \
SPAN_NOTICE("You hear tearing noises!"))
@@ -845,7 +845,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list(
for(var/i in resin_door_shmushereds)
if(istype(x,i)) //I would like to just use a if(locate() in ) here but Im not gonna add every child to GLOB.resin_door_shmushereds so it works
playsound(loc, "alien_resin_break", 25)
- visible_message(SPAN_WARNING("The [src.name] closes on the [x], shmushing it!"))
+ visible_message(SPAN_WARNING("The [src.name] closes on [x], shmushing it!"))
if(isturf(x))
var/turf/closed/wall/resin_wall_to_destroy = x
resin_wall_to_destroy.dismantle_wall()
diff --git a/code/game/machinery/fusion_engine.dm b/code/game/machinery/fusion_engine.dm
index 8e3097ef52d1..d7c7cc4c7d18 100644
--- a/code/game/machinery/fusion_engine.dm
+++ b/code/game/machinery/fusion_engine.dm
@@ -156,13 +156,13 @@
/obj/structure/machinery/power/fusion_engine/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/fuelCell))
if(is_on)
- to_chat(user, SPAN_WARNING("The [src] needs to be turned off first."))
+ to_chat(user, SPAN_WARNING("[src] needs to be turned off first."))
return TRUE
if(!fusion_cell)
if(user.drop_inv_item_to_loc(O, src))
fusion_cell = O
update_icon()
- to_chat(user, SPAN_NOTICE("You load the [src] with the [O]."))
+ to_chat(user, SPAN_NOTICE("You load [src] with [O]."))
return TRUE
else
to_chat(user, SPAN_WARNING("You need to remove the fuel cell from [src] first."))
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 4b863bec043d..e16d2cacf63b 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -101,7 +101,7 @@
for(var/datum/reagent/chem in beaker.reagents.reagent_list)
reagentnames += ";[chem.name]"
- log_admin("[key_name(user)] put a [beaker] into [src], containing [reagentnames] at ([src.loc.x],[src.loc.y],[src.loc.z]).")
+ log_admin("[key_name(user)] put \a [beaker] into [src], containing [reagentnames] at ([src.loc.x],[src.loc.y],[src.loc.z]).")
to_chat(user, "You attach \the [container] to \the [src].")
update_beam()
diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm
index 0c4b8a973e83..a18f5db8af43 100644
--- a/code/game/machinery/kitchen/processor.dm
+++ b/code/game/machinery/kitchen/processor.dm
@@ -89,7 +89,7 @@
to_chat(user, SPAN_DANGER("That probably won't blend."))
return 1
user.visible_message("[user] put [what] into [src].", \
- "You put the [what] into [src].")
+ "You put [what] into [src].")
user.drop_held_item()
what.forceMove(src)
@@ -118,4 +118,3 @@
src.processing = 0
src.visible_message(SPAN_NOTICE("\the [src] finished processing."), \
"You hear the food processor stopping/")
-
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 33e6e9749e48..a886b59f501f 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -620,8 +620,8 @@ Buildable meters
playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1)
user.visible_message( \
- "[user] fastens the [src].", \
- SPAN_NOTICE("You have fastened the [src]."), \
+ "[user] fastens [src].", \
+ SPAN_NOTICE("You have fastened [src]."), \
"You hear ratchet.")
qdel(src) // remove the pipe item
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index dd45ad597800..69b21964a4f4 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -66,7 +66,7 @@
return
else if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER))
open = !open
- user.visible_message(SPAN_NOTICE("[user] [open ? "opens" : "closes"] the hatch on the [src]."), SPAN_NOTICE("You [open ? "open" : "close"] the hatch on the [src]."))
+ user.visible_message(SPAN_NOTICE("[user] [open ? "opens" : "closes"] the hatch on [src]."), SPAN_NOTICE("You [open ? "open" : "close"] the hatch on [src]."))
update_icon()
if(!open && user.interactee == src)
close_browser(user, "spaceheater")
@@ -107,7 +107,7 @@
start_processing()
else
stop_processing()
- user.visible_message(SPAN_NOTICE("[user] switches [on ? "on" : "off"] the [src]."),SPAN_NOTICE("You switch [on ? "on" : "off"] the [src]."))
+ user.visible_message(SPAN_NOTICE("[user] switches [on ? "on" : "off"] [src]."),SPAN_NOTICE("You switch [on ? "on" : "off"] [src]."))
update_icon()
return
@@ -186,4 +186,3 @@
name = "radiator"
desc = "It's a radiator. It heats the room through convection with hot water. This one has a red handle."
icon_state = "radiator-r"
-
diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm
index b0a09dcd1767..0745f05ab2d1 100644
--- a/code/game/machinery/vending/cm_vending.dm
+++ b/code/game/machinery/vending/cm_vending.dm
@@ -441,13 +441,6 @@ GLOBAL_LIST_EMPTY(vending_products)
tgui_interact(user)
/// Handles redeeming coin tokens.
-/obj/structure/machinery/cm_vending/attackby(obj/item/attacking_item, mob/user)
- if(!istype(attacking_item, /obj/item/coin/marine))
- ..()
- if(!can_access_to_vend(user, ignore_hack = TRUE))
- return FALSE
- redeem_token(attacking_item, user)
-
/obj/structure/machinery/cm_vending/proc/redeem_token(obj/item/coin/marine/token, mob/user)
var/reward_typepath
switch(token.token_type)
@@ -766,6 +759,13 @@ GLOBAL_LIST_EMPTY(vending_products)
hack_access(user)
return TRUE
+ ///If we want to redeem a token
+ else if(istype(W, /obj/item/coin/marine))
+ if(!can_access_to_vend(user, ignore_hack = TRUE))
+ return FALSE
+ . = redeem_token(W, user)
+ return
+
..()
/obj/structure/machinery/cm_vending/proc/get_listed_products(mob/user)
diff --git a/code/game/machinery/vending/vending.dm b/code/game/machinery/vending/vending.dm
index b6c4da03640c..8629ce2bb2be 100644
--- a/code/game/machinery/vending/vending.dm
+++ b/code/game/machinery/vending/vending.dm
@@ -208,23 +208,23 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
update_icon()
return TRUE
else if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
- to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src]."))
+ to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name]."))
return FALSE
else if(stat & BROKEN)
- to_chat(user, SPAN_NOTICE("You start to unscrew the [src]'s broken panel."))
+ to_chat(user, SPAN_NOTICE("You start to unscrew [src]'s broken panel."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop unscrewing the [src]'s broken panel."))
+ to_chat(user, SPAN_WARNING("You stop unscrewing [src]'s broken panel."))
return FALSE
- to_chat(user, SPAN_NOTICE("You unscrew the [src]'s broken panel and remove it, exposing many broken wires."))
+ to_chat(user, SPAN_NOTICE("You unscrew [src]'s broken panel and remove it, exposing many broken wires."))
stat &= ~BROKEN
stat |= REPAIR_STEP_ONE
return TRUE
else if(stat & REPAIR_STEP_FOUR)
- to_chat(user, SPAN_NOTICE("You start to fasten the [src]'s new panel."))
+ to_chat(user, SPAN_NOTICE("You start to fasten [src]'s new panel."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop fastening the [src]'s new panel."))
+ to_chat(user, SPAN_WARNING("You stop fastening [src]'s new panel."))
return FALSE
- to_chat(user, SPAN_NOTICE("You fasten the [src]'s new panel, fully repairing the vendor."))
+ to_chat(user, SPAN_NOTICE("You fasten [src]'s new panel, fully repairing the vendor."))
stat &= ~REPAIR_STEP_FOUR
stat |= FULLY_REPAIRED
update_icon()
@@ -235,17 +235,17 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return FALSE
else if(HAS_TRAIT(item, TRAIT_TOOL_WIRECUTTERS))
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
- to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src]."))
+ to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name]."))
return FALSE
else if(stat == WORKING && panel_open)
attack_hand(user)
return
else if(stat & REPAIR_STEP_ONE)
- to_chat(user, SPAN_NOTICE("You start to remove the [src]'s broken wires."))
+ to_chat(user, SPAN_NOTICE("You start to remove [src]'s broken wires."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop removing the [src]'s broken wires."))
+ to_chat(user, SPAN_WARNING("You stop removing [src]'s broken wires."))
return FALSE
- to_chat(user, SPAN_NOTICE("You remove the [src]'s broken broken wires."))
+ to_chat(user, SPAN_NOTICE("You remove [src]'s broken broken wires."))
stat &= ~REPAIR_STEP_ONE
stat |= REPAIR_STEP_TWO
return TRUE
@@ -255,20 +255,20 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return FALSE
else if(istype(item, /obj/item/stack/cable_coil))
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
- to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src]."))
+ to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name]."))
return FALSE
var/obj/item/stack/cable_coil/CC = item
if(stat & REPAIR_STEP_TWO)
if(CC.amount < 5)
to_chat(user, SPAN_WARNING("You need more cable coil to replace the removed wires."))
- to_chat(user, SPAN_NOTICE("You start to replace the [src]'s removed wires."))
+ to_chat(user, SPAN_NOTICE("You start to replace [src]'s removed wires."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop replacing the [src]'s removed wires."))
+ to_chat(user, SPAN_WARNING("You stop replacing [src]'s removed wires."))
return FALSE
if(!CC || !CC.use(5))
to_chat(user, SPAN_WARNING("You need more cable coil to replace the removed wires."))
return FALSE
- to_chat(user, SPAN_NOTICE("You remove the [src]'s broken broken wires."))
+ to_chat(user, SPAN_NOTICE("You remove [src]'s broken broken wires."))
stat &= ~REPAIR_STEP_TWO
stat |= REPAIR_STEP_THREE
return TRUE
@@ -278,18 +278,18 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return
else if(istype(item, /obj/item/stack/sheet/metal))
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
- to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src]."))
+ to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name]."))
return FALSE
var/obj/item/stack/sheet/metal/M = item
if(stat & REPAIR_STEP_THREE)
- to_chat(user, SPAN_NOTICE("You start to construct a new panel for the [src]."))
+ to_chat(user, SPAN_NOTICE("You start to construct a new panel for [src]."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop constructing a new panel for the [src]."))
+ to_chat(user, SPAN_WARNING("You stop constructing a new panel for [src]."))
return FALSE
if(!M || !M.use(1))
to_chat(user, SPAN_WARNING("You a sheet of metal to construct a new panel."))
return FALSE
- to_chat(user, SPAN_NOTICE("You construct a new panel for the [src]."))
+ to_chat(user, SPAN_NOTICE("You construct a new panel for [src]."))
stat &= ~REPAIR_STEP_THREE
stat |= REPAIR_STEP_FOUR
return TRUE
@@ -306,9 +306,9 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
switch (anchored)
if (0)
anchored = TRUE
- user.visible_message("[user] tightens the bolts securing the [src] to the floor.", "You tighten the bolts securing the [src] to the floor.")
+ user.visible_message("[user] tightens the bolts securing [src] to the floor.", "You tighten the bolts securing [src] to the floor.")
if (1)
- user.visible_message("[user] unfastens the bolts securing the [src] to the floor.", "You unfasten the bolts securing the [src] to the floor.")
+ user.visible_message("[user] unfastens the bolts securing [src] to the floor.", "You unfasten the bolts securing [src] to the floor.")
anchored = FALSE
return
else if(HAS_TRAIT(item, TRAIT_TOOL_MULTITOOL) || HAS_TRAIT(item, TRAIT_TOOL_WIRECUTTERS))
@@ -321,7 +321,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return
if(user.drop_inv_item_to_loc(item, src))
coin = item
- to_chat(user, SPAN_NOTICE(" You insert the [item] into the [src]"))
+ to_chat(user, SPAN_NOTICE("You insert [item] into [src]"))
tgui_interact(user)
return
else if(istype(item, /obj/item/spacecash))
@@ -422,9 +422,9 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
if(is_tipped_over)
if(user.action_busy)
return
- user.visible_message(SPAN_NOTICE("[user] begins to heave the [src] back into place!"), SPAN_NOTICE("You start heaving the [src] back into place..."))
+ user.visible_message(SPAN_NOTICE("[user] begins to heave [src] back into place!"), SPAN_NOTICE("You start heaving [src] back into place..."))
if(do_after(user, 80, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY))
- user.visible_message(SPAN_NOTICE("[user] rights the [src]!"), SPAN_NOTICE("You right the [src]!"))
+ user.visible_message(SPAN_NOTICE("[user] rights [src]!"), SPAN_NOTICE("You right [src]!"))
flip_back()
return
@@ -534,7 +534,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return
if(coin.string_attached)
if(prob(50))
- to_chat(user, SPAN_NOTICE("You successfully pull the coin out before the [src] could swallow it."))
+ to_chat(user, SPAN_NOTICE("You successfully pull the coin out before [src] could swallow it."))
user.put_in_hands(coin)
else
to_chat(user, SPAN_NOTICE("You weren't able to pull the coin out fast enough, the machine ate it, string and all."))
@@ -882,8 +882,8 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
S.remove_from_storage(item_to_stock, user.loc)
qdel(item_to_stock)
- user.visible_message(SPAN_NOTICE("[user] stocks the [src] with \a [product.product_name]."),
- SPAN_NOTICE("You stock the [src] with \a [product.product_name]."))
+ user.visible_message(SPAN_NOTICE("[user] stocks [src] with \a [product.product_name]."),
+ SPAN_NOTICE("You stock [src] with \a [product.product_name]."))
product.amount++
return //We found our item, no reason to go on.
@@ -967,7 +967,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
if (!throw_item)
return 0
INVOKE_ASYNC(throw_item, /atom/movable/proc/throw_atom, target, 16, SPEED_AVERAGE, src)
- visible_message(SPAN_WARNING("The [src] launches \the [throw_item] at [target]!"))
+ visible_message(SPAN_WARNING("[src] launches [throw_item] at [target]!"))
playsound(src, "sound/machines/vending.ogg", 40, TRUE)
return 1
@@ -988,14 +988,14 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
switch(wire)
if(VENDING_WIRE_EXTEND)
extended_inventory = TRUE
- visible_message(SPAN_NOTICE("A weak yellow light turns off underneath the [src]."))
+ visible_message(SPAN_NOTICE("A weak yellow light turns off underneath [src]."))
if(VENDING_WIRE_SHOCK)
seconds_electrified = -1
- visible_message(SPAN_DANGER("Electric arcs shoot off from the [src]!"))
+ visible_message(SPAN_DANGER("Electric arcs shoot off from [src]!"))
if (VENDING_WIRE_SHOOT_INV)
if(!shoot_inventory)
shoot_inventory = TRUE
- visible_message(SPAN_WARNING("The [src] begins whirring noisily."))
+ visible_message(SPAN_WARNING("[src] begins whirring noisily."))
/obj/structure/machinery/vending/proc/mend(wire)
wires |= getWireFlag(wire)
@@ -1003,24 +1003,24 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
switch(wire)
if(VENDING_WIRE_EXTEND)
extended_inventory = FALSE
- visible_message(SPAN_NOTICE("A weak yellow light turns on underneath the [src]."))
+ visible_message(SPAN_NOTICE("A weak yellow light turns on underneath [src]."))
if(VENDING_WIRE_SHOCK)
seconds_electrified = 0
if (VENDING_WIRE_SHOOT_INV)
shoot_inventory = FALSE
- visible_message(SPAN_NOTICE("The [src] stops whirring."))
+ visible_message(SPAN_NOTICE("[src] stops whirring."))
/obj/structure/machinery/vending/proc/pulse(wire)
switch(wire)
if(VENDING_WIRE_EXTEND)
extended_inventory = !extended_inventory
- visible_message(SPAN_NOTICE("A weak yellow light turns [extended_inventory ? "on" : "off"] underneath the [src]."))
+ visible_message(SPAN_NOTICE("A weak yellow light turns [extended_inventory ? "on" : "off"] underneath [src]."))
if (VENDING_WIRE_SHOCK)
seconds_electrified = 30
- visible_message(SPAN_DANGER("Electric arcs shoot off from the [src]!"))
+ visible_message(SPAN_DANGER("Electric arcs shoot off from [src]!"))
if (VENDING_WIRE_SHOOT_INV)
shoot_inventory = !shoot_inventory
if(shoot_inventory)
- visible_message(SPAN_WARNING("The [src] begins whirring noisily."))
+ visible_message(SPAN_WARNING("[src] begins whirring noisily."))
else
- visible_message(SPAN_NOTICE("The [src] stops whirring."))
+ visible_message(SPAN_NOTICE("[src] stops whirring."))
diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm
index ad10037ccfe1..93d31fe13253 100644
--- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm
+++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm
@@ -4,26 +4,11 @@ GLOBAL_LIST_INIT(cm_vending_gear_intelligence_officer, list(
list("INTELLIGENCE SET (MANDATORY)", 0, null, null, null),
list("Essential Intelligence Set", 0, /obj/effect/essentials_set/intelligence_officer, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
- list("SUPPLIES", 0, null, null, null),
+ list("ENGINEERING SUPPLIES", 0, null, null, null),
list("Power Control Module", 5, /obj/item/circuitboard/apc, null, VENDOR_ITEM_REGULAR),
- list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR),
- list("Night Vision Optic", 25, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED),
- list("Data Detector", 5, /obj/item/device/motiondetector/intel, null, VENDOR_ITEM_REGULAR),
- list("Intel Radio Encryption Key", 5, /obj/item/device/encryptionkey/intel, null, VENDOR_ITEM_REGULAR),
- list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR),
- list("Fulton Recovery Device", 10, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR),
- list("Motion Detector", 15, /obj/item/device/motiondetector, null, VENDOR_ITEM_RECOMMENDED),
list("Plastic Explosive", 10, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR),
- list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR),
- list("Medical Helmet Optic", 5, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR),
list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR),
- list("POUCHES", 0, null, null, null),
- list("Large Magazine Pouch", 10, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR),
- list("Large Shotgun Shell Pouch", 10, /obj/item/storage/pouch/shotgun/large, null, VENDOR_ITEM_REGULAR),
- list("Autoinjector Pouch (Full)", 15, /obj/item/storage/pouch/autoinjector/full, null, VENDOR_ITEM_RECOMMENDED),
- list("Machete Pouch (Full)", 10, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR),
-
list("PRIMARY AMMUNITION", 0, null, null, null),
list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR),
list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR),
@@ -35,7 +20,30 @@ GLOBAL_LIST_INIT(cm_vending_gear_intelligence_officer, list(
list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR),
list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR),
list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR),
- list("VP78 Magazine", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR)
+ list("VP78 Magazine", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+
+ list("POUCHES", 0, null, null, null),
+ list("Large Magazine Pouch", 10, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR),
+ list("Large Shotgun Shell Pouch", 10, /obj/item/storage/pouch/shotgun/large, null, VENDOR_ITEM_REGULAR),
+ list("Autoinjector Pouch (Full)", 15, /obj/item/storage/pouch/autoinjector/full, null, VENDOR_ITEM_RECOMMENDED),
+ list("Machete Pouch (Full)", 10, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR),
+
+ list("UTILITIES", 0, null, null, null),
+ list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR),
+ list("Fulton Device Stack", 10, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR),
+ list("Motion Detector", 15, /obj/item/device/motiondetector, null, VENDOR_ITEM_RECOMMENDED),
+ list("Data Detector", 5, /obj/item/device/motiondetector/intel, null, VENDOR_ITEM_REGULAR),
+
+ list("BINOCULARS", 0, null, null, null),
+ list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR),
+
+ list("HELMET OPTICS", 0, null, null, null),
+ list("Medical Helmet Optic", 5, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR),
+ list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR),
+ list("Night Vision Optic", 25, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED),
+
+ list("RADIO KEYS", 0, null, null, null),
+ list("Intel Radio Encryption Key", 5, /obj/item/device/encryptionkey/intel, null, VENDOR_ITEM_REGULAR),
))
/obj/structure/machinery/cm_vending/gear/intelligence_officer
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index f9b5ddb42f68..69eababfe000 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -21,7 +21,7 @@
return
/obj/effect/spider/attackby(obj/item/W, mob/user)
- if(W.attack_verb.len)
+ if(LAZYLEN(W.attack_verb))
visible_message(SPAN_DANGER("\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? "by [user]." : ".")]"))
else
visible_message(SPAN_DANGER("\The [src] have been attacked with \the [W][(user ? "by [user]." : ".")]"))
diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm
index 40c66bc0fa6a..08dcfc6964a6 100644
--- a/code/game/objects/items/circuitboards/computer.dm
+++ b/code/game/objects/items/circuitboards/computer.dm
@@ -287,14 +287,12 @@
/obj/item/circuitboard/computer/rdconsole/attackby(obj/item/I as obj, mob/user as mob)
if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER))
- user.visible_message(SPAN_NOTICE("\the [user] adjusts the jumper on the [src]'s access protocol pins."), SPAN_NOTICE("You adjust the jumper on the access protocol pins."))
+ user.visible_message(SPAN_NOTICE("[user] adjusts the jumper on [src]'s access protocol pins."), SPAN_NOTICE("You adjust the jumper on the access protocol pins."))
if(src.build_path == /obj/structure/machinery/computer/rdconsole/core)
src.name = "Circuit Board (RD Console - Robotics)"
src.build_path = /obj/structure/machinery/computer/rdconsole/robotics
- to_chat(user, SPAN_NOTICE(" Access protocols set to robotics."))
+ to_chat(user, SPAN_NOTICE("Access protocols set to robotics."))
else
src.name = "Circuit Board (RD Console)"
src.build_path = /obj/structure/machinery/computer/rdconsole/core
- to_chat(user, SPAN_NOTICE(" Access protocols set to default."))
-
-
+ to_chat(user, SPAN_NOTICE("Access protocols set to default."))
diff --git a/code/game/objects/items/circuitboards/machine.dm b/code/game/objects/items/circuitboards/machine.dm
index ad4c31cb11e9..248d0d5c8885 100644
--- a/code/game/objects/items/circuitboards/machine.dm
+++ b/code/game/objects/items/circuitboards/machine.dm
@@ -141,7 +141,7 @@ to destroy them and players will be able to make replacements.
if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER))
machine_dir = turn(machine_dir, 90)
init_dirs = machine_dir
- user.visible_message(SPAN_NOTICE("\The [user] adjusts the jumper on the [src]'s port configuration pins."), SPAN_NOTICE("You adjust the jumper on the port configuration pins. Now set to [dir2text(machine_dir)]."))
+ user.visible_message(SPAN_NOTICE("[user] adjusts the jumper on [src]'s port configuration pins."), SPAN_NOTICE("You adjust the jumper on the port configuration pins. Now set to [dir2text(machine_dir)]."))
return
/obj/item/circuitboard/machine/unary_atmos/get_examine_text(mob/user)
@@ -300,5 +300,3 @@ to destroy them and players will be able to make replacements.
// Board itself is high tech. Coils have to be ordered from cargo or salvaged from existing SMESs.
frame_desc = "Requires 1 superconducting magnetic coil and 30 wires."
req_components = list(/obj/item/stock_parts/smes_coil = 1, /obj/item/stack/cable_coil = 30)
-
-
diff --git a/code/game/objects/items/devices/cloaking.dm b/code/game/objects/items/devices/cloaking.dm
index 05e7786744e2..b0c5ed799977 100644
--- a/code/game/objects/items/devices/cloaking.dm
+++ b/code/game/objects/items/devices/cloaking.dm
@@ -47,12 +47,12 @@
src.add_fingerprint(user)
if(chameleon_on)
user.alpha = 25
- to_chat(user, SPAN_NOTICE("You activate the [src]."))
+ to_chat(user, SPAN_NOTICE("You activate [src]."))
spark_system.start()
src.icon_state = "shield1"
else
user.alpha = initial(user.alpha)
- to_chat(user, SPAN_NOTICE("You deactivate the [src]."))
+ to_chat(user, SPAN_NOTICE("You deactivate [src]."))
src.icon_state = "shield0"
spark_system.start()
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 40ef8792aedb..3f285b358fb2 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -121,7 +121,7 @@
if(target.status != LIGHT_OK)
if(CanUse(U))
if(!Use(U)) return
- to_chat(U, SPAN_NOTICE("You replace the [target.fitting] with the [src]."))
+ to_chat(U, SPAN_NOTICE("You replace the [target.fitting] with [src]."))
if(target.status != LIGHT_EMPTY)
diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm
index d388e06b9fa7..e0f65a4b31ec 100644
--- a/code/game/objects/items/devices/suit_cooling.dm
+++ b/code/game/objects/items/devices/suit_cooling.dm
@@ -110,7 +110,7 @@
cell.add_fingerprint(user)
cell.update_icon()
- to_chat(user, "You remove the [src.cell].")
+ to_chat(user, "You remove [cell].")
src.cell = null
updateicon()
return
@@ -121,7 +121,7 @@
else
turn_on()
if (on)
- to_chat(user, "You switch on the [src].")
+ to_chat(user, "You switch on [src].")
/obj/item/device/suit_cooling_unit/attackby(obj/item/W as obj, mob/user as mob)
if (HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER))
@@ -137,12 +137,12 @@
if (istype(W, /obj/item/cell))
if(cover_open)
if(cell)
- to_chat(user, "There is a [cell] already installed here.")
+ to_chat(user, "There is \a [cell] already installed here.")
else
if(user.drop_held_item())
W.forceMove(src)
cell = W
- to_chat(user, "You insert the [cell].")
+ to_chat(user, "You insert [cell].")
updateicon()
return
@@ -169,7 +169,7 @@
if (cover_open)
if(cell)
- . += "The panel is open, exposing the [cell]."
+ . += "The panel is open, exposing [cell]."
else
. += "The panel is open."
diff --git a/code/game/objects/items/devices/teleportation.dm b/code/game/objects/items/devices/teleportation.dm
index c65286969786..793f399ecdf0 100644
--- a/code/game/objects/items/devices/teleportation.dm
+++ b/code/game/objects/items/devices/teleportation.dm
@@ -49,7 +49,7 @@
return
var/turf/current_location = get_turf(usr)//What turf is the user on?
if(!current_location || is_admin_level(current_location.z))//If turf was not found or they're on z level 2.
- to_chat(usr, "The [src] is malfunctioning.")
+ to_chat(usr, "[src] is malfunctioning.")
return
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
usr.set_interaction(src)
@@ -177,4 +177,3 @@
P.creator = src
src.add_fingerprint(user)
return
-
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index b3d433727946..6fc526936809 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -47,7 +47,7 @@
user.temp_drop_inv_item(A)
attached_device = A
A.forceMove(src)
- to_chat(user, SPAN_NOTICE("You attach the [item] to the valve controls and secure it."))
+ to_chat(user, SPAN_NOTICE("You attach [item] to the valve controls and secure it."))
A.holder = src
A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
diff --git a/code/game/objects/items/explosives/explosive.dm b/code/game/objects/items/explosives/explosive.dm
index 0c482e8db9e7..4483372c9b85 100644
--- a/code/game/objects/items/explosives/explosive.dm
+++ b/code/game/objects/items/explosives/explosive.dm
@@ -262,8 +262,8 @@
if(falloff_mode == EXPLOSION_FALLOFF_SHAPE_LINEAR)
falloff_mode = EXPLOSION_FALLOFF_SHAPE_EXPONENTIAL
- to_chat(usr, SPAN_NOTICE("You enable the [src]'s blast wave dampener, limiting the blast radius."))
+ to_chat(usr, SPAN_NOTICE("You enable [src]'s blast wave dampener, limiting the blast radius."))
else
falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR
- to_chat(usr, SPAN_NOTICE("You disable the [src]'s blast wave dampener, restoring the blast radius to full."))
+ to_chat(usr, SPAN_NOTICE("You disable [src]'s blast wave dampener, restoring the blast radius to full."))
playsound(loc, 'sound/items/Screwdriver2.ogg', 25, 0, 6)
diff --git a/code/game/objects/items/explosives/grenades/chem_grenade.dm b/code/game/objects/items/explosives/grenades/chem_grenade.dm
index e975603d45d8..48430aacecc9 100644
--- a/code/game/objects/items/explosives/grenades/chem_grenade.dm
+++ b/code/game/objects/items/explosives/grenades/chem_grenade.dm
@@ -1,5 +1,5 @@
/obj/item/explosive/grenade/custom
- name = "Custom grenade"
+ name = "custom grenade"
icon_state = "grenade_custom"
desc = "A custom chemical grenade with an M40 casing. This one is made to fit into underslung grenade launchers, but can also be thrown by hand."
w_class = SIZE_SMALL
@@ -17,7 +17,7 @@
..()
/obj/item/explosive/grenade/custom/large
- name = "Large Custom Grenade"
+ name = "large custom grenade"
desc = "A custom chemical grenade with an M15 casing. This casing has a higher explosive capacity than the M40 variant."
icon_state = "large_grenade_custom"
allowed_containers = list(/obj/item/reagent_container/glass)
@@ -33,7 +33,7 @@
/obj/item/explosive/grenade/custom/metal_foam
- name = "Metal-Foam Grenade"
+ name = "metal-foam grenade"
desc = "Used for emergency sealing of air breaches."
assembly_stage = ASSEMBLY_LOCKED
harmful = FALSE
@@ -56,7 +56,7 @@
update_icon()
/obj/item/explosive/grenade/custom/incendiary
- name = "Incendiary Grenade"
+ name = "incendiary grenade"
desc = "Used for clearing rooms of living things."
assembly_stage = ASSEMBLY_LOCKED
has_blast_wave_dampener = FALSE
@@ -79,7 +79,7 @@
update_icon()
/obj/item/explosive/grenade/custom/flare
- name = "M40-F flare grenade"
+ name = "\improper M40-F flare grenade"
desc = "Chemical flare in a grenade form, designed for compatibility with most standard issue launchers."
assembly_stage = ASSEMBLY_LOCKED
has_blast_wave_dampener = FALSE
@@ -103,7 +103,7 @@
update_icon()
/obj/item/explosive/grenade/custom/large/flare
- name = "M15-F flare grenade"
+ name = "\improper M15-F flare grenade"
desc = "Chemical flare in a grenade form, expanded variant. The casing is too large to fit most launchers."
assembly_stage = ASSEMBLY_LOCKED
has_blast_wave_dampener = FALSE
diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm
index 45478f2828f4..768a32c003fa 100644
--- a/code/game/objects/items/explosives/mine.dm
+++ b/code/game/objects/items/explosives/mine.dm
@@ -309,7 +309,7 @@
map_deployed = TRUE
/obj/item/explosive/mine/custom
- name = "Custom mine"
+ name = "custom mine"
desc = "A custom chemical mine built from an M20 casing."
icon_state = "m20_custom"
customizable = TRUE
diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm
index ac0a2263cd5c..071ff3458a91 100644
--- a/code/game/objects/items/explosives/plastic.dm
+++ b/code/game/objects/items/explosives/plastic.dm
@@ -184,7 +184,7 @@
//vehicle interior stuff checks
if(SSinterior.in_interior(target))
- to_chat(user, SPAN_WARNING("It's too cramped in here to deploy \the [src]."))
+ to_chat(user, SPAN_WARNING("It's too cramped in here to deploy [src]."))
return FALSE
if(istype(target, /obj/effect) || istype(target, /obj/structure/machinery))
@@ -195,7 +195,7 @@
if(istype(target, /turf/closed/wall))
var/turf/closed/wall/W = target
if(W.hull)
- to_chat(user, SPAN_WARNING("You are unable to stick \the [src] to the [W]!"))
+ to_chat(user, SPAN_WARNING("You are unable to stick [src] to [W]!"))
return FALSE
if(istype(target, /obj/structure/window))
@@ -301,7 +301,7 @@
prime(TRUE)
/obj/item/explosive/plastic/custom
- name = "Custom plastic explosive"
+ name = "custom plastic explosive"
desc = "A custom plastic explosive."
icon_state = "custom_plastic_explosive"
overlay_image = "custom_plastic_explosive_sensing"
diff --git a/code/game/objects/items/frames/camera.dm b/code/game/objects/items/frames/camera.dm
index 59bc2844868e..efe697c3944b 100644
--- a/code/game/objects/items/frames/camera.dm
+++ b/code/game/objects/items/frames/camera.dm
@@ -167,7 +167,7 @@
to_chat(user, SPAN_WARNING("\The [WT] needs to be on!"))
return 0
- to_chat(user, SPAN_NOTICE("You start to weld the [src].."))
+ to_chat(user, SPAN_NOTICE("You start to weld [src].."))
playsound(src.loc, 'sound/items/Welder.ogg', 25, 1)
WT.eyecheck(user)
if(do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
diff --git a/code/game/objects/items/lightstick.dm b/code/game/objects/items/lightstick.dm
index 70418049994b..89ce2c00762e 100644
--- a/code/game/objects/items/lightstick.dm
+++ b/code/game/objects/items/lightstick.dm
@@ -22,7 +22,7 @@
/obj/item/lightstick/Crossed(mob/living/O)
if(anchored && prob(trample_chance) && can_trample)
if(!istype(O,/mob/living/carbon/xenomorph/larva))
- visible_message(SPAN_DANGER("[O] tramples the [src]!"))
+ visible_message(SPAN_DANGER("[O] tramples [src]!"))
playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
if(istype(O,/mob/living/carbon/xenomorph))
if(prob(40))
@@ -46,17 +46,17 @@
if(!anchored)//If planted
return
- to_chat(user, "You start pulling out \the [src].")
- if(!do_after(user,20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+ to_chat(user, "You start pulling out [src].")
+ if(!do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
return
anchored = FALSE
- user.visible_message("[user.name] removes \the [src] from the ground.","You remove the [src] from the ground.")
+ user.visible_message("[user.name] removes [src] from the ground.", "You remove [src] from the ground.")
icon_state = "lightstick_[s_color][anchored]"
set_light(0)
pixel_x = 0
pixel_y = 0
- playsound(user, 'sound/weapons/Genhit.ogg', 25, 1)
+ playsound(user, 'sound/weapons/Genhit.ogg', 25, TRUE)
//Red
/obj/item/lightstick/planted
diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
index 50c5cd75551b..1699cb24ef39 100644
--- a/code/game/objects/items/misc.dm
+++ b/code/game/objects/items/misc.dm
@@ -134,7 +134,7 @@
return
stored_item = object
mobber.drop_inv_item_to_loc(object, src)
- to_chat(mobber, SPAN_NOTICE("You slide the [object] into [src]."))
+ to_chat(mobber, SPAN_NOTICE("You slide [object] into [src]."))
playsound(mobber, 'sound/weapons/gun_shotgun_shell_insert.ogg', 15, TRUE)
update_icon()
break
diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm
index 7860236d5d51..d8e65f1a3cd3 100644
--- a/code/game/objects/items/props/helmetgarb.dm
+++ b/code/game/objects/items/props/helmetgarb.dm
@@ -204,7 +204,7 @@
to_chat(user, SPAN_WARNING("Nothing to fix."))
else if(shape == NVG_SHAPE_COSMETIC)
- to_chat(user, SPAN_WARNING("it's nothing but a husk of what it used to be."))
+ to_chat(user, SPAN_WARNING("It's nothing but a husk of what it used to be."))
else
to_chat(user, "You begin to repair \the [src].")
@@ -496,6 +496,30 @@
desc = "The USCM had its funding pulled for these when it became apparent that not every deployed enlisted was wearing a helmet 24/7; much to the bafflement of UA High Command."
icon_state = "helmet_gasmask"
+/obj/item/prop/helmetgarb/helmet_gasmask/on_enter_storage(obj/item/storage/internal/helmet_internal_inventory)
+ ..()
+ if(!istype(helmet_internal_inventory))
+ return
+ var/obj/item/clothing/head/helmet/helmet_item = helmet_internal_inventory.master_object
+
+ if(!istype(helmet_item))
+ return
+
+ helmet_item.flags_inventory |= BLOCKGASEFFECT
+ helmet_item.flags_inv_hide |= HIDEFACE
+
+/obj/item/prop/helmetgarb/helmet_gasmask/on_exit_storage(obj/item/storage/internal/helmet_internal_inventory)
+ ..()
+ if(!istype(helmet_internal_inventory))
+ return
+ var/obj/item/clothing/head/helmet/helmet_item = helmet_internal_inventory.master_object
+
+ if(!istype(helmet_item))
+ return
+
+ helmet_item.flags_inventory &= ~(BLOCKGASEFFECT)
+ helmet_item.flags_inv_hide &= ~(HIDEFACE)
+
/obj/item/prop/helmetgarb/trimmed_wire
name = "trimmed barbed wire"
desc = "It is a length of barbed wire that's had most of the sharp points filed down so that it is safe to handle."
diff --git a/code/game/objects/items/reagent_containers/food/condiment.dm b/code/game/objects/items/reagent_containers/food/condiment.dm
index a13489f0af1e..35944e4422c4 100644
--- a/code/game/objects/items/reagent_containers/food/condiment.dm
+++ b/code/game/objects/items/reagent_containers/food/condiment.dm
@@ -23,7 +23,7 @@
return FALSE
if(M == user)
- to_chat(M, SPAN_NOTICE(" You swallow some of contents of the [src]."))
+ to_chat(M, SPAN_NOTICE("You swallow some of contents of [src]."))
else if(istype(M, /mob/living/carbon/human))
user.affected_message(M,
@@ -80,7 +80,7 @@
to_chat(user, SPAN_DANGER("[src] is empty."))
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- to_chat(user, SPAN_DANGER("you can't add anymore to [target]."))
+ to_chat(user, SPAN_DANGER("You can't add any more to [target]."))
return
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, SPAN_NOTICE(" You transfer [trans] units of the condiment to [target]."))
@@ -202,7 +202,7 @@
/obj/item/reagent_container/food/condiment/hotsauce/franks
name = "\improper Frank's Red Hot bottle"
desc = "A bottle of Weyland-Yutani brand Frank's Red Hot hot sauce."
- desc_lore = "Supposedly designed as a middle-ground flavor between ketchup and cayenne, this brand of spicy goodness achieved critical acclaim throughout UA space within both colonies and vessels alike. The sudden and widespread adoption was curiously timed with the near-simultaneous shelving of the original Frank's 'ULTRA' hot sauce."
+ desc_lore = "Supposedly designed as a middle-ground flavor between ketchup and cayenne, this brand of spicy goodness achieved critical acclaim throughout UA space within both colonies and vessels alike. The sudden and widespread adoption was curiously timed with the near-simultaneous shelving of the original Frank's 'ULTRA' hot sauce."
icon_state = "hotsauce_franks"
item_state = "hotsauce_franks"
diff --git a/code/game/objects/items/reagent_containers/food/fortunecookie.dm b/code/game/objects/items/reagent_containers/food/fortunecookie.dm
index 270bd4d7c44a..6077541acd84 100644
--- a/code/game/objects/items/reagent_containers/food/fortunecookie.dm
+++ b/code/game/objects/items/reagent_containers/food/fortunecookie.dm
@@ -75,7 +75,7 @@
to_chat(user,SPAN_WARNING("[src] is cracked open! How are you gonna slip something in that?"))
else
if(!cookiefortune)
- to_chat(user, SPAN_NOTICE("You slip the paper into the [src]."))
+ to_chat(user, SPAN_NOTICE("You slip the paper into [src]."))
cookiefortune = W
user.drop_inv_item_to_loc(W, src)
else
diff --git a/code/game/objects/items/reagent_containers/food/sandwich.dm b/code/game/objects/items/reagent_containers/food/sandwich.dm
index 1b7d61eaddad..511c0c042be1 100644
--- a/code/game/objects/items/reagent_containers/food/sandwich.dm
+++ b/code/game/objects/items/reagent_containers/food/sandwich.dm
@@ -18,7 +18,7 @@
/obj/item/reagent_container/food/snacks/csandwich/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/reagent_container/food/snacks/csandwich))
//No sandwitch inception, it causes some bugs...
- to_chat(user, SPAN_NOTICE(" You can't put a [W] in the [src]."))
+ to_chat(user, SPAN_NOTICE("You can't put \a [W] in [src]."))
return
var/sandwich_limit = 4
diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm
index 2892eb1113e7..eb33ca6b1d0f 100644
--- a/code/game/objects/items/reagent_containers/food/snacks.dm
+++ b/code/game/objects/items/reagent_containers/food/snacks.dm
@@ -217,10 +217,10 @@
if(isanimal(M))
if(iscorgi(M))
if(bitecount == 0 || prob(50))
- M.emote("nibbles away at the [src]")
+ M.emote("nibbles away at [src]")
bitecount++
if(bitecount >= 5)
- var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where the [src] was")
+ var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where [src] was")
if(sattisfaction_text)
M.emote("[sattisfaction_text]")
qdel(src)
@@ -2801,7 +2801,7 @@
if( open && pizza )
user.put_in_hands( pizza )
- to_chat(user, SPAN_DANGER("You take the [src.pizza] out of the [src]."))
+ to_chat(user, SPAN_DANGER("You take the [src.pizza] out of [src]."))
src.pizza = null
update_icon()
return
@@ -2852,11 +2852,11 @@
box.update_icon()
update_icon()
- to_chat(user, SPAN_DANGER("You put the [box] ontop of the [src]!"))
+ to_chat(user, SPAN_DANGER("You put [box] ontop of [src]!"))
else
to_chat(user, SPAN_DANGER("The stack is too high!"))
else
- to_chat(user, SPAN_DANGER("Close the [box] first!"))
+ to_chat(user, SPAN_DANGER("Close [box] first!"))
return
@@ -2868,9 +2868,9 @@
update_icon()
- to_chat(user, SPAN_DANGER("You put the [I] in the [src]!"))
+ to_chat(user, SPAN_DANGER("You put [I] in [src]!"))
else
- to_chat(user, SPAN_DANGER("You try to push the [I] through the lid but it doesn't work!"))
+ to_chat(user, SPAN_DANGER("You try to push [I] through the lid but it doesn't work!"))
return
if( istype(I, /obj/item/tool/pen/) )
diff --git a/code/game/objects/items/reagent_containers/glass.dm b/code/game/objects/items/reagent_containers/glass.dm
index e2a9ba537b0d..2a7bde748fba 100644
--- a/code/game/objects/items/reagent_containers/glass.dm
+++ b/code/game/objects/items/reagent_containers/glass.dm
@@ -237,7 +237,7 @@
overlays += lid
/obj/item/reagent_container/glass/minitank
- name = "MS-11 Smart Refill Tank"
+ name = "\improper MS-11 Smart Refill Tank"
desc = "A robust little tank capable of refilling autoinjectors that previously required a nanomed system to refill. Using the wonders of microchips, it automatically sorts the correct chemicals into most single reagent autoinjectors. It is unable to partially fill them however. A valve exists on the top to transfer reagents to another container or to flush it entirely."
icon = 'icons/obj/items/tank.dmi'
icon_state = "mini_reagent_tank"
@@ -277,7 +277,7 @@
if(istype(W, /obj/item/reagent_container/hypospray/autoinjector))
var/obj/item/reagent_container/hypospray/autoinjector/A = W
if(A.mixed_chem)
- to_chat(user, SPAN_WARNING("The autoinjector doesn't fit into the [src]'s valve. It's probably not compatible."))
+ to_chat(user, SPAN_WARNING("The autoinjector doesn't fit into [src]'s valve. It's probably not compatible."))
return
if(reagents.has_reagent(A.chemname, A.volume))
reagents.trans_id_to(A, A.chemname, A.volume)
@@ -285,10 +285,10 @@
A.update_icon()
playsound(src.loc, 'sound/effects/refill.ogg', 25, 1, 3)
else
- to_chat(user, SPAN_WARNING("A small LED on \the [src] blinks. The tank can't refill \the [A] - it's either incompatible or out of chemicals to fill it with!"))
+ to_chat(user, SPAN_WARNING("A small LED on [src] blinks. The tank can't refill [A] - it's either incompatible or out of chemicals to fill it with!"))
. = ..()
return
- to_chat(user,SPAN_INFO("You successfully refill \the [W.name] with \the [src]!"))
+ to_chat(user, SPAN_INFO("You successfully refill [A] with [src]!"))
/obj/item/reagent_container/glass/minitank/verb/flush_tank(mob/user)
set category = "Object"
@@ -299,7 +299,7 @@
to_chat(user, SPAN_WARNING("It's already empty!"))
return
playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1, 3)
- to_chat(user, SPAN_WARNING("You work the flush valve and successfully flush \the [src]'s contents!"))
+ to_chat(user, SPAN_WARNING("You work the flush valve and successfully flush [src]'s contents!"))
reagents.clear_reagents()
update_icon() // just to be sure
return
@@ -672,5 +672,5 @@
if(istype(AM) && (src in user))
user.visible_message("[user] starts to wipe down [AM] with [src]!")
if(do_after(user,30, INTERRUPT_ALL, BUSY_ICON_GENERIC))
- user.visible_message("[user] finishes wiping off the [AM]!")
+ user.visible_message("[user] finishes wiping off [AM]!")
AM.clean_blood()
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 34debd7c60cf..de2daa9a3009 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -12,7 +12,7 @@
/obj/item/robot/upgrade/proc/action(mob/living/silicon/robot/R)
if(R.stat == DEAD)
- to_chat(usr, SPAN_DANGER("The [src] will not function on a deceased robot."))
+ to_chat(usr, SPAN_DANGER("[src] will not function on a deceased robot."))
return 1
return 0
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 2f4dd0f532ca..a0814290ca40 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -223,11 +223,13 @@ GLOBAL_LIST_INIT_TYPED(cardboard_recipes, /datum/stack_recipe, list ( \
null, \
new/datum/stack_recipe_list("empty ammo boxes",list( \
new/datum/stack_recipe("empty magazine box (88 Mod 4 AP)", /obj/item/ammo_box/magazine/mod88/empty), \
+ new/datum/stack_recipe("empty magazine box (SU-6)", /obj/item/ammo_box/magazine/su6/empty), \
+ new/datum/stack_recipe("empty magazine box (VP78)", /obj/item/ammo_box/magazine/vp78/empty), \
+ null, \
new/datum/stack_recipe("empty magazine box (M4A3)", /obj/item/ammo_box/magazine/m4a3/empty), \
new/datum/stack_recipe("empty magazine box (M4A3 AP)", /obj/item/ammo_box/magazine/m4a3/ap/empty), \
new/datum/stack_recipe("empty magazine box (M4A3 HP)", /obj/item/ammo_box/magazine/m4a3/hp/empty), \
- new/datum/stack_recipe("empty magazine box (SU-6)", /obj/item/ammo_box/magazine/su6/empty), \
- new/datum/stack_recipe("empty magazine box (VP78)", /obj/item/ammo_box/magazine/vp78/empty), \
+ new/datum/stack_recipe("empty magazine box (M4A3 Incen)", /obj/item/ammo_box/magazine/m4a3/incen/empty), \
null, \
new/datum/stack_recipe("empty speed loader box (M44)", /obj/item/ammo_box/magazine/m44/empty), \
new/datum/stack_recipe("empty speed loader box (M44 Heavy)", /obj/item/ammo_box/magazine/m44/heavy/empty), \
@@ -256,10 +258,27 @@ GLOBAL_LIST_INIT_TYPED(cardboard_recipes, /datum/stack_recipe, list ( \
new/datum/stack_recipe("empty magazine box (M41A Incen)", /obj/item/ammo_box/magazine/incen/empty), \
new/datum/stack_recipe("empty magazine box (M41A LE)", /obj/item/ammo_box/magazine/le/empty), \
null, \
+ new/datum/stack_recipe("empty magazine box (M41A MK1)", /obj/item/ammo_box/magazine/mk1/empty), \
+ new/datum/stack_recipe("empty magazine box (M41A MK1 AP)", /obj/item/ammo_box/magazine/mk1/ap/empty), \
+ null, \
+ new/datum/stack_recipe("empty drum box (M56B)", /obj/item/ammo_box/magazine/m56b/empty), \
+ new/datum/stack_recipe("empty drum box (M56B Irradiated)", /obj/item/ammo_box/magazine/m56b/dirty/empty), \
+ new/datum/stack_recipe("empty drum box (M56D)", /obj/item/ammo_box/magazine/m56d/empty), \
+ null, \
+ new/datum/stack_recipe("empty drum box (M2C)", /obj/item/ammo_box/magazine/m2c/empty), \
+ null, \
+ new/datum/stack_recipe("empty magazine box (M41AE2)", /obj/item/ammo_box/magazine/m41ae2/empty), \
+ new/datum/stack_recipe("empty magazine box (M41AE2 Holo-Target)", /obj/item/ammo_box/magazine/m41ae2/holo/empty), \
+ new/datum/stack_recipe("empty magazine box (M41AE2 HEAP)", /obj/item/ammo_box/magazine/m41ae2/heap/empty), \
+ null, \
+ new/datum/stack_recipe("empty flamer tank box (UT-Napthal)", /obj/item/ammo_box/magazine/flamer/empty), \
+ new/datum/stack_recipe("empty flamer tank box (Napalm B-Gel)", /obj/item/ammo_box/magazine/flamer/bgel/empty), \
+ null, \
new/datum/stack_recipe("empty shotgun shell box (Beanbag)", /obj/item/ammo_box/magazine/shotgun/beanbag/empty), \
new/datum/stack_recipe("empty shotgun shell box (Buckshot)", /obj/item/ammo_box/magazine/shotgun/buckshot/empty), \
new/datum/stack_recipe("empty shotgun shell box (Flechette)", /obj/item/ammo_box/magazine/shotgun/flechette/empty), \
new/datum/stack_recipe("empty shotgun shell box (Incendiary)", /obj/item/ammo_box/magazine/shotgun/incendiary/empty), \
+ new/datum/stack_recipe("empty shotgun shell box (Incendiary Buckshot)", /obj/item/ammo_box/magazine/shotgun/incendiarybuck/empty), \
new/datum/stack_recipe("empty shotgun shell box (Slugs)", /obj/item/ammo_box/magazine/shotgun/empty), \
null, \
new/datum/stack_recipe("empty 45-70 bullets box", /obj/item/ammo_box/magazine/lever_action/empty), \
@@ -279,17 +298,42 @@ GLOBAL_LIST_INIT_TYPED(cardboard_recipes, /datum/stack_recipe, list ( \
new/datum/stack_recipe("empty rifle ammo box (10x24mm Incen)", /obj/item/ammo_box/rounds/incen/empty), \
new/datum/stack_recipe("empty rifle ammo box (10x24mm LE)", /obj/item/ammo_box/rounds/le/empty), \
null, \
+ new/datum/stack_recipe("empty rifle ammo box (9mm)", /obj/item/ammo_box/rounds/pistol/empty), \
+ new/datum/stack_recipe("empty rifle ammo box (9mm AP)", /obj/item/ammo_box/rounds/pistol/ap/empty), \
+ new/datum/stack_recipe("empty rifle ammo box (9mm HP)", /obj/item/ammo_box/rounds/pistol/hp/empty), \
+ new/datum/stack_recipe("empty rifle ammo box (9mm Incen)", /obj/item/ammo_box/rounds/pistol/incen/empty), \
+ null, \
new/datum/stack_recipe("empty box of MREs", /obj/item/ammo_box/magazine/misc/mre/empty), \
new/datum/stack_recipe("empty box of M94 Marking Flare Packs", /obj/item/ammo_box/magazine/misc/flares/empty), \
+ new/datum/stack_recipe("empty box of M89 Signal Flare Packs", /obj/item/ammo_box/magazine/misc/flares/signal/empty), \
new/datum/stack_recipe("empty box of flashlights", /obj/item/ammo_box/magazine/misc/flashlight/empty), \
new/datum/stack_recipe("empty box of High-Capacity Power Cells", /obj/item/ammo_box/magazine/misc/power_cell/empty), \
null, \
+ new/datum/stack_recipe("empty magazine box (Desert Eagle)", /obj/item/ammo_box/magazine/deagle/empty), \
+ new/datum/stack_recipe("empty magazine box (Desert Eagle Heavy)", /obj/item/ammo_box/magazine/deagle/super/empty), \
+ new/datum/stack_recipe("empty magazine box (Desert Eagle High-Impact)", /obj/item/ammo_box/magazine/deagle/super/highimpact/empty), \
+ new/datum/stack_recipe("empty magazine box (Desert Eagle AP)", /obj/item/ammo_box/magazine/deagle/super/highimpact/ap/empty), \
+ null, \
+ new/datum/stack_recipe("empty magazine box (Spearhead HP)", /obj/item/ammo_box/magazine/spearhead/empty), \
+ new/datum/stack_recipe("empty magazine box (Spearhead)", /obj/item/ammo_box/magazine/spearhead/normalpoint/empty), \
+ null, \
new/datum/stack_recipe("empty magazine box (M16)", /obj/item/ammo_box/magazine/M16/empty), \
new/datum/stack_recipe("empty magazine box (M16 AP)", /obj/item/ammo_box/magazine/M16/ap/empty), \
null, \
+ new/datum/stack_recipe("empty magazine box (AR10)", /obj/item/ammo_box/magazine/ar10/empty), \
+ null, \
+ new/datum/stack_recipe("empty magazine box (MP5)", /obj/item/ammo_box/magazine/mp5/empty), \
+ null, \
+ new/datum/stack_recipe("empty magazine box (NSG 23)", /obj/item/ammo_box/magazine/nsg23/empty), \
+ new/datum/stack_recipe("empty magazine box (NSG 23 AP)", /obj/item/ammo_box/magazine/nsg23/ap/empty), \
+ new/datum/stack_recipe("empty magazine box (NSG 23 EX)", /obj/item/ammo_box/magazine/nsg23/ex/empty), \
+ null, \
new/datum/stack_recipe("empty magazine box (Type71)", /obj/item/ammo_box/magazine/type71/empty), \
new/datum/stack_recipe("empty magazine box (Type71 AP)", /obj/item/ammo_box/magazine/type71/ap/empty), \
null, \
+ new/datum/stack_recipe("empty magazine box (Type73)", /obj/item/ammo_box/magazine/type73/empty), \
+ new/datum/stack_recipe("empty magazine box (Type73 High-Impact)", /obj/item/ammo_box/magazine/type73/impact/empty), \
+ null, \
new/datum/stack_recipe("empty rifle ammo box (5.45x39mm)", /obj/item/ammo_box/rounds/type71/empty), \
new/datum/stack_recipe("empty rifle ammo box (5.45x39mm AP)", /obj/item/ammo_box/rounds/type71/ap/empty), \
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index 76f98c423974..b02dff1bdbcc 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -250,12 +250,12 @@
return FALSE
if(user.back != src)
- to_chat(user, "The [src] must be equipped before you can switch types")
+ to_chat(user, SPAN_WARNING("[src] must be equipped before you can switch types."))
return
var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand()
if(!istype(flamer))
- to_chat(user, "You must be holding the M240-T incinerator unit to use [src]")
+ to_chat(user, SPAN_WARNING("You must be holding [flamer] to use [src]."))
return
if(!active_fuel)
diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm
index 7681e74a1d88..82870f7ed8d1 100644
--- a/code/game/objects/items/tools/flame_tools.dm
+++ b/code/game/objects/items/tools/flame_tools.dm
@@ -233,12 +233,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
light(SPAN_NOTICE("[user] fiddles with [W], and manages to light their [name]."))
else if(istype(W, /obj/item/attachable/attached_gun/flamer))
- light(SPAN_NOTICE("[user] lights their [src] with the [W]."))
+ light(SPAN_NOTICE("[user] lights their [name] with [W]."))
else if(istype(W, /obj/item/weapon/gun/flamer))
var/obj/item/weapon/gun/flamer/F = W
if(!(F.flags_gun_features & GUN_TRIGGER_SAFETY))
- light(SPAN_NOTICE("[user] lights their [src] with the pilot light of the [F]."))
+ light(SPAN_NOTICE("[user] lights their [name] with the pilot light of [F]."))
else
to_chat(user, SPAN_WARNING("Turn on the pilot light first!"))
@@ -246,20 +246,20 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/obj/item/weapon/gun/G = W
for(var/slot in G.attachments)
if(istype(G.attachments[slot], /obj/item/attachable/attached_gun/flamer))
- light(SPAN_NOTICE("[user] lights their [src] with [G.attachments[slot]]."))
+ light(SPAN_NOTICE("[user] lights their [name] with [G.attachments[slot]]."))
break
else if(istype(W, /obj/item/tool/surgery/cautery))
- light(SPAN_NOTICE("[user] lights their [src] with the [W]."))
+ light(SPAN_NOTICE("[user] lights their [name] with [W]."))
else if(istype(W, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/C = W
if(C.item_state == icon_on)
- light(SPAN_NOTICE("[user] lights their [src] with the [C] after a few attempts."))
+ light(SPAN_NOTICE("[user] lights their [name] with [C] after a few attempts."))
else if(istype(W, /obj/item/tool/candle))
if(W.heat_source > 200)
- light(SPAN_NOTICE("[user] lights their [src] with the [W] after a few attempts."))
+ light(SPAN_NOTICE("[user] lights their [name] with [W] after a few attempts."))
return
@@ -529,12 +529,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
light(SPAN_NOTICE("[user] fiddles with [W], and manages to light their [name] with the power of science."))
else if(istype(W, /obj/item/attachable/attached_gun/flamer))
- light(SPAN_NOTICE("[user] lights their [src] with the [W], bet that would have looked cooler if it was attached to something first!"))
+ light(SPAN_NOTICE("[user] lights their [name] with [W], bet that would have looked cooler if it was attached to something first!"))
else if(istype(W, /obj/item/weapon/gun/flamer))
var/obj/item/weapon/gun/flamer/F = W
if(!(F.flags_gun_features & GUN_TRIGGER_SAFETY))
- light(SPAN_NOTICE("[user] lights their [src] with the pilot light of the [F], the glint of pyromania in their eye."))
+ light(SPAN_NOTICE("[user] lights their [name] with the pilot light of [F], the glint of pyromania in their eye."))
else
to_chat(user, SPAN_WARNING("Turn on the pilot light first!"))
@@ -546,16 +546,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM
break
else if(istype(W, /obj/item/tool/surgery/cautery))
- light(SPAN_NOTICE("[user] lights their [src] with the [W], that can't be sterile!"))
+ light(SPAN_NOTICE("[user] lights their [name] with [W], that can't be sterile!"))
else if(istype(W, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/C = W
if(C.item_state == icon_on)
- light(SPAN_NOTICE("[user] lights their [src] with the [C] after a few attempts."))
+ light(SPAN_NOTICE("[user] lights their [name] with [C] after a few attempts."))
else if(istype(W, /obj/item/tool/candle))
if(W.heat_source > 200)
- light(SPAN_NOTICE("[user] lights their [src] with the [W] after a few attempts."))
+ light(SPAN_NOTICE("[user] lights their [name] with [W] after a few attempts."))
/////////////////
//SMOKING PIPES//
@@ -751,7 +751,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else
playsound(src.loc,"lighter",10, 1, 3)
if(prob(95))
- user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light the [src]."))
+ user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light [src]."))
else
to_chat(user, SPAN_WARNING("You burn yourself while lighting the lighter."))
@@ -759,7 +759,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
user.apply_damage(2,BURN,"l_hand")
else
user.apply_damage(2,BURN,"r_hand")
- user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light the [src], they however burn their finger in the process."))
+ user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light [src], they however burn their finger in the process."))
set_light_range(2)
set_light_on(TRUE)
@@ -777,10 +777,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = icon_off
if(!silent)
if(istype(src, /obj/item/tool/lighter/zippo) )
- bearer.visible_message("You hear a quiet click, as [bearer] shuts off [src] without even looking at what they're doing.")
+ bearer.visible_message(SPAN_ROSE("You hear a quiet click, as [bearer] shuts off [src] without even looking at what they're doing."))
playsound(src.loc,"zippo_close",10, 1, 3)
else
- bearer.visible_message(SPAN_NOTICE("[bearer] quietly shuts off the [src]."))
+ bearer.visible_message(SPAN_NOTICE("[bearer] quietly shuts off [src]."))
set_light_on(FALSE)
STOP_PROCESSING(SSobj, src)
@@ -805,4 +805,3 @@ CIGARETTE PACKETS ARE IN FANCY.DM
cig.light(SPAN_NOTICE("[user] holds the [name] out for [M], and lights the [cig.name]."))
else
..()
-
diff --git a/code/game/objects/items/tools/kitchen_tools.dm b/code/game/objects/items/tools/kitchen_tools.dm
index bb763ada9911..2cff941be8d6 100644
--- a/code/game/objects/items/tools/kitchen_tools.dm
+++ b/code/game/objects/items/tools/kitchen_tools.dm
@@ -218,7 +218,7 @@
var/cooldown = 0
/obj/item/tool/kitchen/tray/attack(mob/living/carbon/M, mob/living/carbon/user)
- to_chat(user, SPAN_WARNING("You accidentally slam yourself with the [src]!"))
+ to_chat(user, SPAN_WARNING("You accidentally slam yourself with [src]!"))
user.apply_effect(1, WEAKEN)
user.take_limb_damage(2)
diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm
index a326808bf491..a02536800f15 100644
--- a/code/game/objects/items/tools/maintenance_tools.dm
+++ b/code/game/objects/items/tools/maintenance_tools.dm
@@ -96,8 +96,8 @@
if(E)
var/safety = H.get_eye_protection()
if(!safety)
- to_chat(user, SPAN_DANGER("You stab [H] in the eyes with the [src]!"))
- visible_message(SPAN_DANGER("[user] stabs [H] in the eyes with the [src]!"))
+ user.visible_message(SPAN_DANGER("[user] stabs [H] in the eyes with [src]!"),
+ SPAN_DANGER("You stab [H] in the eyes with [src]!"))
E.take_damage(rand(8,20))
return ..()
/obj/item/tool/screwdriver/tactical
diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm
index f70f93497021..44aaab771db8 100644
--- a/code/game/objects/items/tools/misc_tools.dm
+++ b/code/game/objects/items/tools/misc_tools.dm
@@ -132,7 +132,7 @@
qdel(I) //delete the paper item
labels_left = initial(labels_left)
else
- to_chat(user, SPAN_NOTICE("The [src] is already full."))
+ to_chat(user, SPAN_NOTICE("[src] is already full."))
/*
Instead of updating labels_left to user every label used,
diff --git a/code/game/objects/items/tools/shovel_tools.dm b/code/game/objects/items/tools/shovel_tools.dm
index 008b37705fe3..ad74dca54e88 100644
--- a/code/game/objects/items/tools/shovel_tools.dm
+++ b/code/game/objects/items/tools/shovel_tools.dm
@@ -151,7 +151,7 @@
/obj/item/tool/shovel/proc/dump_shovel(atom/target, mob/user)
var/turf/T = target
- to_chat(user, SPAN_NOTICE("you dump the [dirt_type_to_name(dirt_type)]!"))
+ to_chat(user, SPAN_NOTICE("You dump the [dirt_type_to_name(dirt_type)]!"))
playsound(user.loc, "rustle", 30, 1, 6)
if(dirt_type == DIRT_TYPE_SNOW)
var/obj/item/stack/snow/S = locate() in T
diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index 88946f5fa446..65234c59b89b 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -44,7 +44,7 @@
if(!proximity) return
if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1)
A.reagents.trans_to(src, 10)
- to_chat(user, SPAN_NOTICE(" You fill the balloon with the contents of [A]."))
+ to_chat(user, SPAN_NOTICE("You fill the balloon with the contents of [A]."))
src.desc = "A translucent balloon with some form of liquid sloshing around in it."
src.update_icon()
return
@@ -53,22 +53,22 @@
if(istype(O, /obj/item/reagent_container/glass))
if(O.reagents)
if(O.reagents.total_volume < 1)
- to_chat(user, "The [O] is empty.")
+ to_chat(user, SPAN_WARNING("[O] is empty."))
else if(O.reagents.total_volume >= 1)
if(O.reagents.has_reagent("pacid", 1))
- to_chat(user, "The acid chews through the balloon!")
+ to_chat(user, SPAN_WARNING("The acid chews through the balloon!"))
O.reagents.reaction(user)
qdel(src)
else
src.desc = "A translucent balloon with some form of liquid sloshing around in it."
- to_chat(user, SPAN_NOTICE(" You fill the balloon with the contents of [O]."))
+ to_chat(user, SPAN_NOTICE("You fill the balloon with the contents of [O]."))
O.reagents.trans_to(src, 10)
src.update_icon()
return
/obj/item/toy/balloon/launch_impact(atom/hit_atom)
if(src.reagents.total_volume >= 1)
- src.visible_message(SPAN_DANGER("The [src] bursts!"),"You hear a pop and a splash.")
+ src.visible_message(SPAN_DANGER("[src] bursts!"),"You hear a pop and a splash.")
src.reagents.reaction(get_turf(hit_atom))
for(var/atom/A in get_turf(hit_atom))
src.reagents.reaction(A)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 82fdf30f0fc4..310c53dd5d0f 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -106,7 +106,7 @@
bcell.update_icon()
bcell.forceMove(get_turf(src.loc))
bcell = null
- to_chat(user, SPAN_NOTICE("You remove the cell from the [src]."))
+ to_chat(user, SPAN_NOTICE("You remove the cell from [src]."))
status = 0
update_icon()
return
@@ -183,10 +183,10 @@
// Logging
if(user == L)
- user.attack_log += "\[[time_stamp()]\] [key_name(user)] stunned themselves with the [src] in [get_area(user)]"
+ user.attack_log += "\[[time_stamp()]\] [key_name(user)] stunned themselves with [src] in [get_area(user)]"
else
- msg_admin_attack("[key_name(user)] stunned [key_name(L)] with the [src] in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z]).", user.loc.x, user.loc.y, user.loc.z)
- var/logentry = "\[[time_stamp()]\] [key_name(user)] stunned [key_name(L)] with the [src] in [get_area(user)]"
+ msg_admin_attack("[key_name(user)] stunned [key_name(L)] with [src] in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z]).", user.loc.x, user.loc.y, user.loc.z)
+ var/logentry = "\[[time_stamp()]\] [key_name(user)] stunned [key_name(L)] with [src] in [get_area(user)]"
L.attack_log += logentry
user.attack_log += logentry
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 0baa83f8e791..f3c76bcff638 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -113,7 +113,7 @@
w_class = SIZE_MEDIUM
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
else
- to_chat(user, SPAN_NOTICE("The [src] can now be concealed."))
+ to_chat(user, SPAN_NOTICE("[src] can now be concealed."))
force = initial(force)
edge = 0
sharp = 0
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 95998d5de79a..2519ed2940d5 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -209,7 +209,7 @@
/obj/structure/proc/toggle_anchored(obj/item/W, mob/user)
if(!wrenchable)
- to_chat(user, SPAN_WARNING("The [src] cannot be [anchored ? "un" : ""]anchored."))
+ to_chat(user, SPAN_WARNING("[src] cannot be [anchored ? "un" : ""]anchored."))
return FALSE
else
// Wrenching is faster if we are better at engineering
diff --git a/code/game/objects/structures/barricade/metal.dm b/code/game/objects/structures/barricade/metal.dm
index 4056ac9021f8..4f250eed50e9 100644
--- a/code/game/objects/structures/barricade/metal.dm
+++ b/code/game/objects/structures/barricade/metal.dm
@@ -110,7 +110,7 @@
to_chat(user, SPAN_NOTICE("You lack the required metal."))
return
if((usr.get_active_hand()) != metal)
- to_chat(user, SPAN_WARNING("You must be holding the [metal] to upgrade \the [src]!"))
+ to_chat(user, SPAN_WARNING("You must be holding [metal] to upgrade [src]!"))
return
switch(choice)
@@ -150,7 +150,7 @@
to_chat(user, SPAN_NOTICE("You lack the required metal."))
return
if((usr.get_active_hand()) != metal)
- to_chat(user, SPAN_WARNING("You must be holding the [metal] to upgrade \the [src]!"))
+ to_chat(user, SPAN_WARNING("You must be holding [metal] to upgrade [src]!"))
return
switch(choice)
diff --git a/code/game/objects/structures/barricade/plasteel.dm b/code/game/objects/structures/barricade/plasteel.dm
index 85057f9a0596..dd95aa3f1baf 100644
--- a/code/game/objects/structures/barricade/plasteel.dm
+++ b/code/game/objects/structures/barricade/plasteel.dm
@@ -125,7 +125,7 @@
user.visible_message(SPAN_NOTICE("[user] sets up [src] for linking."),
SPAN_NOTICE("You set up [src] for linking."))
else
- to_chat(user, SPAN_WARNING("The [src] has no linking points..."))
+ to_chat(user, SPAN_WARNING("[src] has no linking points..."))
return
linked = !linked
for(var/direction in GLOB.cardinals)
@@ -210,7 +210,7 @@
if(closed)
if(recentlyflipped)
- to_chat(user, SPAN_NOTICE("The [src] has been flipped too recently!"))
+ to_chat(user, SPAN_NOTICE("[src] has been flipped too recently!"))
return
user.visible_message(SPAN_NOTICE("[user] flips [src] open."),
SPAN_NOTICE("You flip [src] open."))
@@ -222,7 +222,7 @@
else
if(recentlyflipped)
- to_chat(user, SPAN_NOTICE("The [src] has been flipped too recently!"))
+ to_chat(user, SPAN_NOTICE("[src] has been flipped too recently!"))
return
user.visible_message(SPAN_NOTICE("[user] flips [src] closed."),
SPAN_NOTICE("You flip [src] closed."))
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 2efd8e4e81e9..fa87cd6b2b71 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -200,7 +200,7 @@
/obj/structure/closet/attack_animal(mob/living/user)
if(user.wall_smash)
- visible_message(SPAN_DANGER("[user] destroys the [src]. "))
+ visible_message(SPAN_DANGER("[user] destroys [src]."))
for(var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
qdel(src)
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index f1c9daa514c1..0e4a20cf989a 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -725,7 +725,7 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE.
//this bush marks the edge of the map, you can't destroy it
to_chat(user, SPAN_DANGER("You flail away at the undergrowth, but it's too thick here."))
else
- user.visible_message(SPAN_DANGER("[user] flails away at the [src] with [I]."),SPAN_DANGER("You flail away at the [src] with [I]."))
+ user.visible_message(SPAN_DANGER("[user] flails away at [src] with [I]."), SPAN_DANGER("You flail away at [src] with [I]."))
playsound(src.loc, 'sound/effects/vegetation_hit.ogg', 25, 1)
health -= damage
if(health < 0)
@@ -758,4 +758,3 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE.
desc = "Looks like some of that fruit might be edible."
icon_tag = "plant"
variations = 7
-
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 0f864ee2f116..063f6a337290 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -166,7 +166,7 @@
if (ST.use(1))
var/obj/structure/window/WD = new wtype(loc)
WD.set_constructed_window(dir_to_set)
- to_chat(user, SPAN_NOTICE("You place the [WD] on [src]."))
+ to_chat(user, SPAN_NOTICE("You place [WD] on [src]."))
return
//window placing end
diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm
index 6e6f6d5f8247..e14eee13b1dd 100644
--- a/code/game/objects/structures/props.dm
+++ b/code/game/objects/structures/props.dm
@@ -1187,7 +1187,7 @@
var/obj/item/dogtag/dog = W
if(!tagged)
tagged = TRUE
- user.visible_message(SPAN_NOTICE("[user] drapes the [W] around the [src]."))
+ user.visible_message(SPAN_NOTICE("[user] drapes [W] around [src]."))
dogtag_name = popleft(dog.fallen_names)
dogtag_assign = popleft(dog.fallen_assgns)
dogtag_blood = popleft(dog.fallen_blood_types)
@@ -1198,7 +1198,7 @@
else
return
else
- to_chat(user, SPAN_WARNING("There's already a dog tag on the [src]!"))
+ to_chat(user, SPAN_WARNING("There's already a dog tag on [src]!"))
balloon_alert(user, "already a tag here!")
if(istype(W, /obj/item/clothing/head))
@@ -1372,4 +1372,3 @@
if(initial(emote.sound))
playsound(loc, initial(emote.sound), 50, FALSE)
return TRUE
-
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 60c37fcdc607..daf4a47a8ef6 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -151,7 +151,7 @@
GM.apply_damage(5, OXY)
swirlie = null
else
- user.visible_message(SPAN_DANGER("[user] slams [GM.name] into the [src]!"), SPAN_NOTICE("You slam [GM.name] into the [src]!"))
+ user.visible_message(SPAN_DANGER("[user] slams [GM.name] into [src]!"), SPAN_NOTICE("You slam [GM.name] into [src]!"))
GM.apply_damage(8, BRUTE)
else
to_chat(user, SPAN_NOTICE("You need a tighter grip."))
@@ -189,7 +189,7 @@
if(!GM.loc == get_turf(src))
to_chat(user, SPAN_NOTICE("[GM.name] needs to be on the urinal."))
return
- user.visible_message(SPAN_DANGER("[user] slams [GM.name] into the [src]!"), SPAN_NOTICE("You slam [GM.name] into the [src]!"))
+ user.visible_message(SPAN_DANGER("[user] slams [GM.name] into [src]!"), SPAN_NOTICE("You slam [GM.name] into [src]!"))
GM.apply_damage(8, BRUTE)
else
to_chat(user, SPAN_NOTICE("You need a tighter grip."))
diff --git a/code/game/turfs/auto_turf.dm b/code/game/turfs/auto_turf.dm
index 75501a1a7ecd..e07f7324bcc2 100644
--- a/code/game/turfs/auto_turf.dm
+++ b/code/game/turfs/auto_turf.dm
@@ -169,7 +169,7 @@
if(istype(I, /obj/item/lightstick))
var/obj/item/lightstick/L = I
if(locate(/obj/item/lightstick) in get_turf(src))
- to_chat(user, "There's already a [L] at this position!")
+ to_chat(user, "There's already \a [L] at this position!")
return
to_chat(user, "Now planting \the [L].")
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index 72624aff99c8..7d9dd6303c64 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -292,7 +292,7 @@
if(istype(I, /obj/item/lightstick))
var/obj/item/lightstick/L = I
if(locate(/obj/item/lightstick) in get_turf(src))
- to_chat(user, "There's already a [L] at this position!")
+ to_chat(user, "There's already \a [L] at this position!")
return
to_chat(user, "Now planting \the [L].")
@@ -787,7 +787,7 @@
if(istype(I, /obj/item/lightstick))
var/obj/item/lightstick/L = I
if(locate(/obj/item/lightstick) in get_turf(src))
- to_chat(user, "There's already a [L] at this position!")
+ to_chat(user, "There's already \a [L] at this position!")
return
to_chat(user, "Now planting \the [L].")
diff --git a/code/game/turfs/snow.dm b/code/game/turfs/snow.dm
index 42cc9bd544c5..f7fb746cfbbc 100644
--- a/code/game/turfs/snow.dm
+++ b/code/game/turfs/snow.dm
@@ -16,7 +16,7 @@
if(istype(I, /obj/item/lightstick))
var/obj/item/lightstick/L = I
if(locate(/obj/item/lightstick) in get_turf(src))
- to_chat(user, "There's already a [L] at this position!")
+ to_chat(user, "There's already \a [L] at this position!")
return
to_chat(user, "Now planting \the [L].")
@@ -148,6 +148,3 @@
/turf/open/snow/layer3
icon_state = "snow_3"
bleed_layer = 3
-
-
-
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 45590c3fa006..9cad56cdabe8 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -182,7 +182,7 @@
for(var/category in listings)
dat += "
Current [category] ([length(listings[category])]):
\n"
for(var/client/entry in listings[category])
- dat += "\t[entry.key] is a [entry.admin_holder.rank]"
+ dat += "\t[entry.key] is \a [entry.admin_holder.rank]"
if(entry.admin_holder.extra_titles?.len)
for(var/srank in entry.admin_holder.extra_titles)
dat += " & [srank]"
diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index 9ac4c5f807ea..910bafd50a9b 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -8,4 +8,4 @@
create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")
create_mob_html = replacetext(create_mob_html, "/* href token */", RawHrefToken(forceGlobal = TRUE))
- show_browser(user, replacetext(create_mob_html, "/* ref src */", "\ref[src]"), "Create Mob", "create_mob", "size=425x475")
+ show_browser(user, replacetext(create_mob_html, "/* ref src */", "\ref[src]"), "Create Mob", "create_mob", "size=450x525")
diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index 3b1f978dd50a..054fc20aef5e 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -8,7 +8,7 @@
create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"")
create_object_html = replacetext(create_object_html, "/* href token */", RawHrefToken(forceGlobal = TRUE))
- show_browser(user, replacetext(create_object_html, "/* ref src */", "\ref[src]"), "Create Object", "create_object", "size=425x475")
+ show_browser(user, replacetext(create_object_html, "/* ref src */", "\ref[src]"), "Create Object", "create_object", "size=450x525")
/datum/admins/proc/quick_create_object(mob/user)
@@ -46,4 +46,4 @@
quick_create_object_html = replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"")
quick_create_object_html = replacetext(quick_create_object_html, "/* href token */", RawHrefToken(forceGlobal = TRUE))
- show_browser(user, replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "Quick Create Object", "quick_create_object", "size=425x475")
+ show_browser(user, replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "Quick Create Object", "quick_create_object", "size=450x525")
diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm
index 1535c303bcd9..cc8bd1a5ec77 100644
--- a/code/modules/admin/create_turf.dm
+++ b/code/modules/admin/create_turf.dm
@@ -8,4 +8,4 @@
create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"")
create_turf_html = replacetext(create_turf_html, "/* href token */", RawHrefToken(forceGlobal = TRUE))
- show_browser(usr, replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "Create Turf", "create_turf", "size=425x475")
+ show_browser(usr, replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "Create Turf", "create_turf", "size=450x525")
diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm
index 7a6359ccf090..6ae974d2faea 100644
--- a/code/modules/admin/tabs/event_tab.dm
+++ b/code/modules/admin/tabs/event_tab.dm
@@ -217,18 +217,15 @@
if(!istype(chosen_ert))
return
-
- var/launch_broadcast = tgui_alert(usr, "Would you like to broadcast the beacon launch? This will reveal the distress beacon to all players.", "Announce distress beacon?", list("Yes", "No"), 20 SECONDS)
- if(launch_broadcast == "Yes")
- launch_broadcast = TRUE
- else
- launch_broadcast = FALSE
-
- var/announce_receipt = tgui_alert(usr, "Would you like to announce the beacon received message? This will reveal the distress beacon to all players.", "Announce beacon received?", list("Yes", "No"), 20 SECONDS)
- if(announce_receipt == "Yes")
+ var/quiet_launch = TRUE
+ var/ql_prompt = tgui_alert(usr, "Would you like to broadcast the beacon launch? This will reveal the distress beacon to all players.", "Announce distress beacon?", list("Yes", "No"), 20 SECONDS)
+ if(ql_prompt == "Yes")
+ quiet_launch = FALSE
+
+ var/announce_receipt = FALSE
+ var/ar_prompt = tgui_alert(usr, "Would you like to announce the beacon received message? This will reveal the distress beacon to all players.", "Announce beacon received?", list("Yes", "No"), 20 SECONDS)
+ if(ar_prompt == "Yes")
announce_receipt = TRUE
- else
- announce_receipt = FALSE
var/turf/override_spawn_loc
var/prompt = tgui_alert(usr, "Spawn at their assigned spawn, or at your location?", "Spawnpoint Selection", list("Spawn", "Current Location"), 0)
@@ -238,7 +235,7 @@
if(prompt == "Current Location")
override_spawn_loc = get_turf(usr)
- chosen_ert.activate(quiet_launch = launch_broadcast, announce_incoming = announce_receipt, override_spawn_loc = override_spawn_loc)
+ chosen_ert.activate(quiet_launch, announce_receipt, override_spawn_loc)
message_admins("[key_name_admin(usr)] admin-called a [choice == "Randomize" ? "randomized ":""]distress beacon: [chosen_ert.name]")
@@ -441,8 +438,8 @@
GLOB.supply_controller.shoppinglist += new_order
marine_announcement("A nuclear device has been supplied and will be delivered to requisitions via ASRS.", "NUCLEAR ARSENAL ACQUIRED", 'sound/misc/notice2.ogg')
- message_admins("[key_name_admin(usr)] admin-spawned a [encrypt] nuke.")
- log_game("[key_name_admin(usr)] admin-spawned a [encrypt] nuke.")
+ message_admins("[key_name_admin(usr)] admin-spawned \a [encrypt] nuke.")
+ log_game("[key_name_admin(usr)] admin-spawned \a [encrypt] nuke.")
/client/proc/turn_everyone_into_primitives()
var/random_names = FALSE
@@ -524,7 +521,7 @@
else
marine_announcement(input, customname, 'sound/AI/commandreport.ogg', faction)
- message_admins("[key_name_admin(src)] has created a [faction] command report")
+ message_admins("[key_name_admin(src)] has created \a [faction] command report")
log_admin("[key_name_admin(src)] [faction] command report: [input]")
/client/proc/cmd_admin_xeno_report()
diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm
index a0e9e8b787aa..10ba5b0f1091 100644
--- a/code/modules/admin/topic/topic.dm
+++ b/code/modules/admin/topic/topic.dm
@@ -590,7 +590,7 @@
var/mob/M = locate(href_list["forcespeech"])
if(!ismob(M))
- to_chat(usr, "this can only be used on instances of type /mob")
+ to_chat(usr, "This can only be used on instances of type /mob")
return
var/speech = input("What will [key_name(M)] say?.", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins.
@@ -603,7 +603,7 @@
if(!check_rights(R_ADMIN)) return
var/mob/living/carbon/human/H = locate(href_list["zombieinfect"])
if(!istype(H))
- to_chat(usr, "this can only be used on instances of type /human")
+ to_chat(usr, "This can only be used on instances of type /human")
return
if(alert(usr, "Are you sure you want to infect them with a ZOMBIE VIRUS? This can trigger a major event!", "Message", "Yes", "No") != "Yes")
@@ -622,7 +622,7 @@
if(!check_rights(R_ADMIN)) return
var/mob/living/carbon/human/H = locate(href_list["larvainfect"])
if(!istype(H))
- to_chat(usr, "this can only be used on instances of type /human")
+ to_chat(usr, "This can only be used on instances of type /human")
return
if(alert(usr, "Are you sure you want to infect them with a xeno larva?", "Message", "Yes", "No") != "Yes")
@@ -704,7 +704,7 @@
var/mob/M = locate(href_list["forceemote"])
if(!ismob(M))
- to_chat(usr, "this can only be used on instances of type /mob")
+ to_chat(usr, "This can only be used on instances of type /mob")
var/speech = input("What will [key_name(M)] emote?.", "Force emote", "")// Don't need to sanitize, since it does that in say(), we also trust our admins.
if(!speech) return
@@ -1786,7 +1786,7 @@
var/prompt = tgui_alert(usr, "Do you want the nuke to be Encrypted?", "Nuke Type", list("Encrypted", "Decrypted"), 20 SECONDS)
if(prompt == "Decrypted")
nuketype = "Decrypted Operational Nuke"
- prompt = tgui_alert(usr, "Are you sure you want to authorize a [nuketype] to the marines? This will greatly affect the round!", "DEFCON 1", list("No", "Yes"))
+ prompt = tgui_alert(usr, "Are you sure you want to authorize \a [nuketype] to the marines? This will greatly affect the round!", "DEFCON 1", list("No", "Yes"))
if(prompt != "Yes")
return
@@ -1803,8 +1803,8 @@
GLOB.ares_datacore.nuke_available = FALSE
marine_announcement("A nuclear device has been authorized by High Command and will be delivered to requisitions via ASRS.", "NUCLEAR ORDNANCE AUTHORIZED", 'sound/misc/notice2.ogg', logging = ARES_LOG_MAIN)
- log_game("[key_name_admin(usr)] has authorized a [nuketype], requested by [key_name_admin(ref_person)]")
- message_admins("[key_name_admin(usr)] has authorized a [nuketype], requested by [key_name_admin(ref_person)]")
+ log_game("[key_name_admin(usr)] has authorized \a [nuketype], requested by [key_name_admin(ref_person)]")
+ message_admins("[key_name_admin(usr)] has authorized \a [nuketype], requested by [key_name_admin(ref_person)]")
if(href_list["nukedeny"])
var/mob/ref_person = locate(href_list["nukedeny"])
diff --git a/code/modules/admin/topic/topic_events.dm b/code/modules/admin/topic/topic_events.dm
index 5e59ba4835f5..0c37e81f2641 100644
--- a/code/modules/admin/topic/topic_events.dm
+++ b/code/modules/admin/topic/topic_events.dm
@@ -205,20 +205,17 @@
em_call.mob_max = humans.len
em_call.players_to_offer = humans
em_call.owner = owner
-
- var/launch_broadcast = tgui_alert(usr, "Would you like to broadcast the beacon launch? This will reveal the distress beacon to all players.", "Announce distress beacon?", list("Yes", "No"), 20 SECONDS)
- if(launch_broadcast == "Yes")
- launch_broadcast = TRUE
- else
- launch_broadcast = FALSE
-
- var/announce_receipt = tgui_alert(usr, "Would you like to announce the beacon received message? This will reveal the distress beacon to all players.", "Announce beacon received?", list("Yes", "No"), 20 SECONDS)
- if(announce_receipt == "Yes")
+ var/quiet_launch = TRUE
+ var/ql_prompt = tgui_alert(usr, "Would you like to broadcast the beacon launch? This will reveal the distress beacon to all players.", "Announce distress beacon?", list("Yes", "No"), 20 SECONDS)
+ if(ql_prompt == "Yes")
+ quiet_launch = FALSE
+
+ var/announce_receipt = FALSE
+ var/ar_prompt = tgui_alert(usr, "Would you like to announce the beacon received message? This will reveal the distress beacon to all players.", "Announce beacon received?", list("Yes", "No"), 20 SECONDS)
+ if(ar_prompt == "Yes")
announce_receipt = TRUE
- else
- announce_receipt = FALSE
-
- em_call.activate(launch_broadcast, announce_receipt)
+ log_debug("ERT DEBUG (CUSTOM SET): [quiet_launch] - [announce_receipt]")
+ em_call.activate(quiet_launch, announce_receipt)
message_admins("[key_name_admin(usr)] created [humans_to_spawn] humans as [job_name] at [get_area(initial_spot)]")
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index e0210e4577a0..66ed690a0e80 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -17,13 +17,14 @@
liaison = 1
if(liaison)
- msg = SPAN_STAFF_IC("LIAISON: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]")
+ msg = "[SPAN_STAFF_IC("LIAISON:")][key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]"
else
- msg = SPAN_STAFF_IC("PRAY: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]")
+ msg = "[SPAN_STAFF_IC("PRAY: ")][key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]"
log_admin(msg)
for(var/client/C in GLOB.admins)
if(AHOLD_IS_MOD(C.admin_holder) && C.prefs.toggles_chat & CHAT_PRAYER)
to_chat(C, msg)
+ C << 'sound/machines/terminal_alert.ogg'
if(liaison)
to_chat(usr, "Your corporate overlords at Weyland-Yutani have received your message.")
else
@@ -31,7 +32,7 @@
/proc/high_command_announce(text , mob/Sender , iamessage)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
- msg = "[SPAN_STAFF_IC("USCM[iamessage ? "IA" : ""]:")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]: [msg]"
+ msg = "[SPAN_STAFF_IC("USCM[iamessage ? "IA" : ""]:")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]: [msg]"
log_admin(msg)
for(var/client/C in GLOB.admins)
if((R_ADMIN|R_MOD) & C.admin_holder.rights)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index e80e5bd8c5ba..c67effe90eb1 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -188,11 +188,6 @@
S["co_affiliation"] >> affiliation
S["yautja_status"] >> yautja_status
S["synth_status"] >> synth_status
- S["key_bindings"] >> key_bindings
- check_keybindings()
-
- var/list/remembered_key_bindings
- S["remembered_key_bindings"] >> remembered_key_bindings
S["lang_chat_disabled"] >> lang_chat_disabled
S["show_permission_errors"] >> show_permission_errors
@@ -206,6 +201,10 @@
S["autofit_viewport"] >> auto_fit_viewport
S["adaptive_zoom"] >> adaptive_zoom
S["tooltips"] >> tooltips
+ S["key_bindings"] >> key_bindings
+
+ var/list/remembered_key_bindings
+ S["remembered_key_bindings"] >> remembered_key_bindings
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, CONFIG_GET(string/ooc_color_default))
@@ -274,6 +273,9 @@
pref_job_slots = sanitize_islist(pref_job_slots, list())
vars["fps"] = fps
+ check_keybindings()
+ S["key_bindings"] << key_bindings
+
if(remembered_key_bindings)
for(var/i in GLOB.keybindings_by_name)
if(!(i in remembered_key_bindings))
@@ -651,7 +653,7 @@
addedbind = TRUE
if(!addedbind)
notadded += kb
- save_preferences()
+
if(length(notadded))
addtimer(CALLBACK(src, PROC_REF(announce_conflict), notadded), 5 SECONDS)
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index afc8e0a7cbba..edc4a81b364a 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -54,14 +54,14 @@
flags_inv_hide |= HIDEEARS|HIDEEYES|HIDEFACE
icon_state = initial(icon_state)
eye_protection = initial(eye_protection)
- to_chat(usr, "You flip the [src] down to protect your eyes.")
+ to_chat(usr, SPAN_NOTICE("You flip [src] down to protect your eyes."))
else
vision_impair = VISION_IMPAIR_NONE
flags_inventory &= ~(COVEREYES|COVERMOUTH|BLOCKSHARPOBJ)
flags_inv_hide &= ~(HIDEEARS|HIDEEYES|HIDEFACE)
icon_state = "[initial(icon_state)]up"
eye_protection = EYE_PROTECTION_NONE
- to_chat(usr, "You push the [src] up out of your face.")
+ to_chat(usr, SPAN_NOTICE("You push [src] up out of your face."))
up = !up
if(ishuman(loc))
diff --git a/code/modules/clothing/under/under.dm b/code/modules/clothing/under/under.dm
index ebfac5216330..a48967d88538 100644
--- a/code/modules/clothing/under/under.dm
+++ b/code/modules/clothing/under/under.dm
@@ -326,7 +326,7 @@
return
update_rollsuit_status() //we need the _d version of the sprite anyways. In the future we might need to make a different version of the sprite to accomodate for rolling sleeves and hoods.
if(user.head && !istype(user.head, hood_state))
- to_chat(user, SPAN_WARNING("You can't wear a hood while also wearing the [user.head]!"))
+ to_chat(user, SPAN_WARNING("You can't wear a hood while also wearing [user.head]!"))
return
if(!HAS_TRAIT(src, TRAIT_CLOTHING_HOOD))
diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm
index 340fabdf1973..81978bb01ba0 100644
--- a/code/modules/cm_aliens/XenoStructures.dm
+++ b/code/modules/cm_aliens/XenoStructures.dm
@@ -781,7 +781,7 @@
/obj/effect/alien/resin/resin_pillar/proc/brittle()
//playsound(granite cracking)
- visible_message(SPAN_DANGER("You hear cracking sounds from the [src] as splinters start falling off from the structure! It seems brittle now."))
+ visible_message(SPAN_DANGER("You hear cracking sounds from [src] as splinters start falling off from the structure! It seems brittle now."))
health = vulnerable_health
for(var/i in walls)
var/turf/closed/wall/T = i
@@ -814,7 +814,7 @@
/obj/effect/alien/resin/resin_pillar/hitby(atom/movable/AM)
if(!brittle)
- visible_message(SPAN_DANGER("[AM] harmlessly bounces off the [src]!"))
+ visible_message(SPAN_DANGER("[AM] harmlessly bounces off [src]!"))
return
return ..()
diff --git a/code/modules/cm_marines/NonLethalRestraints.dm b/code/modules/cm_marines/NonLethalRestraints.dm
index a7f0277c8aaa..3b2439a22a82 100644
--- a/code/modules/cm_marines/NonLethalRestraints.dm
+++ b/code/modules/cm_marines/NonLethalRestraints.dm
@@ -45,7 +45,7 @@
if(status)
M.apply_effect(6, WEAKEN)
charges -= 2
- M.visible_message(SPAN_DANGER("[M] has been prodded with the [src] by [user]!"))
+ M.visible_message(SPAN_DANGER("[M] has been prodded with [src] by [user]!"))
user.attack_log += "\[[time_stamp()]\] Stunned [key_name(M)] with [src.name]"
M.attack_log += "\[[time_stamp()]\] Stunned by [key_name(user)] with [src.name]"
diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm
index c9ec4190ce90..b003237f68ee 100644
--- a/code/modules/cm_marines/orbital_cannon.dm
+++ b/code/modules/cm_marines/orbital_cannon.dm
@@ -82,15 +82,15 @@ GLOBAL_LIST(ob_type_fuel_requirements)
if(!tray.warhead)
if(user)
- to_chat(user, "no warhead in the tray, loading operation cancelled.")
+ to_chat(user, SPAN_WARNING("No warhead in the tray, loading operation cancelled."))
return
if(tray.fuel_amt < 1)
- to_chat(user, "no solid fuel in the tray, loading operation cancelled.")
+ to_chat(user, SPAN_WARNING("No solid fuel in the tray, loading operation cancelled."))
return
if(loaded_tray)
- to_chat(user, "Tray is already loaded.")
+ to_chat(user, SPAN_WARNING("Tray is already loaded."))
return
tray.forceMove(src)
@@ -685,4 +685,3 @@ GLOBAL_LIST_EMPTY(orbital_cannon_cancellation)
return TRUE
tgui_interact(user)
-
diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm
index 111a95d1089c..df8ab136ea18 100644
--- a/code/modules/cm_preds/yaut_bracers.dm
+++ b/code/modules/cm_preds/yaut_bracers.dm
@@ -928,7 +928,7 @@
addtimer(VARSET_CALLBACK(src, disc_timer, FALSE), 10 SECONDS)
for(var/mob/living/simple_animal/hostile/smartdisc/S in range(7))
- to_chat(caller, SPAN_WARNING("The [S] skips back towards you!"))
+ to_chat(caller, SPAN_WARNING("[S] skips back towards you!"))
new /obj/item/explosive/grenade/spawnergrenade/smartdisc(S.loc)
qdel(S)
diff --git a/code/modules/cm_tech/implements/engi_czsp.dm b/code/modules/cm_tech/implements/engi_czsp.dm
index 8e1ab8248c19..f3024129b3eb 100644
--- a/code/modules/cm_tech/implements/engi_czsp.dm
+++ b/code/modules/cm_tech/implements/engi_czsp.dm
@@ -35,7 +35,7 @@
return
if((user.get_active_hand()) != src)
- to_chat(user, SPAN_WARNING("You must be holding the [src] to upgrade \the [D]!"))
+ to_chat(user, SPAN_WARNING("You must be holding [src] to upgrade [D]!"))
return
var/type_to_change_to = D.upgrade_string_to_type(chosen_upgrade)
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index b86a6a625f57..b54f03e2ce7d 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -550,6 +550,7 @@
to_chat(src, SPAN_WARNING("You can't put \the [interact_item.name] on [target_mob]!"))
return
visible_message(SPAN_NOTICE("[src] tries to put \the [interact_item.name] on [target_mob]."), null, null, 5)
+ log_interact(src, target_mob, "[key_name(src)] attempted to put [interact_item.name] on [key_name(target_mob)]'s ([slot_to_process]).")
if(do_after(src, get_strip_delay(src, target_mob), INTERRUPT_ALL, BUSY_ICON_GENERIC, target_mob, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
if(interact_item == get_active_hand() && !target_mob.get_item_by_slot(slot_to_process) && Adjacent(target_mob))
if(interact_item.flags_item & WIELDED) //to prevent re-wielding it during the do_after
@@ -558,6 +559,7 @@
drop_inv_item_on_ground(interact_item)
if(interact_item && !QDELETED(interact_item)) //Might be self-deleted?
target_mob.equip_to_slot_if_possible(interact_item, slot_to_process, 1, 0, 1, 1)
+ log_interact(src, target_mob, "[key_name(src)] put [interact_item.name] on [key_name(target_mob)]'s ([slot_to_process]) successfully.")
if(ishuman(target_mob) && target_mob.stat == DEAD)
var/mob/living/carbon/human/human_target = target_mob
human_target.disable_lights() // take that powergamers -spookydonut
diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
index 84eceb028349..225a5ac91184 100644
--- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
@@ -622,7 +622,7 @@
target.xenos_tracking |= src
tracked_marker = target
to_chat(src, SPAN_XENONOTICE("You start tracking the [target.mark_meaning.name] resin mark."))
- to_chat(src, SPAN_INFO("shift click the compass to watch the mark, alt click to stop tracking"))
+ to_chat(src, SPAN_INFO("Shift click the compass to watch the mark, alt click to stop tracking"))
/mob/living/carbon/xenomorph/proc/stop_tracking_resin_mark(destroyed, silent = FALSE) //tracked_marker shouldnt be nulled outside this PROC!! >:C
if(QDELETED(src))
diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm
index 92e46454cc5e..cd76618f3243 100644
--- a/code/modules/mob/mob_transformation_simple.dm
+++ b/code/modules/mob/mob_transformation_simple.dm
@@ -4,7 +4,7 @@
//Note that this proc does NOT do MMI related stuff!
/mob/proc/change_mob_type(new_type = null, turf/location = null, new_name = null as text, delete_old_mob = 0 as num, subspecies)
if(istype(src,/mob/new_player))
- to_chat(usr, SPAN_DANGER("cannot convert players who have not entered yet."))
+ to_chat(usr, SPAN_DANGER("Cannot convert players who have not entered yet."))
return
if(!new_type)
@@ -18,7 +18,7 @@
return
if( new_type == /mob/new_player )
- to_chat(usr, SPAN_DANGER("cannot convert into a new_player mob type."))
+ to_chat(usr, SPAN_DANGER("Cannot convert into a new_player mob type."))
return
var/mob/M
diff --git a/code/modules/projectiles/ammo_boxes/handful_boxes.dm b/code/modules/projectiles/ammo_boxes/handful_boxes.dm
index 28eab8463011..9ac2aeea8870 100644
--- a/code/modules/projectiles/ammo_boxes/handful_boxes.dm
+++ b/code/modules/projectiles/ammo_boxes/handful_boxes.dm
@@ -48,6 +48,15 @@
/obj/item/ammo_box/magazine/shotgun/incendiary/empty
empty = TRUE
+/obj/item/ammo_box/magazine/shotgun/incendiarybuck
+ name = "\improper shotgun shell box (Incendiary buckshot x 100)"
+ icon_state = "base_incbuck"
+ overlay_content = "_incenbuck"
+ magazine_type = /obj/item/ammo_magazine/shotgun/incendiarybuck
+
+/obj/item/ammo_box/magazine/shotgun/incendiarybuck/empty
+ empty = TRUE
+
/obj/item/ammo_box/magazine/shotgun/beanbag
name = "\improper shotgun shell box (Beanbag x 100)"
icon_state = "base_bean"
diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm
index ff90a6659fb2..6d20dcc75949 100644
--- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm
+++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm
@@ -286,6 +286,15 @@
/obj/item/ammo_box/magazine/m4a3/hp/empty
empty = TRUE
+/obj/item/ammo_box/magazine/m4a3/incen
+ name = "\improper magazine box (Incen M4A3 x 16)"
+ overlay_ammo_type = "_incen"
+ overlay_content = "_incen"
+ magazine_type = /obj/item/ammo_magazine/pistol/incendiary
+
+/obj/item/ammo_box/magazine/m4a3/incen/empty
+ empty = TRUE
+
//-----------------------M44 Revolver Speed Loaders Box-----------------------
/obj/item/ammo_box/magazine/m44
@@ -410,3 +419,306 @@
/obj/item/ammo_box/magazine/nailgun/empty
empty = TRUE
+
+//-----------------------M56B Drum Box-----------------------
+
+/obj/item/ammo_box/magazine/m56b
+ name = "\improper drum box (M56B x 8)"
+ icon_state = "base_m56b"
+ overlay_ammo_type = "_reg_heavy"
+ overlay_gun_type = "_sg"
+ overlay_content = "_sg"
+ magazine_type = /obj/item/ammo_magazine/smartgun
+ num_of_magazines = 8
+
+/obj/item/ammo_box/magazine/m56b/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/m56b/dirty
+ name = "\improper drum box (M56B 'Dirty' x 8)"
+ overlay_ammo_type = "_red_heavy"
+ overlay_content = "_sgdirty"
+ magazine_type = /obj/item/ammo_magazine/smartgun/dirty
+
+/obj/item/ammo_box/magazine/m56b/dirty/empty
+ empty = TRUE
+
+//-----------------------M56D Drum Box-----------------------
+
+/obj/item/ammo_box/magazine/m56d
+ name = "\improper drum box (M56D x 8)"
+ icon_state = "base_m56d"
+ overlay_ammo_type = ""
+ overlay_gun_type = "_m56d"
+ overlay_content = "_m56d"
+ magazine_type = /obj/item/ammo_magazine/m56d
+ num_of_magazines = 8
+
+/obj/item/ammo_box/magazine/m56d/update_icon()
+ if(overlays)
+ overlays.Cut()
+ overlays += image(icon, icon_state = "[icon_state]_lid") //adding lid
+ overlays += image(text_markings_icon, icon_state = "text[overlay_gun_type]") //adding text
+
+/obj/item/ammo_box/magazine/m56d/empty
+ empty = TRUE
+
+
+//-----------------------M2C Ammo Box-----------------------
+
+/obj/item/ammo_box/magazine/m2c
+ name = "\improper ammo box (M2C x 8)"
+ icon_state = "base_m2c"
+ overlay_ammo_type = ""
+ overlay_gun_type = "_m2c"
+ overlay_content = "_m2c"
+ magazine_type = /obj/item/ammo_magazine/m2c
+ num_of_magazines = 8
+
+/obj/item/ammo_box/magazine/m2c/update_icon()
+ if(overlays)
+ overlays.Cut()
+ overlays += image(icon, icon_state = "[icon_state]_lid") //adding lid
+ overlays += image(text_markings_icon, icon_state = "text[overlay_gun_type]") //adding text
+
+/obj/item/ammo_box/magazine/m2c/empty
+ empty = TRUE
+
+//-----------------------M41AE2 Ammo Box-----------------------
+
+/obj/item/ammo_box/magazine/m41ae2
+ name = "\improper magazine (M41AE2 x 8)"
+ icon_state = "base_m41ae2"
+ overlay_ammo_type = "_reg_heavy"
+ overlay_gun_type = "_m41ae2"
+ overlay_content = "_m41ae2"
+ magazine_type = /obj/item/ammo_magazine/rifle/lmg
+ num_of_magazines = 8
+
+/obj/item/ammo_box/magazine/m41ae2/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/m41ae2/holo
+ name = "\improper magazine box (M41AE2 Holo-Target x 8)"
+ overlay_ammo_type = "_holo_heavy"
+ overlay_content = "_m41ae2_holo"
+ magazine_type = /obj/item/ammo_magazine/rifle/lmg/holo_target
+
+/obj/item/ammo_box/magazine/m41ae2/holo/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/m41ae2/heap
+ name = "\improper magazine box (M41AE2 HEAP x 8)"
+ overlay_ammo_type = "_heap_heavy"
+ overlay_content = "_m41ae2_heap"
+ magazine_type = /obj/item/ammo_magazine/rifle/lmg/heap
+
+/obj/item/ammo_box/magazine/m41ae2/heap/empty
+ empty = TRUE
+
+//-----------------------Flamer Fuel Tank Box-----------------------
+
+/obj/item/ammo_box/magazine/flamer
+ name = "\improper flamer tank box (UT-Napthal Fuel x 8)"
+ icon_state = "base_flamer"
+ overlay_ammo_type = "_flamer"
+ overlay_gun_type = "_blank"
+ overlay_content = "_flamer"
+ magazine_type = /obj/item/ammo_magazine/flamer_tank
+ num_of_magazines = 8
+
+/obj/item/ammo_box/magazine/flamer/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/flamer/bgel
+ name = "\improper flamer fuel box (Napalm B-Gel x 8)"
+ overlay_ammo_type = "_flamer_bgel"
+ overlay_content = "_flamer_bgel"
+ magazine_type = /obj/item/ammo_magazine/flamer_tank/gellied
+
+/obj/item/ammo_box/magazine/flamer/bgel/empty
+ empty = TRUE
+
+//-----------------------M41A MK1 Rifle Mag Boxes-----------------------
+
+/obj/item/ammo_box/magazine/mk1
+ name = "\improper magazine box (M41A MK1 x 8)"
+ overlay_ammo_type = "_reg_mk1"
+ overlay_gun_type = "_mk1"
+ overlay_content = "_reg"
+ magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1
+ num_of_magazines = 8
+
+/obj/item/ammo_box/magazine/mk1/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/mk1/ap
+ name = "\improper magazine box (M41A MK1 AP x 8)"
+ flags_equip_slot = SLOT_BACK
+ overlay_ammo_type = "_ap_mk1"
+ overlay_content = "_ap"
+ magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1/ap
+
+/obj/item/ammo_box/magazine/mk1/ap/empty
+ empty = TRUE
+
+//-----------------------NSG 23 Rifle Mag Boxes-----------------------
+
+/obj/item/ammo_box/magazine/nsg23
+ name = "\improper magazine box (NSG 23 x 16)"
+ icon_state = "base_nsg23"
+ overlay_gun_type = "_nsg23"
+ overlay_content = "_reg"
+ magazine_type = /obj/item/ammo_magazine/rifle/nsg23
+ num_of_magazines = 16
+
+/obj/item/ammo_box/magazine/nsg23/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/nsg23/ap
+ name = "\improper magazine box (NSG 23 AP x 12)"
+ overlay_ammo_type = "_ap"
+ overlay_content = "_ap"
+ magazine_type = /obj/item/ammo_magazine/rifle/nsg23/ap
+ num_of_magazines = 12
+
+/obj/item/ammo_box/magazine/nsg23/ap/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/nsg23/ex
+ name = "\improper magazine box (NSG 23 Extended x 8)"
+ overlay_ammo_type = "_ext"
+ magazine_type = /obj/item/ammo_magazine/rifle/nsg23/extended
+ num_of_magazines = 8
+
+/obj/item/ammo_box/magazine/nsg23/ex/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/nsg23/heap
+ name = "\improper magazine box (NSG 23 HEAP x 16)"
+ overlay_ammo_type = "_heap"
+ overlay_content = "_heap"
+ magazine_type = /obj/item/ammo_magazine/rifle/nsg23/heap
+
+/obj/item/ammo_box/magazine/nsg23/heap/empty
+ empty = TRUE
+
+//-----------------------Spearhead Autorevolver Speed Loaders Box-----------------------
+
+/obj/item/ammo_box/magazine/spearhead
+ name = "\improper speed loaders box (Spearhead HP x 12)"
+ icon_state = "base_cmb"
+ overlay_ammo_type = "_357_hp"
+ overlay_gun_type = "_357"
+ overlay_content = "_speed"
+ num_of_magazines = 12
+ magazine_type = /obj/item/ammo_magazine/revolver/cmb
+
+/obj/item/ammo_box/magazine/spearhead/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/spearhead/normalpoint
+ name = "\improper speed loaders box (Spearhead x 12)"
+ overlay_ammo_type = "_357_reg"
+ magazine_type = /obj/item/ammo_magazine/revolver/cmb/normalpoint
+
+/obj/item/ammo_box/magazine/spearhead/normalpoint/empty
+ empty = TRUE
+
+//-----------------------Type 73 Pistol Mag Box-----------------------
+
+/obj/item/ammo_box/magazine/type73
+ name = "\improper magazine box (Type 73 x 16)"
+ icon_state = "base_type73"
+ flags_equip_slot = SLOT_BACK
+ overlay_ammo_type = "_type71_reg"
+ overlay_gun_type = "_type73"
+ overlay_content = "_type71_reg"
+ num_of_magazines = 16
+ magazine_type = /obj/item/ammo_magazine/pistol/t73
+
+/obj/item/ammo_box/magazine/type73/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/type73/impact
+ name = "\improper magazine box (Type 73 High-Impact x 10)"
+ overlay_ammo_type = "_type73_impact"
+ overlay_content = "_type73_impact"
+ num_of_magazines = 10
+ magazine_type = /obj/item/ammo_magazine/pistol/t73_impact
+
+/obj/item/ammo_box/magazine/type73/impact/empty
+ empty = TRUE
+
+
+//-----------------------AR10 Rifle Mag Box-----------------------
+
+/obj/item/ammo_box/magazine/ar10
+ name = "\improper magazine box (AR10 x 12)"
+ icon_state = "base_ar10"
+ flags_equip_slot = SLOT_BACK
+ overlay_gun_type = "_ar10"
+ overlay_content = "_reg"
+ num_of_magazines = 12
+ magazine_type = /obj/item/ammo_magazine/rifle/ar10
+
+/obj/item/ammo_box/magazine/ar10/empty
+ empty = TRUE
+
+//-----------------------MP5 Smg Mag Box-----------------------
+
+/obj/item/ammo_box/magazine/mp5
+ name = "\improper magazine box (MP5 x 12)"
+ icon_state = "base_m16"
+ flags_equip_slot = SLOT_BACK
+ overlay_gun_type = "_mp5"
+ overlay_content = "_reg"
+ num_of_magazines = 12
+ magazine_type = /obj/item/ammo_magazine/smg/mp5
+
+/obj/item/ammo_box/magazine/mp5/empty
+ empty = TRUE
+
+
+//-----------------------Desert Eagle Pistol Mag Box-----------------------
+
+/obj/item/ammo_box/magazine/deagle
+ name = "\improper magazine box (Desert Eagle x 12)"
+ icon_state = "base_deagle"
+ flags_equip_slot = SLOT_BACK
+ overlay_ammo_type = "_reg"
+ overlay_gun_type = "_deagle"
+ overlay_content = "_reg"
+ num_of_magazines = 16
+ magazine_type = /obj/item/ammo_magazine/pistol/heavy
+
+/obj/item/ammo_box/magazine/deagle/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/deagle/super
+ name = "\improper magazine box (Heavy Desert Eagle x 8)"
+ overlay_ammo_type = "_hp"
+ overlay_content = "_hp"
+ num_of_magazines = 8
+ magazine_type = /obj/item/ammo_magazine/pistol/heavy/super
+
+/obj/item/ammo_box/magazine/deagle/super/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/deagle/super/highimpact
+ name = "\improper magazine box (High Impact Desert Eagle x 8)"
+ overlay_ammo_type = "_impact"
+ overlay_content = "_impact"
+ magazine_type = /obj/item/ammo_magazine/pistol/heavy/super/highimpact
+
+/obj/item/ammo_box/magazine/deagle/super/highimpact/empty
+ empty = TRUE
+
+/obj/item/ammo_box/magazine/deagle/super/highimpact/ap
+ name = "\improper magazine box (High Impact Armor-Piercing Desert Eagle x 8)"
+ overlay_ammo_type = "_ap"
+ overlay_content = "_ap"
+ magazine_type = /obj/item/ammo_magazine/pistol/heavy/super/highimpact/ap
+
+/obj/item/ammo_box/magazine/deagle/super/highimpact/ap/empty
+ empty = TRUE
diff --git a/code/modules/projectiles/ammo_boxes/misc_boxes.dm b/code/modules/projectiles/ammo_boxes/misc_boxes.dm
index d09a69e5bb50..7b19555f4de5 100644
--- a/code/modules/projectiles/ammo_boxes/misc_boxes.dm
+++ b/code/modules/projectiles/ammo_boxes/misc_boxes.dm
@@ -75,6 +75,15 @@
overlay_gun_type = "_m94"
overlay_content = "_flares"
+//------------------------M89 Signal Flare Packs Box--------------------------
+
+/obj/item/ammo_box/magazine/misc/flares/signal
+ name = "\improper box of M89 signal flare packs"
+ desc = "A box of M89 signal flare packs, to mark up the way."
+ magazine_type = /obj/item/storage/box/m94/signal
+ overlay_gun_type = "_m89"
+ overlay_content = "_flares_signal"
+
//---------------------FIRE HANDLING PROCS
//flare box has unique stuff
@@ -139,6 +148,9 @@
/obj/item/ammo_box/magazine/misc/flares/empty
empty = TRUE
+/obj/item/ammo_box/magazine/misc/flares/signal/empty
+ empty = TRUE
+
//------------------------Flashlight Box--------------------------
/obj/item/ammo_box/magazine/misc/flashlight
diff --git a/code/modules/projectiles/ammo_boxes/round_boxes.dm b/code/modules/projectiles/ammo_boxes/round_boxes.dm
index 95115b76df43..ab1d1667c15f 100644
--- a/code/modules/projectiles/ammo_boxes/round_boxes.dm
+++ b/code/modules/projectiles/ammo_boxes/round_boxes.dm
@@ -130,3 +130,43 @@
/obj/item/ammo_box/rounds/type71/heap/empty
empty = TRUE
+
+//----------------9mm Pistol Ammunition Boxes (for mod88, M4A3 pistols)------------------
+
+/obj/item/ammo_box/rounds/pistol
+ name = "\improper pistol ammunition box (9mm)"
+ desc = "A 9mm ammunition box. Used to refill M4A3 magazines. It comes with a leather strap allowing to wear it on the back."
+ caliber = "9mm"
+ icon_state = "base_m4a3"
+ overlay_content = "_reg"
+ default_ammo = /datum/ammo/bullet/pistol
+
+/obj/item/ammo_box/rounds/pistol/empty
+ empty = TRUE
+
+/obj/item/ammo_box/rounds/pistol/ap
+ name = "\improper pistol ammunition box (9mm AP)"
+ desc = "A 9mm armor-piercing ammunition box. Used to refill mod88 and M4A3 magazines. It comes with a leather strap allowing to wear it on the back."
+ overlay_content = "_ap"
+ default_ammo = /datum/ammo/bullet/pistol/ap
+
+/obj/item/ammo_box/rounds/pistol/ap/empty
+ empty = TRUE
+
+/obj/item/ammo_box/rounds/pistol/hp
+ name = "\improper pistol ammunition box (9mm HP)"
+ desc = "A 9mm hollow-point ammunition box. Used to refill M4A3 magazines. It comes with a leather strap allowing to wear it on the back."
+ overlay_content = "_hp"
+ default_ammo = /datum/ammo/bullet/pistol/hollow
+
+/obj/item/ammo_box/rounds/pistol/hp/empty
+ empty = TRUE
+
+/obj/item/ammo_box/rounds/pistol/incen
+ name = "\improper pistol ammunition box (9mm Incendiary)"
+ desc = "A 9mm incendiary ammunition box. Used to refill M4A3 magazines. It comes with a leather strap allowing to wear it on the back."
+ overlay_content = "_incen"
+ default_ammo = /datum/ammo/bullet/pistol/incendiary
+
+/obj/item/ammo_box/rounds/pistol/incen/empty
+ empty = TRUE
diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm
index 9f137b1c2316..6c103aaa9677 100644
--- a/code/modules/projectiles/magazines/shotguns.dm
+++ b/code/modules/projectiles/magazines/shotguns.dm
@@ -46,6 +46,14 @@ GLOBAL_LIST_INIT(shotgun_boxes_12g, list(
default_ammo = /datum/ammo/bullet/shotgun/incendiary
handful_state = "incendiary_slug"
+/obj/item/ammo_magazine/shotgun/incendiarybuck
+ name = "box of incendiary buckshots"
+ desc = "A box filled with self-detonating buckshot incendiary shotgun rounds. 12 Gauge."
+ icon_state = "incendiarybuck"
+ item_state = "incendiarybuck"
+ default_ammo = /datum/ammo/bullet/shotgun/buckshot/incendiary
+ handful_state = "incen_buckshot"
+
/obj/item/ammo_magazine/shotgun/buckshot
name = "box of buckshot shells"
desc = "A box filled with buckshot spread shotgun shells. 12 Gauge."
diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm
index 3d0c8fca142d..4d94ae05f8c9 100644
--- a/code/modules/shuttle/computer.dm
+++ b/code/modules/shuttle/computer.dm
@@ -281,6 +281,8 @@
icon_state = "terminal"
req_access = list()
breakable = FALSE
+ ///If true, the lifeboat is in the process of launching, and so the code will not allow another launch.
+ var/launch_initiated = FALSE
/obj/structure/machinery/computer/shuttle/lifeboat/attack_hand(mob/user)
. = ..()
@@ -293,23 +295,40 @@
switch(lifeboat.mode)
if(SHUTTLE_IDLE)
if(!istype(user, /mob/living/carbon/human))
- to_chat(user, SPAN_NOTICE("[src]'s screen says \"Awaiting confirmation of the evacuation order\"."))
+ to_chat(user, SPAN_NOTICE("[src]'s screen says \"Unauthorized access. Please inform your supervisor\"."))
return
var/mob/living/carbon/human/human_user = user
- if(!(ACCESS_MARINE_COMMAND in human_user.wear_id?.access))
- to_chat(user, SPAN_NOTICE("[src]'s screen says \"Awaiting confirmation of the evacuation order\"."))
+ if(!(ACCESS_MARINE_SENIOR in human_user.wear_id?.access) && !(ACCESS_MARINE_DROPSHIP in human_user.wear_id?.access))
+ to_chat(user, SPAN_NOTICE("[src]'s screen says \"Unauthorized access. Please inform your supervisor\"."))
return
if(SShijack.current_progress < SShijack.early_launch_required_progress)
to_chat(user, SPAN_NOTICE("[src]'s screen says \"Unable to launch, fuel insufficient\"."))
return
- if(tgui_alert(user, "Early launch the lifeboat?", "Confirm", list("Yes", "No"), 10 SECONDS) == "Yes")
- to_chat(user, SPAN_NOTICE("[src]'s screen blinks and says \"Early launch accepted\"."))
- lifeboat.evac_launch()
+ if(launch_initiated)
+ to_chat(user, SPAN_NOTICE("[src]'s screen blinks and says \"Launch sequence already initiated\"."))
return
+ var/response = tgui_alert(user, "Launch the lifeboat?", "Confirm", list("Yes", "No", "Emergency Launch"), 10 SECONDS)
+ if(launch_initiated)
+ to_chat(user, SPAN_NOTICE("[src]'s screen blinks and says \"Launch sequence already initiated\"."))
+ return
+ switch(response)
+ if ("Yes")
+ launch_initiated = TRUE
+ to_chat(user, "[src]'s screen blinks and says \"Launch command accepted\".")
+ shipwide_ai_announcement("Launch command received. [lifeboat.id == MOBILE_SHUTTLE_LIFEBOAT_PORT ? "Port" : "Starboard"] Lifeboat doors will close in 10 seconds.")
+ addtimer(CALLBACK(lifeboat, TYPE_PROC_REF(/obj/docking_port/mobile/crashable/lifeboat, evac_launch)), 10 SECONDS)
+ return
+ if ("Emergency Launch")
+ launch_initiated = TRUE
+ to_chat(user, "[src]'s screen blinks and says \"Emergency Launch command accepted\".")
+ lifeboat.evac_launch()
+ shipwide_ai_announcement("Emergency Launch command received. Launching [lifeboat.id == MOBILE_SHUTTLE_LIFEBOAT_PORT ? "Port" : "Starboard"] Lifeboat.")
+ return
+
if(SHUTTLE_IGNITING)
to_chat(user, SPAN_NOTICE("[src]'s screen says \"Engines firing\"."))
if(SHUTTLE_CALL)
diff --git a/code/modules/vehicles/hardpoints/hardpoint.dm b/code/modules/vehicles/hardpoints/hardpoint.dm
index 5963b0b4e36b..acdefca18fd2 100644
--- a/code/modules/vehicles/hardpoints/hardpoint.dm
+++ b/code/modules/vehicles/hardpoints/hardpoint.dm
@@ -1,22 +1,20 @@
-/*
- Hardpoints are any items that attach to a base vehicle, such as wheels/treads, support systems and guns
-*/
-
+/**
+ * Hardpoints are any items that attach to a base vehicle, such as wheels/treads, support systems and guns
+ */
/obj/item/hardpoint
//------MAIN VARS----------
- // Which slot is this hardpoint in
- // Purely to check for conflicting hardpoints
+ /// Which slot is this hardpoint in. Purely to check for conflicting hardpoints.
var/slot
- // The vehicle this hardpoint is installed on
+ /// The vehicle this hardpoint is installed on.
var/obj/vehicle/multitile/owner
health = 100
w_class = SIZE_LARGE
- // Determines how much of any incoming damage is actually taken
+ /// Determines how much of any incoming damage is actually taken.
var/damage_multiplier = 1
- // Origin coords of the hardpoint relative to the vehicle
+ /// Origin coords of the hardpoint relative to the vehicle.
var/list/origins = list(0, 0)
var/list/buff_multipliers
@@ -32,13 +30,13 @@
var/disp_icon //This also differentiates tank vs apc vs other
var/disp_icon_state
- // List of pixel offsets for each direction
+ /// List of pixel offsets for each direction.
var/list/px_offsets
- //visual layer of hardpoint when on vehicle
+ /// Visual layer of hardpoint when on vehicle.
var/hdpt_layer = HDPT_LAYER_WHEELS
- // List of offsets for where to place the muzzle flash for each direction
+ /// List of offsets for where to place the muzzle flash for each direction.
var/list/muzzle_flash_pos = list(
"1" = list(0, 0),
"2" = list(0, 0),
@@ -54,33 +52,23 @@
var/const_mz_offset_y = 0
//------SOUNDS VARS----------
- // Sounds to play when the module activated/fired
+ /// Sounds to play when the module activated/fired.
var/list/activation_sounds
//------INTERACTION VARS----------
- //which seat can use this module
+ /// Which seat can use this module.
var/allowed_seat = VEHICLE_GUNNER
- //Cooldown on use of the hardpoint
- var/cooldown = 100
- var/next_use = 0
-
- //whether hardpoint has activatable ability like shooting or zooming
+ /// Whether hardpoint has activatable ability like shooting or zooming.
var/activatable = 0
- //used to prevent welder click spam
+ /// Used to prevent welder click spam.
var/being_repaired = FALSE
- //current user. We can have only one user at a time. Better never change that
- var/user
-
- //Accuracy of the hardpoint. (which is, in fact, a scatter. Need to change this system)
- var/accuracy = 1
-
- // The firing arc of this hardpoint
+ /// The firing arc of this hardpoint.
var/firing_arc = 0 //in degrees. 0 skips whole arc of fire check
// Muzzleflash
@@ -91,17 +79,53 @@
//------AMMUNITION VARS----------
- //Currently loaded ammo that we shoot from
+ /// Currently loaded ammo that we shoot from.
var/obj/item/ammo_magazine/hardpoint/ammo
- //spare magazines that we can reload from
+ /// Spare magazines that we can reload from.
var/list/backup_clips
- //maximum amount of spare mags
+ /// Maximum amount of spare mags.
var/max_clips = 0
/// An assoc list in the format list(/datum/element/bullet_trait_to_give = list(...args))
- /// that will be given to a projectile fired from the hardpoint
+ /// that will be given to a projectile fired from the hardpoint.
var/list/list/traits_to_give
+ /// How much the bullet scatters when fired, in degrees.
+ var/scatter = 0
+ /// How many bullets the gun fired while burst firing/auto firing.
+ var/shots_fired = 0
+ /// Delay before a new firing sequence can start.
+ COOLDOWN_DECLARE(fire_cooldown)
+
+ // Firemodes.
+ /// Current selected firemode of the gun.
+ var/gun_firemode = GUN_FIREMODE_SEMIAUTO
+ /// List of allowed firemodes.
+ var/list/gun_firemode_list = list(
+ GUN_FIREMODE_SEMIAUTO,
+ )
+
+ // Semi-auto and full-auto.
+ /// For regular shots, how long to wait before firing again. Use modify_fire_delay and set_fire_delay instead of modifying this on the fly
+ var/fire_delay = 0
+ /// The multiplier for how much slower this should fire in automatic mode. 1 is normal, 1.2 is 20% slower, 2 is 100% slower, etc. Protected due to it never needing to be edited.
+ var/autofire_slow_mult = 1
+ /// If the gun is currently auto firing.
+ var/auto_firing = FALSE
+
+ // Burst fire.
+ /// How many shots can the weapon shoot in burst? Anything less than 2 and you cannot toggle burst. Use modify_burst_amount and set_burst_amount instead of modifying this
+ var/burst_amount = 1
+ /// The delay in between shots. Lower = less delay = faster. Use modify_burst_delay and set_burst_delay instead of modifying this
+ var/burst_delay = 1
+ /// When burst-firing, this number is extra time before the weapon can fire again.
+ var/extra_delay = 0
+ /// If the gun is currently burst firing.
+ var/burst_firing = FALSE
+
+ /// Currently selected target to fire at. Set with set_target().
+ var/atom/target
+
//-----------------------------
//------GENERAL PROCS----------
//-----------------------------
@@ -109,6 +133,7 @@
/obj/item/hardpoint/Initialize()
. = ..()
set_bullet_traits()
+ AddComponent(/datum/component/automatedfire/autofire, fire_delay, burst_delay, burst_amount, gun_firemode, autofire_slow_mult, CALLBACK(src, PROC_REF(set_burst_firing)), CALLBACK(src, PROC_REF(reset_fire)), CALLBACK(src, PROC_REF(fire_wrapper)), callback_set_firing = CALLBACK(src, PROC_REF(set_auto_firing)))
/obj/item/hardpoint/Destroy()
if(owner)
@@ -117,7 +142,7 @@
owner = null
QDEL_NULL_LIST(backup_clips)
QDEL_NULL(ammo)
-
+ set_target(null)
return ..()
/obj/item/hardpoint/ex_act(severity)
@@ -166,37 +191,64 @@
/obj/item/hardpoint/proc/get_integrity_percent()
return 100.0*health/initial(health)
-/obj/item/hardpoint/proc/on_install(obj/vehicle/multitile/V)
- apply_buff(V)
- return
+/// Apply hardpoint effects to vehicle and self.
+/obj/item/hardpoint/proc/on_install(obj/vehicle/multitile/vehicle)
+ if(!vehicle) //in loose holder
+ return
+ RegisterSignal(vehicle, COMSIG_GUN_RECALCULATE_ATTACHMENT_BONUSES, PROC_REF(recalculate_hardpoint_bonuses))
+ apply_buff(vehicle)
-/obj/item/hardpoint/proc/on_uninstall(obj/vehicle/multitile/V)
- remove_buff(V)
- return
+/// Remove hardpoint effects from vehicle and self.
+/obj/item/hardpoint/proc/on_uninstall(obj/vehicle/multitile/vehicle)
+ if(!vehicle) //in loose holder
+ return
+ UnregisterSignal(vehicle, COMSIG_GUN_RECALCULATE_ATTACHMENT_BONUSES)
+ remove_buff(vehicle)
+ //resetting values like set_gun_config_values() would be tidy, but unnecessary as it gets recalc'd on install anyway
-//applying passive buffs like damage type resistance, speed, accuracy, cooldowns
-/obj/item/hardpoint/proc/apply_buff(obj/vehicle/multitile/V)
+/// Applying passive buffs like damage type resistance, speed, accuracy, cooldowns.
+/obj/item/hardpoint/proc/apply_buff(obj/vehicle/multitile/vehicle)
if(buff_applied)
return
if(LAZYLEN(type_multipliers))
for(var/type in type_multipliers)
- V.dmg_multipliers[type] *= LAZYACCESS(type_multipliers, type)
+ vehicle.dmg_multipliers[type] *= LAZYACCESS(type_multipliers, type)
if(LAZYLEN(buff_multipliers))
for(var/type in buff_multipliers)
- V.misc_multipliers[type] *= LAZYACCESS(buff_multipliers, type)
+ vehicle.misc_multipliers[type] *= LAZYACCESS(buff_multipliers, type)
buff_applied = TRUE
+ SEND_SIGNAL(vehicle, COMSIG_GUN_RECALCULATE_ATTACHMENT_BONUSES)
-//removing buffs
-/obj/item/hardpoint/proc/remove_buff(obj/vehicle/multitile/V)
+/// Removing passive buffs like damage type resistance, speed, accuracy, cooldowns.
+/obj/item/hardpoint/proc/remove_buff(obj/vehicle/multitile/vehicle)
if(!buff_applied)
return
if(LAZYLEN(type_multipliers))
for(var/type in type_multipliers)
- V.dmg_multipliers[type] *= 1 / LAZYACCESS(type_multipliers, type)
+ vehicle.dmg_multipliers[type] *= 1 / LAZYACCESS(type_multipliers, type)
if(LAZYLEN(buff_multipliers))
for(var/type in buff_multipliers)
- V.misc_multipliers[type] *= 1 / LAZYACCESS(buff_multipliers, type)
+ vehicle.misc_multipliers[type] *= 1 / LAZYACCESS(buff_multipliers, type)
buff_applied = FALSE
+ SEND_SIGNAL(vehicle, COMSIG_GUN_RECALCULATE_ATTACHMENT_BONUSES)
+
+/// Recalculates hardpoint values based on vehicle modifiers.
+/obj/item/hardpoint/proc/recalculate_hardpoint_bonuses()
+ scatter = initial(scatter) / owner.misc_multipliers["accuracy"]
+ var/cooldown_mult = owner.misc_multipliers["cooldown"]
+ set_fire_delay(initial(fire_delay) * cooldown_mult)
+ set_burst_delay(initial(burst_delay) * cooldown_mult)
+ extra_delay = initial(extra_delay) * cooldown_mult
+
+/// Setter for fire_delay.
+/obj/item/hardpoint/proc/set_fire_delay(value)
+ fire_delay = value
+ SEND_SIGNAL(src, COMSIG_GUN_AUTOFIREDELAY_MODIFIED, fire_delay)
+
+/// Setter for burst_delay.
+/obj/item/hardpoint/proc/set_burst_delay(value)
+ burst_delay = value
+ SEND_SIGNAL(src, COMSIG_GUN_BURST_SHOT_DELAY_MODIFIED, burst_delay)
//this proc called on each move of vehicle
/obj/item/hardpoint/proc/on_move(turf/old, turf/new_turf, move_dir)
@@ -253,13 +305,12 @@
return data
-// Traces backwards from the gun origin to the vehicle to check for obstacles between the vehicle and the muzzle
-/obj/item/hardpoint/proc/clear_los(atom/A)
-
+/// Traces backwards from the gun origin to the vehicle to check for obstacles between the vehicle and the muzzle.
+/obj/item/hardpoint/proc/clear_los()
if(origins[1] == 0 && origins[2] == 0) //skipping check for modules we don't need this
return TRUE
- var/turf/muzzle_turf = locate(owner.x + origins[1], owner.y + origins[2], owner.z)
+ var/turf/muzzle_turf = get_origin_turf()
var/turf/checking_turf = muzzle_turf
while(!(owner in checking_turf))
@@ -268,24 +319,24 @@
return FALSE
// Ensure that we can pass over all objects in the turf
- for(var/obj/O in checking_turf)
+ for(var/obj/object in checking_turf)
// Since vehicles are multitile the
- if(O == owner)
+ if(object == owner)
continue
// Non-dense objects are irrelevant
- if(!O.density)
+ if(!object.density)
continue
// Make sure we can pass object from all directions
- if(!(O.pass_flags.flags_can_pass_all & PASS_OVER_THROW_ITEM))
- if(!(O.flags_atom & ON_BORDER))
+ if(!HAS_FLAG(object.pass_flags.flags_can_pass_all, PASS_OVER_THROW_ITEM))
+ if(!HAS_FLAG(object.flags_atom, ON_BORDER))
return FALSE
//If we're behind the object, check the behind pass flags
- else if(dir == O.dir && !(O.pass_flags.flags_can_pass_behind & PASS_OVER_THROW_ITEM))
+ else if(dir == object.dir && !HAS_FLAG(object.pass_flags.flags_can_pass_behind, PASS_OVER_THROW_ITEM))
return FALSE
//If we're in front, check front pass flags
- else if(dir == turn(O.dir, 180) && !(O.pass_flags.flags_can_pass_front & PASS_OVER_THROW_ITEM))
+ else if(dir == turn(object.dir, 180) && !HAS_FLAG(object.pass_flags.flags_can_pass_front, PASS_OVER_THROW_ITEM))
return FALSE
// Trace back towards the vehicle
@@ -297,47 +348,6 @@
//------INTERACTION PROCS----------
//-----------------------------
-//If the hardpoint can be activated by current user
-/obj/item/hardpoint/proc/can_activate(mob/user, atom/A)
- if(!owner)
- return
-
- var/seat = owner.get_mob_seat(user)
- if(!seat)
- return
-
- if(seat != allowed_seat)
- to_chat(user, SPAN_WARNING("Only [allowed_seat] can use [name]."))
- return
-
- if(health <= 0)
- to_chat(user, SPAN_WARNING("\The [name] is broken!"))
- return FALSE
-
- if(world.time < next_use)
- if(cooldown >= 20) //filter out guns with high firerate to prevent message spam.
- to_chat(user, SPAN_WARNING("You need to wait [SPAN_HELPFUL((next_use - world.time) / 10)] seconds before [name] can be used again."))
- return FALSE
-
- if(ammo && ammo.current_rounds <= 0)
- to_chat(user, SPAN_WARNING("\The [name] is out of ammo! Magazines: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]"))
- return FALSE
-
- if(!in_firing_arc(A))
- to_chat(user, SPAN_WARNING("The target is not within your firing arc!"))
- return FALSE
-
- if(!clear_los(A))
- to_chat(user, SPAN_WARNING("You don't have a clear line of sight to the target!"))
- return FALSE
-
- return TRUE
-
-//Called when you want to activate the hardpoint, by default firing a gun
-//This can also be used for some type of temporary buff or toggling mode, up to you
-/obj/item/hardpoint/proc/activate(mob/user, atom/A)
- fire(user, A)
-
/obj/item/hardpoint/proc/deactivate()
return
@@ -490,76 +500,201 @@
user.visible_message(SPAN_NOTICE("[user] stops repairing \the [name]."), SPAN_NOTICE("You stop repairing \the [name]. The integrity of the module is at [SPAN_HELPFUL(round(get_integrity_percent()))]%."))
return
-//determines whether something is in firing arc of a hardpoint
-/obj/item/hardpoint/proc/in_firing_arc(atom/A)
- if(!owner)
- return FALSE
+/// Setter proc for the automatic firing flag.
+/obj/item/hardpoint/proc/set_auto_firing(auto = FALSE)
+ if(auto_firing != auto)
+ auto_firing = auto
+ if(!auto_firing) //end-of-fire, show changed ammo
+ display_ammo()
+
+/// Setter proc for the burst firing flag.
+/obj/item/hardpoint/proc/set_burst_firing(burst = FALSE)
+ if(burst_firing != burst)
+ burst_firing = burst
+ if(!burst_firing) //end-of-fire, show changed ammo
+ display_ammo()
+
+/// Clean all firing references.
+/obj/item/hardpoint/proc/reset_fire()
+ shots_fired = 0
+ set_target(null)
+ set_auto_firing(FALSE) //on abnormal exits automatic fire doesn't call set_auto_firing()
+
+/// Set the target and take care of hard delete.
+/obj/item/hardpoint/proc/set_target(atom/object)
+ if(object == target || object == loc)
+ return
+ if(target)
+ UnregisterSignal(target, COMSIG_PARENT_QDELETING)
+ target = object
+ if(target)
+ RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clean_target))
+
+/// Set the target to its turf, so we keep shooting even when it was qdeled.
+/obj/item/hardpoint/proc/clean_target()
+ SIGNAL_HANDLER
+ target = get_turf(target)
+
+/// Print how much ammo is left to chat.
+/obj/item/hardpoint/proc/display_ammo(mob/user)
+ if(!user)
+ user = owner.get_seat_mob(allowed_seat)
+ if(!user)
+ return
- if(!firing_arc)
- return TRUE
+ if(ammo)
+ to_chat(user, SPAN_WARNING("[name] Ammo: [SPAN_HELPFUL(ammo ? ammo.current_rounds : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds : 0)] | Mags: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]"))
- var/turf/T = get_turf(A)
- if(!T)
- return FALSE
+/// Reset variables used in firing and remove the gun from the autofire system.
+/obj/item/hardpoint/proc/stop_fire(datum/source, atom/object, turf/location, control, params)
+ SEND_SIGNAL(src, COMSIG_GUN_STOP_FIRE)
+ if(auto_firing)
+ reset_fire() //automatic fire doesn't reset itself from COMSIG_GUN_STOP_FIRE
- var/dx = T.x - (owner.x + origins[1]/2)
- var/dy = T.y - (owner.y + origins[2]/2)
-
- var/deg = 0
- switch(dir)
- if(EAST)
- deg = 0
- if(NORTH)
- deg = -90
- if(WEST)
- deg = 180
- if(SOUTH)
- deg = 90
-
- var/nx = dx * cos(deg) - dy * sin(deg)
- var/ny = dx * sin(deg) + dy * cos(deg)
- if(nx == 0)
- return firing_arc >= 90
-
- var/angle = arctan(ny/nx)
- if(nx < 0)
- angle += 180
-
- return abs(angle) <= (firing_arc/2)
-
-//doing last preparation before actually firing gun
-/obj/item/hardpoint/proc/fire(mob/user, atom/A)
- if(!ammo) //Prevents a runtime
+/// Update the target if you dragged your mouse.
+/obj/item/hardpoint/proc/change_target(datum/source, atom/src_object, atom/over_object, turf/src_location, turf/over_location, src_control, over_control, params)
+ set_target(get_turf_on_clickcatcher(over_object, source, params))
+
+/// Check if the gun can fire and add it to bucket autofire system if needed, or just fire the gun if not.
+/obj/item/hardpoint/proc/start_fire(datum/source, atom/object, turf/location, control, params)
+ if(istype(object, /atom/movable/screen))
return
- if(ammo.current_rounds <= 0)
+
+ if(QDELETED(object))
return
- next_use = world.time + cooldown * owner.misc_multipliers["cooldown"]
- if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- A = get_step(get_turf(A), pick(GLOB.cardinals))
+ if(!auto_firing && !burst_firing && !COOLDOWN_FINISHED(src, fire_cooldown))
+ if(max(fire_delay, burst_delay + extra_delay) >= 2.0 SECONDS) //filter out guns with high firerate to prevent message spam.
+ to_chat(source, SPAN_WARNING("You need to wait [SPAN_HELPFUL(COOLDOWN_SECONDSLEFT(src, fire_cooldown))] seconds before [name] can be used again."))
+ return
- if(LAZYLEN(activation_sounds))
- playsound(get_turf(src), pick(activation_sounds), 60, 1)
+ set_target(get_turf_on_clickcatcher(object, source, params))
- fire_projectile(user, A)
+ if(gun_firemode == GUN_FIREMODE_SEMIAUTO)
+ var/fire_return = try_fire(object, source, params)
+ //end-of-fire, show ammo (if changed)
+ if(fire_return == AUTOFIRE_CONTINUE)
+ reset_fire()
+ display_ammo(source)
+ else
+ SEND_SIGNAL(src, COMSIG_GUN_FIRE)
+
+/// Wrapper proc for the autofire system to ensure the important args aren't null.
+/obj/item/hardpoint/proc/fire_wrapper(atom/target, mob/living/user, params)
+ SHOULD_NOT_OVERRIDE(TRUE)
+ if(!target)
+ target = src.target
+ if(!user)
+ user = owner.get_seat_mob(allowed_seat)
+ if(!target || !user)
+ return NONE
+
+ return try_fire(target, user, params)
+
+/// Tests if firing should be interrupted, otherwise fires.
+/obj/item/hardpoint/proc/try_fire(atom/target, mob/living/user, params)
+ if(health <= 0)
+ to_chat(user, SPAN_WARNING("\The [name] is broken!"))
+ return NONE
- to_chat(user, SPAN_WARNING("[name] Ammo: [SPAN_HELPFUL(ammo ? ammo.current_rounds : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds : 0)] | Mags: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]"))
+ if(ammo && ammo.current_rounds <= 0)
+ click_empty(user)
+ return NONE
-//finally firing the gun
-/obj/item/hardpoint/proc/fire_projectile(mob/user, atom/A)
- set waitfor = 0
+ if(!in_firing_arc(target))
+ to_chat(user, SPAN_WARNING("The target is not within your firing arc!"))
+ return NONE
- var/turf/origin_turf = get_turf(src)
- origin_turf = locate(origin_turf.x + origins[1], origin_turf.y + origins[2], origin_turf.z)
+ if(!clear_los())
+ to_chat(user, SPAN_WARNING("The muzzle is obstructed!"))
+ return NONE
- var/obj/projectile/P = generate_bullet(user, origin_turf)
- SEND_SIGNAL(P, COMSIG_BULLET_USER_EFFECTS, user)
- P.fire_at(A, user, src, P.ammo.max_range, P.ammo.shell_speed)
+ return handle_fire(target, user, params)
- if(use_muzzle_flash)
- muzzle_flash(Get_Angle(origin_turf, A))
+/// Actually fires the gun, sets up the projectile and fires it.
+/obj/item/hardpoint/proc/handle_fire(atom/target, mob/living/user, params)
+ var/turf/origin_turf = get_origin_turf()
+ var/obj/projectile/projectile_to_fire = generate_bullet(user, origin_turf)
ammo.current_rounds--
+ SEND_SIGNAL(projectile_to_fire, COMSIG_BULLET_USER_EFFECTS, user)
+
+ // turf-targeted projectiles are fired without scatter, because proc would raytrace them further away
+ var/ammo_flags = projectile_to_fire.ammo.flags_ammo_behavior | projectile_to_fire.projectile_override_flags
+ if(!HAS_FLAG(ammo_flags, AMMO_HITS_TARGET_TURF) && !HAS_FLAG(ammo_flags, AMMO_EXPLOSIVE)) //AMMO_EXPLOSIVE is also a turf-targeted projectile
+ projectile_to_fire.scatter = scatter
+ target = simulate_scatter(projectile_to_fire, target, origin_turf, get_turf(target), user)
+
+ INVOKE_ASYNC(projectile_to_fire, TYPE_PROC_REF(/obj/projectile, fire_at), target, user, src, projectile_to_fire.ammo.max_range, projectile_to_fire.ammo.shell_speed)
+ projectile_to_fire = null
+
+ shots_fired++
+ play_firing_sounds()
+ if(use_muzzle_flash)
+ muzzle_flash(Get_Angle(origin_turf, target))
+
+ set_fire_cooldown(gun_firemode)
+
+ return AUTOFIRE_CONTINUE
+
+/// Start cooldown to respect delay of firemode.
+/obj/item/hardpoint/proc/set_fire_cooldown(firemode)
+ var/cooldown_time = 0
+ switch(firemode)
+ if(GUN_FIREMODE_SEMIAUTO)
+ cooldown_time = fire_delay
+ if(GUN_FIREMODE_BURSTFIRE)
+ cooldown_time = burst_delay + extra_delay
+ if(GUN_FIREMODE_AUTOMATIC)
+ cooldown_time = fire_delay
+ COOLDOWN_START(src, fire_cooldown, cooldown_time)
+
+/// Adjust target based on random scatter angle.
+/obj/item/hardpoint/proc/simulate_scatter(obj/projectile/projectile_to_fire, atom/target, turf/curloc, turf/targloc)
+ var/fire_angle = Get_Angle(curloc, targloc)
+ var/total_scatter_angle = projectile_to_fire.scatter
+
+ //Not if the gun doesn't scatter at all, or negative scatter.
+ if(total_scatter_angle > 0)
+ fire_angle += rand(-total_scatter_angle, total_scatter_angle)
+ target = get_angle_target_turf(curloc, fire_angle, 30)
+
+ return target
+
+/// Get turf at hardpoint origin offset, used as the muzzle.
+/obj/item/hardpoint/proc/get_origin_turf()
+ return get_offset_target_turf(get_turf(src), origins[1], origins[2])
+
+/// Plays 'click' noise and announced to chat. Usually called when weapon empty.
+/obj/item/hardpoint/proc/click_empty(mob/user)
+ playsound(src, 'sound/weapons/gun_empty.ogg', 25, 1, 5)
+ if(user)
+ to_chat(user, SPAN_WARNING("*click*"))
+
+/// Selects and plays a firing sound from the list.
+/obj/item/hardpoint/proc/play_firing_sounds()
+ if(LAZYLEN(activation_sounds))
+ playsound(get_turf(src), pick(activation_sounds), 60, 1)
+
+/// Determines whether something is in firing arc of a hardpoint.
+/obj/item/hardpoint/proc/in_firing_arc(atom/target)
+ if(!firing_arc || !ISINRANGE_EX(firing_arc, 0, 360))
+ return TRUE
+
+ var/turf/muzzle_turf = get_origin_turf()
+ var/turf/target_turf = get_turf(target)
+
+ //same tile angle returns EAST, returning FALSE to ensure consistency
+ if(muzzle_turf == target_turf)
+ return FALSE
+
+ var/angle_diff = SIMPLIFY_DEGREES(dir2angle(dir) - get_angle(muzzle_turf, target_turf))
+ if(angle_diff < -180)
+ angle_diff += 360
+ else if(angle_diff > 180)
+ angle_diff -= 360
+
+ return abs(angle_diff) <= (firing_arc * 0.5)
//-----------------------------
//------ICON PROCS----------
diff --git a/code/modules/vehicles/hardpoints/holder/holder.dm b/code/modules/vehicles/hardpoints/holder/holder.dm
index b14e078a3997..fc8e849d105c 100644
--- a/code/modules/vehicles/hardpoints/holder/holder.dm
+++ b/code/modules/vehicles/hardpoints/holder/holder.dm
@@ -43,10 +43,21 @@
for(var/obj/item/hardpoint/H in hardpoints)
H.take_damage(damage)
-/obj/item/hardpoint/holder/on_install(obj/vehicle/multitile/V)
- for(var/obj/item/hardpoint/HP in hardpoints)
- HP.owner = V
- return
+/obj/item/hardpoint/holder/on_install(obj/vehicle/multitile/vehicle)
+ ..()
+ if(!vehicle) //in loose holder
+ return
+ for(var/obj/item/hardpoint/hardpoint in hardpoints)
+ hardpoint.owner = vehicle
+ hardpoint.on_install(vehicle)
+
+/obj/item/hardpoint/holder/on_uninstall(obj/vehicle/multitile/vehicle)
+ if(!vehicle) //in loose holder
+ return
+ for(var/obj/item/hardpoint/hardpoint in hardpoints)
+ hardpoint.on_uninstall(vehicle)
+ hardpoint.owner = null
+ ..()
/obj/item/hardpoint/holder/proc/can_install(obj/item/hardpoint/H)
// Can only have 1 hardpoint of each slot type
@@ -121,16 +132,17 @@
H.forceMove(src)
LAZYADD(hardpoints, H)
+ H.on_install(owner)
H.rotate(turning_angle(H.dir, dir))
/obj/item/hardpoint/holder/proc/remove_hardpoint(obj/item/hardpoint/H, turf/uninstall_to)
if(!hardpoints)
return
- hardpoints -= H
H.forceMove(uninstall_to ? uninstall_to : get_turf(src))
+ H.on_uninstall(owner)
H.reset_rotation()
-
+ hardpoints -= H
H.owner = null
if(H.health <= 0)
diff --git a/code/modules/vehicles/hardpoints/holder/tank_turret.dm b/code/modules/vehicles/hardpoints/holder/tank_turret.dm
index 27ab6c95404c..896628e609bb 100644
--- a/code/modules/vehicles/hardpoints/holder/tank_turret.dm
+++ b/code/modules/vehicles/hardpoints/holder/tank_turret.dm
@@ -13,8 +13,6 @@
density = TRUE //come on, it's huge
activatable = TRUE
- cooldown = 150
- accuracy = 0.8
ammo = new /obj/item/ammo_magazine/hardpoint/turret_smoke
max_clips = 2
@@ -60,6 +58,15 @@
// Used during the windup
var/rotating = FALSE
+ scatter = 4
+ gun_firemode = GUN_FIREMODE_BURSTFIRE
+ gun_firemode_list = list(
+ GUN_FIREMODE_BURSTFIRE,
+ )
+ burst_amount = 2
+ burst_delay = 1.0 SECONDS
+ extra_delay = 13.0 SECONDS
+
/obj/item/hardpoint/holder/tank_turret/update_icon()
var/broken = (health <= 0)
icon_state = "tank_turret_[broken]"
@@ -182,12 +189,7 @@
user.client.pixel_x = -1 * AM.view_tile_offset * 32
user.client.pixel_y = 0
-/obj/item/hardpoint/holder/tank_turret/fire(mob/user, atom/A)
- if(ammo.current_rounds <= 0)
- return
-
- next_use = world.time + cooldown
-
+/obj/item/hardpoint/holder/tank_turret/try_fire(atom/target, mob/living/user, params)
var/turf/L
var/turf/R
switch(owner.dir)
@@ -204,26 +206,14 @@
L = locate(owner.x - 4, owner.y + 2, owner.z)
R = locate(owner.x - 4, owner.y - 2, owner.z)
- if(LAZYLEN(activation_sounds))
- playsound(get_turf(src), pick(activation_sounds), 60, 1)
- fire_projectile(user, L)
+ if(shots_fired)
+ target = R
+ else
+ target = L
- sleep(10)
+ return ..()
- if(LAZYLEN(activation_sounds))
- playsound(get_turf(src), pick(activation_sounds), 60, 1)
- fire_projectile(user, R)
-
- to_chat(user, SPAN_WARNING("Smoke Screen uses left: [SPAN_HELPFUL(ammo ? ammo.current_rounds / 2 : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds / 2 : 0)] | Mags: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]"))
-
-/obj/item/hardpoint/holder/tank_turret/fire_projectile(mob/user, atom/A)
- set waitfor = 0
-
- var/turf/origin_turf = get_turf(src)
- origin_turf = locate(origin_turf.x + origins[1], origin_turf.y + origins[2], origin_turf.z)
+/obj/item/hardpoint/holder/tank_turret/get_origin_turf()
+ var/origin_turf = ..()
origin_turf = get_step(get_step(origin_turf, owner.dir), owner.dir) //this should get us tile in front of tank to prevent grenade being stuck under us.
-
- var/obj/projectile/P = generate_bullet(user, origin_turf)
- SEND_SIGNAL(P, COMSIG_BULLET_USER_EFFECTS, owner.seats[VEHICLE_GUNNER])
- P.fire_at(A, owner.seats[VEHICLE_GUNNER], src, get_dist(origin_turf, A) + 1, P.ammo.shell_speed)
- ammo.current_rounds--
+ return origin_turf
diff --git a/code/modules/vehicles/hardpoints/primary/autocannon.dm b/code/modules/vehicles/hardpoints/primary/autocannon.dm
index df9224011b32..b6dc2cedc674 100644
--- a/code/modules/vehicles/hardpoints/primary/autocannon.dm
+++ b/code/modules/vehicles/hardpoints/primary/autocannon.dm
@@ -8,8 +8,6 @@
activation_sounds = list('sound/weapons/vehicles/autocannon_fire.ogg')
health = 500
- cooldown = 7
- accuracy = 0.98
firing_arc = 60
origins = list(0, -3)
@@ -23,3 +21,10 @@
"4" = list(32, 0),
"8" = list(-32, 0)
)
+
+ scatter = 1
+ gun_firemode = GUN_FIREMODE_AUTOMATIC
+ gun_firemode_list = list(
+ GUN_FIREMODE_AUTOMATIC,
+ )
+ fire_delay = 0.7 SECONDS
diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm
index ad57e20e8456..4033a4bffb2a 100644
--- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm
+++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm
@@ -12,10 +12,7 @@
damage_multiplier = 0.2
health = 500
- cooldown = 7
- accuracy = 0.98
firing_arc = 60
- var/burst_amount = 2
origins = list(0, -2)
@@ -33,27 +30,15 @@
"8" = list(14, 9)
)
+ scatter = 1
+ gun_firemode = GUN_FIREMODE_AUTOMATIC
+ gun_firemode_list = list(
+ GUN_FIREMODE_AUTOMATIC,
+ )
+ fire_delay = 0.3 SECONDS
+
/obj/item/hardpoint/primary/dualcannon/set_bullet_traits()
..()
LAZYADD(traits_to_give, list(
BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff)
))
-
-/obj/item/hardpoint/primary/dualcannon/fire(mob/user, atom/A)
- if(ammo.current_rounds <= 0)
- return
-
- next_use = world.time + cooldown * owner.misc_multipliers["cooldown"]
-
- for(var/bullets_fired = 1, bullets_fired <= burst_amount, bullets_fired++)
- var/atom/T = A
- if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(A), pick(GLOB.cardinals))
- if(LAZYLEN(activation_sounds))
- playsound(get_turf(src), pick(activation_sounds), 60, 1)
- fire_projectile(user, T)
- if(ammo.current_rounds <= 0)
- break
- if(bullets_fired < burst_amount) //we need to sleep only if there are more bullets to shoot in the burst
- sleep(3)
- to_chat(user, SPAN_WARNING("[src] Ammo: [SPAN_HELPFUL(ammo ? ammo.current_rounds : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds : 0)] | Mags: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]"))
diff --git a/code/modules/vehicles/hardpoints/primary/flamer.dm b/code/modules/vehicles/hardpoints/primary/flamer.dm
index 929842df2307..13beee9dd2c2 100644
--- a/code/modules/vehicles/hardpoints/primary/flamer.dm
+++ b/code/modules/vehicles/hardpoints/primary/flamer.dm
@@ -8,8 +8,6 @@
activation_sounds = list('sound/weapons/vehicles/flamethrower.ogg')
health = 400
- cooldown = 20
- accuracy = 0.75
firing_arc = 90
origins = list(0, -3)
@@ -26,36 +24,19 @@
use_muzzle_flash = FALSE
+ scatter = 5
+ fire_delay = 2.0 SECONDS
+
/obj/item/hardpoint/primary/flamer/set_bullet_traits()
..()
LAZYADD(traits_to_give, list(
BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff)
))
-/obj/item/hardpoint/primary/flamer/can_activate(mob/user, atom/A)
- if(!..())
- return FALSE
-
- var/turf/origin_turf = get_turf(src)
- origin_turf = locate(origin_turf.x + origins[1], origin_turf.y + origins[2], origin_turf.z)
- if(origin_turf == get_turf(A))
- return FALSE
-
- return TRUE
-
-/obj/item/hardpoint/primary/flamer/fire_projectile(mob/user, atom/A)
- set waitfor = 0
-
- var/turf/origin_turf = get_turf(src)
- origin_turf = locate(origin_turf.x + origins[1], origin_turf.y + origins[2], origin_turf.z)
-
- var/range = get_dist(origin_turf, A) + 1
-
- var/obj/projectile/P = generate_bullet(user, origin_turf)
- SEND_SIGNAL(P, COMSIG_BULLET_USER_EFFECTS, owner.seats[VEHICLE_GUNNER])
- P.fire_at(A, owner.seats[VEHICLE_GUNNER], src, range < P.ammo.max_range ? range : P.ammo.max_range, P.ammo.shell_speed)
-
- if(use_muzzle_flash)
- muzzle_flash(Get_Angle(owner, A))
+/obj/item/hardpoint/primary/flamer/try_fire(target, user, params)
+ var/turf/origin_turf = get_origin_turf()
+ if(origin_turf == get_turf(target))
+ to_chat(user, SPAN_WARNING("The target is too close."))
+ return NONE
- ammo.current_rounds--
+ return ..()
diff --git a/code/modules/vehicles/hardpoints/primary/ltb.dm b/code/modules/vehicles/hardpoints/primary/ltb.dm
index 7c663dc27fbc..19b5c7e7b9b4 100644
--- a/code/modules/vehicles/hardpoints/primary/ltb.dm
+++ b/code/modules/vehicles/hardpoints/primary/ltb.dm
@@ -8,8 +8,6 @@
activation_sounds = list('sound/weapons/vehicles/cannon_fire1.ogg', 'sound/weapons/vehicles/cannon_fire2.ogg')
health = 500
- cooldown = 200
- accuracy = 0.97
firing_arc = 60
origins = list(0, -3)
@@ -30,3 +28,6 @@
"4" = list(89, -4),
"8" = list(-89, -4)
)
+
+ scatter = 2
+ fire_delay = 20.0 SECONDS
diff --git a/code/modules/vehicles/hardpoints/primary/minigun.dm b/code/modules/vehicles/hardpoints/primary/minigun.dm
index a6e44d2dbf2c..3acf37eec268 100644
--- a/code/modules/vehicles/hardpoints/primary/minigun.dm
+++ b/code/modules/vehicles/hardpoints/primary/minigun.dm
@@ -7,8 +7,6 @@
disp_icon_state = "ltaaap_minigun"
health = 350
- cooldown = 8
- accuracy = 0.6
firing_arc = 90
origins = list(0, -3)
@@ -30,46 +28,58 @@
"8" = list(-77, 0)
)
- //changed minigun mechanic so instead of having lowered cooldown with each shot it now has increased burst size.
- //While it's still spammy, user doesn't have to click as fast as possible anymore and has margin of 2 seconds before minigun will start slowing down
-
- var/chained_shots = 1 //how many quick succession shots we've fired, 1 by default
- var/last_shot_time = 0 //when was last shot fired, after 3 seconds we stop barrel
- var/list/chain_bursts = list(1, 1, 2, 2, 3, 3, 3, 4, 4, 4) //how many shots per click we do
+ scatter = 7
+ gun_firemode = GUN_FIREMODE_AUTOMATIC
+ gun_firemode_list = list(
+ GUN_FIREMODE_AUTOMATIC,
+ )
+ fire_delay = 0.8 SECONDS //base fire rate, modified by stage_delay_mult
+ activation_sounds = list('sound/weapons/gun_minigun.ogg')
+ /// Active firing time to reach max spin_stage.
+ var/spinup_time = 8 SECONDS
+ /// Grace period before losing spin_stage.
+ var/spindown_grace_time = 2 SECONDS
+ COOLDOWN_DECLARE(spindown_grace_cooldown)
+ /// Cooldown time to reach min spin_stage.
+ var/spindown_time = 3 SECONDS
+ /// Index of stage_rate.
+ var/spin_stage = 1
+ /// Shots fired per fire_delay at a particular spin_stage.
+ var/list/stage_rate = list(1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 5)
+ /// Fire delay multiplier for current spin_stage.
+ var/stage_delay_mult = 1
+ /// When it was last fired, related to world.time.
+ var/last_fired = 0
-/obj/item/hardpoint/primary/minigun/fire(mob/user, atom/A)
+/obj/item/hardpoint/primary/minigun/set_fire_delay(value)
+ fire_delay = value
+ SEND_SIGNAL(src, COMSIG_GUN_AUTOFIREDELAY_MODIFIED, fire_delay * stage_delay_mult)
- var/S = 'sound/weapons/vehicles/minigun_stop.ogg'
- //check how much time since last shot. 2 seconds are grace period before minigun starts to lose rotation momentum
- var/t = world.time - last_shot_time - 2 SECONDS
- t = round(t / 10)
- if(t > 0)
- chained_shots = max(chained_shots - t * 3, 1) //we lose 3 chained_shots per second
- else
- if(chained_shots < 11)
- chained_shots++
- S = 'sound/weapons/vehicles/minigun_loop.ogg'
+/obj/item/hardpoint/primary/minigun/set_fire_cooldown()
+ calculate_stage_delay_mult() //needs to check grace_cooldown before refreshed
+ last_fired = world.time
+ COOLDOWN_START(src, spindown_grace_cooldown, spindown_grace_time)
+ COOLDOWN_START(src, fire_cooldown, fire_delay * stage_delay_mult)
- if(chained_shots == 1)
- playsound(get_turf(src), 'sound/weapons/vehicles/minigun_start.ogg', 40, 1)
+/obj/item/hardpoint/primary/minigun/proc/calculate_stage_delay_mult()
+ var/stage_rate_len = stage_rate.len
+ var/delta_time = world.time - last_fired
- next_use = world.time + cooldown * owner.misc_multipliers["cooldown"]
-
- //how many rounds we will shoot in this burst
- if(chained_shots > LAZYLEN(chain_bursts)) //5 shots at maximum rotation
- t = 5
+ var/old_spin_stage = spin_stage
+ if(auto_firing || burst_firing) //spinup if continuing fire
+ var/delta_stage = delta_time * (stage_rate_len - 1)
+ spin_stage += delta_stage / spinup_time
+ else if(COOLDOWN_FINISHED(src, spindown_grace_cooldown)) //spindown if initiating fire after grace
+ var/delta_stage = (delta_time - spindown_grace_time) * (stage_rate_len - 1)
+ spin_stage -= delta_stage / spindown_time
else
- t = LAZYACCESS(chain_bursts, chained_shots)
- for(var/i = 1; i <= t; i++)
- var/atom/T = A
- if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(T), pick(GLOB.cardinals))
- fire_projectile(user, T)
- if(ammo.current_rounds <= 0)
- break
- sleep(2)
- to_chat(user, SPAN_WARNING("[src] Ammo: [SPAN_HELPFUL(ammo ? ammo.current_rounds : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds : 0)] | Mags: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]"))
+ return
+ spin_stage = Clamp(spin_stage, 1, stage_rate_len)
+
+ var/old_stage_rate = stage_rate[Floor(old_spin_stage)]
+ var/new_stage_rate = stage_rate[Floor(spin_stage)]
- playsound(get_turf(src), S, 40, 1)
- last_shot_time = world.time
+ if(old_stage_rate != new_stage_rate)
+ stage_delay_mult = 1 / new_stage_rate
+ SEND_SIGNAL(src, COMSIG_GUN_AUTOFIREDELAY_MODIFIED, fire_delay * stage_delay_mult)
diff --git a/code/modules/vehicles/hardpoints/secondary/cupola.dm b/code/modules/vehicles/hardpoints/secondary/cupola.dm
index 3c329e135855..f259d6ea2623 100644
--- a/code/modules/vehicles/hardpoints/secondary/cupola.dm
+++ b/code/modules/vehicles/hardpoints/secondary/cupola.dm
@@ -8,10 +8,7 @@
activation_sounds = list('sound/weapons/gun_smartgun1.ogg', 'sound/weapons/gun_smartgun2.ogg', 'sound/weapons/gun_smartgun3.ogg', 'sound/weapons/gun_smartgun4.ogg')
health = 350
- cooldown = 15
- accuracy = 0.9
firing_arc = 120
- var/burst_amount = 3
origins = list(0, -2)
@@ -25,27 +22,17 @@
"8" = list(-5, 7)
)
+ scatter = 3
+ gun_firemode = GUN_FIREMODE_BURSTFIRE
+ gun_firemode_list = list(
+ GUN_FIREMODE_BURSTFIRE,
+ )
+ burst_amount = 3
+ burst_delay = 0.3 SECONDS
+ extra_delay = 0.6 SECONDS
+
/obj/item/hardpoint/secondary/m56cupola/set_bullet_traits()
..()
LAZYADD(traits_to_give, list(
BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff)
))
-
-/obj/item/hardpoint/secondary/m56cupola/fire(mob/user, atom/A)
- if(ammo.current_rounds <= 0)
- return
-
- next_use = world.time + cooldown * owner.misc_multipliers["cooldown"]
-
- for(var/bullets_fired = 1, bullets_fired <= burst_amount, bullets_fired++)
- var/atom/T = A
- if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(A), pick(GLOB.cardinals))
- if(LAZYLEN(activation_sounds))
- playsound(get_turf(src), pick(activation_sounds), 60, 1)
- fire_projectile(user, T)
- if(ammo.current_rounds <= 0)
- break
- if(bullets_fired < burst_amount) //we need to sleep only if there are more bullets to shoot in the burst
- sleep(3)
- to_chat(user, SPAN_WARNING("[src] Ammo: [SPAN_HELPFUL(ammo ? ammo.current_rounds : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds : 0)] | Mags: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]"))
diff --git a/code/modules/vehicles/hardpoints/secondary/flamer.dm b/code/modules/vehicles/hardpoints/secondary/flamer.dm
index 10f7453d8c95..5557cfb24e17 100644
--- a/code/modules/vehicles/hardpoints/secondary/flamer.dm
+++ b/code/modules/vehicles/hardpoints/secondary/flamer.dm
@@ -8,8 +8,6 @@
activation_sounds = list('sound/weapons/vehicles/flamethrower.ogg')
health = 300
- cooldown = 30
- accuracy = 0.68
firing_arc = 120
origins = list(0, -2)
@@ -28,31 +26,20 @@
"8" = list(-3, 18)
)
-/obj/item/hardpoint/secondary/small_flamer/fire_projectile(mob/user, atom/A)
- set waitfor = 0
-
- var/turf/origin_turf = get_turf(src)
- origin_turf = locate(origin_turf.x + origins[1], origin_turf.y + origins[2], origin_turf.z)
- var/list/turf/turfs = getline2(origin_turf, A)
- var/distance = 0
- var/turf/prev_T
-
- for(var/turf/T in turfs)
- if(T == loc)
- prev_T = T
- continue
- if(!ammo.current_rounds) break
- if(distance >= max_range) break
- if(prev_T && LinkBlocked(prev_T, T))
- break
- ammo.current_rounds--
- flame_turf(T, user)
- distance++
- prev_T = T
- sleep(1)
-
-/obj/item/hardpoint/secondary/small_flamer/proc/flame_turf(turf/T, mob/user)
- if(!istype(T)) return
-
- if(!locate(/obj/flamer_fire) in T) // No stacking flames!
- new/obj/flamer_fire(T, create_cause_data(initial(name), user))
+ scatter = 6
+ fire_delay = 3.0 SECONDS
+
+/obj/item/hardpoint/secondary/small_flamer/handle_fire(atom/target, mob/living/user, params)
+ var/turf/origin_turf = get_origin_turf()
+
+ var/distance = get_dist(origin_turf, get_turf(target))
+ var/fire_amount = min(ammo.current_rounds, distance+1, max_range)
+ ammo.current_rounds -= fire_amount
+
+ new /obj/flamer_fire(origin_turf, create_cause_data(initial(name), user), null, fire_amount, null, FLAMESHAPE_LINE, target, CALLBACK(src, PROC_REF(display_ammo), user))
+
+ play_firing_sounds()
+
+ COOLDOWN_START(src, fire_cooldown, fire_delay)
+
+ return AUTOFIRE_CONTINUE
diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm
index a4d7370935fe..536b5742cfcd 100644
--- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm
+++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm
@@ -11,10 +11,7 @@
damage_multiplier = 0.11
health = 350
- cooldown = 16
- accuracy = 0.8
firing_arc = 120
- var/burst_amount = 4
origins = list(0, -2)
@@ -32,27 +29,15 @@
"8" = list(-62, -26)
)
+ scatter = 4
+ gun_firemode = GUN_FIREMODE_AUTOMATIC
+ gun_firemode_list = list(
+ GUN_FIREMODE_AUTOMATIC,
+ )
+ fire_delay = 0.3 SECONDS
+
/obj/item/hardpoint/secondary/frontalcannon/set_bullet_traits()
..()
LAZYADD(traits_to_give, list(
BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff)
))
-
-/obj/item/hardpoint/secondary/frontalcannon/fire(mob/user, atom/A)
- if(ammo.current_rounds <= 0)
- return
-
- next_use = world.time + cooldown * owner.misc_multipliers["cooldown"]
-
- for(var/bullets_fired = 1, bullets_fired <= burst_amount, bullets_fired++)
- var/atom/T = A
- if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(A), pick(GLOB.cardinals))
- if(LAZYLEN(activation_sounds))
- playsound(get_turf(src), pick(activation_sounds), 60, 1)
- fire_projectile(user, T)
- if(ammo.current_rounds <= 0)
- break
- if(bullets_fired < burst_amount) //we need to sleep only if there are more bullets to shoot in the burst
- sleep(3)
- to_chat(user, SPAN_WARNING("[src] Ammo: [SPAN_HELPFUL(ammo ? ammo.current_rounds : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds : 0)] | Mags: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]"))
diff --git a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm
index 8151a1ee50c1..efd151e93cb3 100644
--- a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm
+++ b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm
@@ -8,8 +8,6 @@
activation_sounds = list('sound/weapons/gun_m92_attachable.ogg')
health = 500
- cooldown = 30
- accuracy = 0.4
firing_arc = 90
var/max_range = 7
@@ -27,40 +25,19 @@
"8" = list(-6, 17)
)
+ scatter = 10
+ fire_delay = 3.0 SECONDS
+
/obj/item/hardpoint/secondary/grenade_launcher/set_bullet_traits()
..()
LAZYADD(traits_to_give, list(
BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff)
))
-/obj/item/hardpoint/secondary/grenade_launcher/can_activate(mob/user, atom/A)
- if(!..())
- return FALSE
-
- var/turf/origin_turf = get_turf(src)
- origin_turf = locate(origin_turf.x + origins[1], origin_turf.y + origins[2], origin_turf.z)
- if(get_dist(origin_turf, A) < 1)
- to_chat(usr, SPAN_WARNING("The target is too close."))
- return FALSE
-
- return TRUE
-
-/obj/item/hardpoint/secondary/grenade_launcher/fire_projectile(mob/user, atom/A)
- set waitfor = 0
-
- var/turf/origin_turf = get_turf(src)
- origin_turf = locate(origin_turf.x + origins[1], origin_turf.y + origins[2], origin_turf.z)
-
- //getting distance between supposed target and tank center.
- var/range = get_dist(origin_turf, A) + 1 //otherwise nade falls one tile shorter
- if(range > max_range)
- range = max_range
-
- var/obj/projectile/P = generate_bullet(user, origin_turf)
- SEND_SIGNAL(P, COMSIG_BULLET_USER_EFFECTS, owner.seats[VEHICLE_GUNNER])
- P.fire_at(A, owner.seats[VEHICLE_GUNNER], src, P.ammo.max_range, P.ammo.shell_speed)
-
- if(use_muzzle_flash)
- muzzle_flash(Get_Angle(owner, A))
+/obj/item/hardpoint/secondary/grenade_launcher/try_fire(mob/user, atom/A)
+ var/turf/origin_turf = get_origin_turf()
+ if(origin_turf == get_turf(A))
+ to_chat(user, SPAN_WARNING("The target is too close."))
+ return NONE
- ammo.current_rounds--
+ return ..()
diff --git a/code/modules/vehicles/hardpoints/secondary/tow.dm b/code/modules/vehicles/hardpoints/secondary/tow.dm
index 4bdbc6f417fb..7c58f7970c7b 100644
--- a/code/modules/vehicles/hardpoints/secondary/tow.dm
+++ b/code/modules/vehicles/hardpoints/secondary/tow.dm
@@ -7,8 +7,6 @@
disp_icon_state = "towlauncher"
health = 500
- cooldown = 150
- accuracy = 0.8
firing_arc = 60
origins = list(0, -2)
@@ -29,3 +27,7 @@
"4" = list(5, -8),
"8" = list(-5, 10)
)
+
+ scatter = 4
+ fire_delay = 15.0 SECONDS
+
diff --git a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm
index b6f3daed9f4e..780c195f00be 100644
--- a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm
+++ b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm
@@ -10,10 +10,7 @@
activation_sounds = list('sound/weapons/gun_smartgun1.ogg', 'sound/weapons/gun_smartgun2.ogg', 'sound/weapons/gun_smartgun3.ogg', 'sound/weapons/gun_smartgun4.ogg')
health = 100
- cooldown = 10
- accuracy = 0.9
firing_arc = 120
- var/burst_amount = 3
//FPWs reload automatically
var/reloading = FALSE
var/reload_time = 10 SECONDS
@@ -30,6 +27,13 @@
underlayer_north_muzzleflash = TRUE
+ scatter = 3
+ gun_firemode = GUN_FIREMODE_AUTOMATIC
+ gun_firemode_list = list(
+ GUN_FIREMODE_AUTOMATIC,
+ )
+ fire_delay = 0.3 SECONDS
+
/obj/item/hardpoint/special/firing_port_weapon/set_bullet_traits()
..()
LAZYADD(traits_to_give, list(
@@ -49,46 +53,6 @@
return data
-
-/obj/item/hardpoint/special/firing_port_weapon/can_activate(mob/user, atom/A)
- if(!owner)
- return FALSE
-
- var/seat = owner.get_mob_seat(user)
- if(!seat)
- return FALSE
-
- if(seat != allowed_seat)
- to_chat(user, SPAN_WARNING("Only [allowed_seat] can use [name]."))
- return FALSE
-
- //FPW stop working at 50% hull
- if(owner.health < initial(owner.health) * 0.5)
- to_chat(user, SPAN_WARNING("\The [owner]'s hull is too damaged!"))
- return FALSE
-
- if(world.time < next_use)
- if(cooldown >= 20) //filter out guns with high firerate to prevent message spam.
- to_chat(user, SPAN_WARNING("You need to wait [SPAN_HELPFUL((next_use - world.time) / 10)] seconds before [name] can be used again."))
- return FALSE
-
- if(reloading)
- to_chat(user, SPAN_NOTICE("\The [name] is reloading. Wait [SPAN_HELPFUL("[((reload_time_started + reload_time - world.time) / 10)]")] seconds."))
- return FALSE
-
- if(ammo && ammo.current_rounds <= 0)
- if(reloading)
- to_chat(user, SPAN_WARNING("\The [name] is out of ammo! You have to wait [(reload_time_started + reload_time - world.time) / 10] seconds before it reloads!"))
- else
- start_auto_reload(user)
- return FALSE
-
- if(!in_firing_arc(A))
- to_chat(user, SPAN_WARNING("The target is not within your firing arc!"))
- return FALSE
-
- return TRUE
-
/obj/item/hardpoint/special/firing_port_weapon/reload(mob/user)
if(!ammo)
ammo = new /obj/item/ammo_magazine/hardpoint/firing_port_weapon
@@ -116,27 +80,32 @@
to_chat(user, SPAN_NOTICE("\The [name] reloads automatically."))
return FALSE
+/obj/item/hardpoint/special/firing_port_weapon/try_fire(atom/target, mob/living/user, params)
+ if(!owner)
+ return NONE
+
+ //FPW stop working at 50% hull
+ if(owner.health < initial(owner.health) * 0.5)
+ to_chat(user, SPAN_WARNING("\The [owner]'s hull is too damaged!"))
+ return NONE
-/obj/item/hardpoint/special/firing_port_weapon/fire(mob/user, atom/A)
if(user.get_active_hand())
to_chat(user, SPAN_WARNING("You need a free hand to use \the [name]."))
- return
+ return NONE
- if(ammo.current_rounds <= 0)
- start_auto_reload(user)
- return
+ if(reloading)
+ to_chat(user, SPAN_NOTICE("\The [name] is reloading. Wait [SPAN_HELPFUL("[((reload_time_started + reload_time - world.time) / 10)]")] seconds."))
+ return NONE
+
+ if(ammo && ammo.current_rounds <= 0)
+ if(reloading)
+ to_chat(user, SPAN_WARNING("\The [name] is out of ammo! You have to wait [(reload_time_started + reload_time - world.time) / 10] seconds before it reloads!"))
+ else
+ start_auto_reload(user)
+ return NONE
+
+ if(!in_firing_arc(target))
+ to_chat(user, SPAN_WARNING("The target is not within your firing arc!"))
+ return NONE
- next_use = world.time + cooldown * owner.misc_multipliers["cooldown"]
-
- for(var/bullets_fired = 1, bullets_fired <= burst_amount, bullets_fired++)
- var/atom/T = A
- if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(A), pick(GLOB.cardinals))
- if(LAZYLEN(activation_sounds))
- playsound(get_turf(src), pick(activation_sounds), 60, 1)
- fire_projectile(user, T)
- if(ammo.current_rounds <= 0)
- break
- if(bullets_fired < burst_amount) //we need to sleep only if there are more bullets to shoot in the burst
- sleep(3)
- to_chat(user, SPAN_WARNING("[src] Ammo: [SPAN_HELPFUL(ammo ? ammo.current_rounds : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds : 0)]"))
+ return handle_fire(target, user, params)
diff --git a/code/modules/vehicles/hardpoints/support/artillery.dm b/code/modules/vehicles/hardpoints/support/artillery.dm
index aacb83fcf383..dfcdcaf73f74 100644
--- a/code/modules/vehicles/hardpoints/support/artillery.dm
+++ b/code/modules/vehicles/hardpoints/support/artillery.dm
@@ -14,7 +14,7 @@
var/view_buff = 10 //This way you can VV for more or less fun
var/view_tile_offset = 7
-/obj/item/hardpoint/support/artillery_module/activate(mob/user, atom/A)
+/obj/item/hardpoint/support/artillery_module/handle_fire(atom/target, mob/living/user, params)
if(!user.client)
return
@@ -62,8 +62,9 @@
user.client.pixel_y = 0
is_active = FALSE
-/obj/item/hardpoint/support/artillery_module/can_activate()
+/obj/item/hardpoint/support/artillery_module/try_fire(target, user, params)
if(health <= 0)
to_chat(usr, SPAN_WARNING("\The [src] is broken!"))
- return FALSE
- return TRUE
+ return NONE
+
+ return handle_fire(target, user, params)
diff --git a/code/modules/vehicles/hardpoints/support/flare.dm b/code/modules/vehicles/hardpoints/support/flare.dm
index 00dcd3ac1886..432c9636dadd 100644
--- a/code/modules/vehicles/hardpoints/support/flare.dm
+++ b/code/modules/vehicles/hardpoints/support/flare.dm
@@ -13,8 +13,6 @@
activatable = TRUE
health = 500
- cooldown = 30
- accuracy = 0.7
firing_arc = 120
origins = list(0, -2)
@@ -33,6 +31,9 @@
"8" = list(14, -6)
)
+ scatter = 6
+ fire_delay = 3.0 SECONDS
+
/obj/item/hardpoint/support/flare_launcher/set_bullet_traits()
..()
LAZYADD(traits_to_give, list(
diff --git a/code/modules/vehicles/interior/interactable/seats.dm b/code/modules/vehicles/interior/interactable/seats.dm
index ea961bc72593..253b4a066b4f 100644
--- a/code/modules/vehicles/interior/interactable/seats.dm
+++ b/code/modules/vehicles/interior/interactable/seats.dm
@@ -40,8 +40,8 @@
return
if(QDELETED(buckled_mob))
- vehicle.set_seated_mob(seat, null)
M.unset_interaction()
+ vehicle.set_seated_mob(seat, null)
if(M.client)
M.client.change_view(GLOB.world_view_size, vehicle)
M.client.pixel_x = 0
@@ -174,8 +174,8 @@
return
if(QDELETED(buckled_mob))
- vehicle.set_seated_mob(seat, null)
M.unset_interaction()
+ vehicle.set_seated_mob(seat, null)
if(M.client)
M.client.change_view(GLOB.world_view_size, vehicle)
M.client.pixel_x = 0
@@ -252,8 +252,8 @@
return
if(QDELETED(buckled_mob))
- vehicle.set_seated_mob(seat, null)
M.unset_interaction()
+ vehicle.set_seated_mob(seat, null)
if(M.client)
M.client.change_view(GLOB.world_view_size, vehicle)
M.client.pixel_x = 0
diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm
index c8138c5b8f86..f3b7be510b08 100644
--- a/code/modules/vehicles/multitile/multitile.dm
+++ b/code/modules/vehicles/multitile/multitile.dm
@@ -340,15 +340,24 @@
M.reset_view(src)
give_action(M, /datum/action/human_action/vehicle_unbuckle)
+/// Get crewmember of seat.
/obj/vehicle/multitile/proc/get_seat_mob(seat)
return seats[seat]
+/// Get seat of crewmember.
/obj/vehicle/multitile/proc/get_mob_seat(mob/M)
for(var/seat in seats)
if(seats[seat] == M)
return seat
return null
+/// Get active hardpoint of crewmember.
+/obj/vehicle/multitile/proc/get_mob_hp(mob/crew)
+ var/seat = get_mob_seat(crew)
+ if(seat)
+ return active_hp[seat]
+ return null
+
/obj/vehicle/multitile/proc/get_passengers()
if(interior)
return interior.get_passengers()
diff --git a/code/modules/vehicles/multitile/multitile_hardpoints.dm b/code/modules/vehicles/multitile/multitile_hardpoints.dm
index 2c5a343b802a..a6014c6cf2cd 100644
--- a/code/modules/vehicles/multitile/multitile_hardpoints.dm
+++ b/code/modules/vehicles/multitile/multitile_hardpoints.dm
@@ -230,47 +230,3 @@
qdel(old)
update_icon()
-
-//proc that fires non selected weaponry
-/obj/vehicle/multitile/proc/shoot_other_weapon(mob/living/carbon/human/M, seat, atom/A)
-
- if(!istype(M))
- return
-
- var/list/usable_hps = get_hardpoints_with_ammo(seat)
- for(var/obj/item/hardpoint/HP in usable_hps)
- if(HP == active_hp[seat] || HP.slot != HDPT_PRIMARY && HP.slot != HDPT_SECONDARY)
- usable_hps.Remove(HP)
-
- if(!LAZYLEN(usable_hps))
- to_chat(M, SPAN_WARNING("No other working weapons detected."))
- return
-
- for(var/obj/item/hardpoint/HP in usable_hps)
- if(!HP.can_activate(M, A))
- return
- HP.activate(M, A)
- break
- return
-
-//proc that activates support module if it can be activated and you meet requirements
-/obj/vehicle/multitile/proc/activate_support_module(mob/living/carbon/human/M, seat, atom/A)
-
- if(!istype(M))
- return
-
- var/list/usable_hps = get_activatable_hardpoints(seat)
- for(var/obj/item/hardpoint/HP in usable_hps)
- if(HP.slot != HDPT_SUPPORT)
- usable_hps.Remove(HP)
-
- if(!LAZYLEN(usable_hps))
- to_chat(M, SPAN_WARNING("No activatable support modules detected."))
- return
-
- for(var/obj/item/hardpoint/HP in usable_hps)
- if(!HP.can_activate(M, A))
- return
- HP.activate(M, A)
- break
- return
diff --git a/code/modules/vehicles/multitile/multitile_interaction.dm b/code/modules/vehicles/multitile/multitile_interaction.dm
index 42b141327bd8..aa2025d151b5 100644
--- a/code/modules/vehicles/multitile/multitile_interaction.dm
+++ b/code/modules/vehicles/multitile/multitile_interaction.dm
@@ -330,80 +330,61 @@
healthcheck()
-/obj/vehicle/multitile/handle_click(mob/living/user, atom/A, list/mods)
-
- var/seat
- for(var/vehicle_seat in seats)
- if(seats[vehicle_seat] == user)
- seat = vehicle_seat
- break
-
- if(istype(A, /atom/movable/screen) || !seat)
+/obj/vehicle/multitile/on_set_interaction(mob/user)
+ RegisterSignal(user, COMSIG_MOB_MOUSEDOWN, PROC_REF(crew_mousedown))
+ RegisterSignal(user, COMSIG_MOB_MOUSEDRAG, PROC_REF(crew_mousedrag))
+ RegisterSignal(user, COMSIG_MOB_MOUSEUP, PROC_REF(crew_mouseup))
+
+/obj/vehicle/multitile/on_unset_interaction(mob/user)
+ UnregisterSignal(user, list(COMSIG_MOB_MOUSEUP, COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEDRAG))
+
+ var/obj/item/hardpoint/hardpoint = get_mob_hp(user)
+ if(hardpoint)
+ SEND_SIGNAL(hardpoint, COMSIG_GUN_INTERRUPT_FIRE) //abort fire when crew leaves
+
+/// Relays crew mouse release to active hardpoint.
+/obj/vehicle/multitile/proc/crew_mouseup(datum/source, atom/object, turf/location, control, params)
+ SIGNAL_HANDLER
+ var/obj/item/hardpoint/hardpoint = get_mob_hp(source)
+ if(!hardpoint)
return
- if(seat == VEHICLE_DRIVER)
- if(mods["shift"] && !mods["alt"])
- A.examine(user)
- return
-
- if(mods["ctrl"] && !mods["alt"])
- activate_horn()
- return
-
- var/obj/item/hardpoint/HP = active_hp[seat]
- if(!HP)
- to_chat(user, SPAN_WARNING("Please select an active hardpoint first."))
- return
-
- if(!HP.can_activate(user, A))
- return
-
- HP.activate(user, A)
-
- if(seat == VEHICLE_GUNNER)
- if(mods["shift"] && !mods["middle"])
- if(vehicle_flags & VEHICLE_TOGGLE_SHIFT_CLICK_GUNNER)
- shoot_other_weapon(user, seat, A)
- else
- A.examine(user)
- return
- if(mods["middle"] && !mods["shift"])
- if(!(vehicle_flags & VEHICLE_TOGGLE_SHIFT_CLICK_GUNNER))
- shoot_other_weapon(user, seat, A)
- return
- if(mods["alt"])
- toggle_gyrostabilizer()
- return
- if(mods["ctrl"])
- activate_support_module(user, seat, A)
- return
+ hardpoint.stop_fire(source, object, location, control, params)
- var/obj/item/hardpoint/HP = active_hp[seat]
- if(!HP)
- to_chat(user, SPAN_WARNING("Please select an active hardpoint first."))
- return
+/// Relays crew mouse movement to active hardpoint.
+/obj/vehicle/multitile/proc/crew_mousedrag(datum/source, atom/src_object, atom/over_object, turf/src_location, turf/over_location, src_control, over_control, params)
+ SIGNAL_HANDLER
+ var/obj/item/hardpoint/hardpoint = get_mob_hp(source)
+ if(!hardpoint)
+ return
- if(!HP.can_activate(user, A))
- return
+ hardpoint.change_target(source, src_object, over_object, src_location, over_location, src_control, over_control, params)
- HP.activate(user, A)
+/// Checks for special control keybinds, else relays crew mouse press to active hardpoint.
+/obj/vehicle/multitile/proc/crew_mousedown(datum/source, atom/object, turf/location, control, params)
+ SIGNAL_HANDLER
- if(seat == VEHICLE_SUPPORT_GUNNER_ONE || seat == VEHICLE_SUPPORT_GUNNER_TWO)
- if(mods["shift"])
- A.examine(user)
- return
- if(mods["middle"] || mods["alt"] || mods["ctrl"])
- return
+ var/list/modifiers = params2list(params)
+ if(modifiers[SHIFT_CLICK] || modifiers[MIDDLE_CLICK] || modifiers[RIGHT_CLICK]) //don't step on examine, point, etc
+ return
- var/obj/item/hardpoint/HP = active_hp[seat]
- if(!HP)
- to_chat(user, SPAN_WARNING("Please select an active hardpoint first."))
- return
+ var/seat = get_mob_seat(source)
+ switch(seat)
+ if(VEHICLE_DRIVER)
+ if(modifiers[LEFT_CLICK] && modifiers[CTRL_CLICK])
+ activate_horn()
+ return
+ if(VEHICLE_GUNNER)
+ if(modifiers[LEFT_CLICK] && modifiers[ALT_CLICK])
+ toggle_gyrostabilizer()
+ return
- if(!HP.can_activate(user, A))
- return
+ var/obj/item/hardpoint/hardpoint = get_mob_hp(source)
+ if(!hardpoint)
+ to_chat(source, SPAN_WARNING("Please select an active hardpoint first."))
+ return
- HP.activate(user, A)
+ hardpoint.start_fire(source, object, location, control, params)
/obj/vehicle/multitile/proc/handle_player_entrance(mob/M)
if(!M || M.client == null) return
diff --git a/code/modules/vehicles/multitile/multitile_verbs.dm b/code/modules/vehicles/multitile/multitile_verbs.dm
index c7dd29bbf0a9..3801cd2e176c 100644
--- a/code/modules/vehicles/multitile/multitile_verbs.dm
+++ b/code/modules/vehicles/multitile/multitile_verbs.dm
@@ -30,6 +30,10 @@
if(!HP)
return
+ var/obj/item/hardpoint/old_HP = V.active_hp[seat]
+ if(old_HP)
+ SEND_SIGNAL(old_HP, COMSIG_GUN_INTERRUPT_FIRE) //stop fire when switching away from HP
+
V.active_hp[seat] = HP
var/msg = "You select \the [HP]."
if(HP.ammo)
@@ -66,6 +70,10 @@
if(!HP)
return
+ var/obj/item/hardpoint/old_HP = V.active_hp[seat]
+ if(old_HP)
+ SEND_SIGNAL(old_HP, COMSIG_GUN_INTERRUPT_FIRE) //stop fire when switching away from HP
+
V.active_hp[seat] = HP
var/msg = "You select \the [HP]."
if(HP.ammo)
@@ -225,10 +233,7 @@
3. \"G: Toggle Turret Gyrostabilizer\" - toggles Turret Gyrostabilizer allowing it to keep current direction ignoring hull turning. (Exists only on vehicles with rotating turret, e.g. M34A2 Longstreet Light Tank)
\
Support Gunner verbs:
1. \"Reload Firing Port Weapon\" - initiates automated reloading process for M56 FPW. Requires a confirmation.
\
Driver shortcuts:
1. \"CTRL + Click\" - activates vehicle horn.
\
- Gunner shortcuts:
1. \"ALT + Click\" - toggles Turret Gyrostabilizer. (Exists only on vehicles with rotating turret, e.g. M34A2 Longstreet Light Tank)
\
- 2. \"CTRL + Click\" - activates not destroyed activatable support module.
\
- 3. \"Middle Mouse Button Click (MMB)\" - default shortcut to shoot currently not selected weapon if possible. Won't work if SHIFT + Click firing is toggled ON.
\
- 4. \"SHIFT + Click\" - examines target as usual, unless \"G: Toggle Middle/Shift Clicking\" verb was used to toggle SHIFT + Click firing ON. In this case, it will fire currently not selected weapon if possible.
"
+ Gunner shortcuts:
1. \"ALT + Click\" - toggles Turret Gyrostabilizer. (Exists only on vehicles with rotating turret, e.g. M34A2 Longstreet Light Tank)
"
show_browser(user, dat, "Vehicle Controls Guide", "vehicle_help", "size=900x500")
onclose(user, "vehicle_help")
diff --git a/html/changelogs/AutoChangeLog-pr-4942.yml b/html/changelogs/AutoChangeLog-pr-4942.yml
deleted file mode 100644
index 910b59085760..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4942.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "IowaPotatoFarmer"
-delete-after: True
-changes:
- - rscadd: "Added a Corporate Liaison survivor to Sorokyne."
- - rscadd: "Added a modified version of the liaison's winter coat that allows it to holster guns and a few other things. Only available to the Sorokyne Strata Corporate Liaison for now."
- - spellcheck: "Fixed a typo in the Sorokyne Strata Political Prisoner's ID tag."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4959.yml b/html/changelogs/AutoChangeLog-pr-4959.yml
new file mode 100644
index 000000000000..353ab3f02880
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4959.yml
@@ -0,0 +1,5 @@
+author: "Doubleumc"
+delete-after: True
+changes:
+ - refactor: "vehicle weapons can fire full-auto"
+ - rscdel: "no more controls for firing vehicle non-selected weapons"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4976.yml b/html/changelogs/AutoChangeLog-pr-4976.yml
new file mode 100644
index 000000000000..2a0de1ec20d0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4976.yml
@@ -0,0 +1,4 @@
+author: "zzzmike, drathek, ihatethisengine2"
+delete-after: True
+changes:
+ - rscadd: "Lifeboat launch now has an ARES announcement followed by a 10 second delay before doors close. The current launch functionality is preserved as Emergency Launch."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5022.yml b/html/changelogs/AutoChangeLog-pr-5022.yml
deleted file mode 100644
index 389b3f533380..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5022.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Birdtalon"
-delete-after: True
-changes:
- - rscadd: "Radial Menu for xeno Evolve"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5049.yml b/html/changelogs/AutoChangeLog-pr-5049.yml
deleted file mode 100644
index 456b7f3992bf..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5049.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SabreML"
-delete-after: True
-changes:
- - ui: "Removed the scrollbar from the 'Player setup' menu."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5062.yml b/html/changelogs/AutoChangeLog-pr-5062.yml
deleted file mode 100644
index f733828f0911..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5062.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ihatethisengine"
-delete-after: True
-changes:
- - rscadd: "Whiskey outpost is voteable less often and requires 140 players."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5066.yml b/html/changelogs/AutoChangeLog-pr-5066.yml
deleted file mode 100644
index 96ab60a4bbf4..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5066.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
- - bugfix: "Fixes /spec_kit/asrs (now /spec_kit/rifleman) not allowing use."
- - code_imp: "Adds back-end functionality for token redeeming on cm_vending vendors, and moves synth experimental tools token to use it."
- - rscadd: "Spec tokens are real."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5083.yml b/html/changelogs/AutoChangeLog-pr-5083.yml
new file mode 100644
index 000000000000..8688793c2ffb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5083.yml
@@ -0,0 +1,4 @@
+author: "Ediblebomb"
+delete-after: True
+changes:
+ - rscadd: "M5 Helmet Gasmask now functions as a gasmask when in a marine helmet (and yes, gasmasks do still have some functionality)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5084.yml b/html/changelogs/AutoChangeLog-pr-5084.yml
deleted file mode 100644
index 2ace834670e5..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5084.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "cuberound"
-delete-after: True
-changes:
- - bugfix: "fixed a runtime in /datum/component/healing_reduction/process(delta_time)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5095.yml b/html/changelogs/AutoChangeLog-pr-5095.yml
deleted file mode 100644
index 8ed12b90778d..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5095.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrDas"
-delete-after: True
-changes:
- - bugfix: "Observer minimap should no longer occasionally show wrong / no map."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5096.yml b/html/changelogs/AutoChangeLog-pr-5096.yml
deleted file mode 100644
index 7384ce62d666..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5096.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Birdtalon"
-delete-after: True
-changes:
- - bugfix: "Upgraded resin walls can now nest hosts.\n/🆑"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5099.yml b/html/changelogs/AutoChangeLog-pr-5099.yml
new file mode 100644
index 000000000000..bbdd8c2954be
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5099.yml
@@ -0,0 +1,4 @@
+author: "realforest2001"
+delete-after: True
+changes:
+ - code_imp: "Cleaned up 1 letter vars in the global datacore. Also made the entry names reflect the real name of who they relate to, for VV purposes."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5119.yml b/html/changelogs/AutoChangeLog-pr-5119.yml
new file mode 100644
index 000000000000..5ec2e0a33e33
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5119.yml
@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+ - bugfix: "Fix some errors regarding the nano subystem"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5120.yml b/html/changelogs/AutoChangeLog-pr-5120.yml
new file mode 100644
index 000000000000..eb9c6fc96e9a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5120.yml
@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+ - code_imp: "Reduced most preference re-saving when preferences are initially loaded"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5121.yml b/html/changelogs/AutoChangeLog-pr-5121.yml
new file mode 100644
index 000000000000..5daa315b8e9f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5121.yml
@@ -0,0 +1,4 @@
+author: "SabreML"
+delete-after: True
+changes:
+ - spellcheck: "Fixed instances of \"The the\" and \"A the\" in chat messages so that they're just \"The\" instead. (Part 2)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5125.yml b/html/changelogs/AutoChangeLog-pr-5125.yml
new file mode 100644
index 000000000000..236ad26c2f8d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5125.yml
@@ -0,0 +1,5 @@
+author: "SabreML"
+delete-after: True
+changes:
+ - admin: "Fixed a freeze when opening the the 'Create Object' interface."
+ - admin: "Adjusted the size and positioning of the 'Create Object/Mob/Turf' panels so that everything fits into the window."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5127.yml b/html/changelogs/AutoChangeLog-pr-5127.yml
new file mode 100644
index 000000000000..6aa332377bce
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5127.yml
@@ -0,0 +1,5 @@
+author: "realforest2001"
+delete-after: True
+changes:
+ - bugfix: "Fixes custom sent ERTs broadcasting when they shouldn't."
+ - bugfix: "Fixes UPP friendly ERT telling staff it's hostile."
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml
index a481ce6987cd..f6213027ce92 100644
--- a/html/changelogs/archive/2023-12.yml
+++ b/html/changelogs/archive/2023-12.yml
@@ -38,3 +38,48 @@
- maptweak: Standardized the names of LZs to include the name of the LZ.
stalkerino:
- bugfix: fixes the skull facepaint, black mask, blue mask
+2023-12-04:
+ Birdtalon:
+ - bugfix: "Upgraded resin walls can now nest hosts.\n/\U0001F191"
+ - rscadd: Radial Menu for xeno Evolve
+ IowaPotatoFarmer:
+ - rscadd: Added a Corporate Liaison survivor to Sorokyne.
+ - rscadd: Added a modified version of the liaison's winter coat that allows it to
+ holster guns and a few other things. Only available to the Sorokyne Strata Corporate
+ Liaison for now.
+ - spellcheck: Fixed a typo in the Sorokyne Strata Political Prisoner's ID tag.
+ MrDas:
+ - bugfix: Observer minimap should no longer occasionally show wrong / no map.
+ SabreML:
+ - ui: Removed the scrollbar from the 'Player setup' menu.
+ cuberound:
+ - bugfix: fixed a runtime in /datum/component/healing_reduction/process(delta_time)
+ ihatethisengine:
+ - rscadd: Whiskey outpost is voteable less often and requires 140 players.
+ realforest2001:
+ - bugfix: Fixes /spec_kit/asrs (now /spec_kit/rifleman) not allowing use.
+ - code_imp: Adds back-end functionality for token redeeming on cm_vending vendors,
+ and moves synth experimental tools token to use it.
+ - rscadd: Spec tokens are real.
+2023-12-05:
+ Birdtalon:
+ - bugfix: "Fixes a runtime in vendors\n/\U0001F191"
+ Huffie56:
+ - rscadd: added new sections(Binoculars, Utilities, Helmet Optics, Radio keys, and
+ fill them with items already in the vendor.
+ - qol: move the section called pouches just above utilities section.
+ - qol: changed the section called "Supplies" to "engineering supplies" and fill
+ it with C4 and APC circuit board .
+ SabreML:
+ - spellcheck: Fixed instances of "The the" and "A the" in chat messages so that
+ they're just "The" instead. (Part 1)
+ Tsurupeta:
+ - bugfix: fixed saving of certain preferences.
+ silencer_pl:
+ - admin: Recieving prayers now makes a sound
+ - admin: Prayers and USCM emergency messages are now better highlighted for mods/admins
+2023-12-06:
+ Birdtalon:
+ - bugfix: "Fixes runtime in spiders.dm\n/\U0001F191"
+ Blundir:
+ - rscadd: added new ammo boxes for various weapons and ammo
diff --git a/html/create_object.html b/html/create_object.html
index a4c3085a9ac6..8e67b99aebca 100644
--- a/html/create_object.html
+++ b/html/create_object.html
@@ -9,16 +9,17 @@
@@ -37,13 +39,11 @@
var objects = object_paths == null ? new Array() : object_paths.split(";");
document.spawner.filter.focus();
- populateList(objects);
function populateList(from_list) {
object_list.options.length = 0;
- var i;
- for (i in from_list) {
+ for (var i in from_list) {
var new_option = document.createElement("option");
new_option.value = from_list[i];
new_option.text = from_list[i];
@@ -71,6 +71,7 @@
return false;
}
+ // Carriage return
if (event.keyCode == 13 || event.which == 13) {
object_list.options[0].selected = 'true';
}
diff --git a/icons/obj/items/food.dmi b/icons/obj/items/food.dmi
index 3c2e963e3804..54de858ffc9c 100644
Binary files a/icons/obj/items/food.dmi and b/icons/obj/items/food.dmi differ
diff --git a/icons/obj/items/food_ingredients.dmi b/icons/obj/items/food_ingredients.dmi
index 3e30f51153c0..c0a0213e6db4 100644
Binary files a/icons/obj/items/food_ingredients.dmi and b/icons/obj/items/food_ingredients.dmi differ
diff --git a/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi b/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi
index 6c5d741ef9b8..42e7c54bbd2b 100644
Binary files a/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi differ
diff --git a/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi b/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi
index 3355358f72f9..eeef3f91412d 100644
Binary files a/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi differ
diff --git a/icons/obj/items/weapons/guns/ammo_boxes/magazines.dmi b/icons/obj/items/weapons/guns/ammo_boxes/magazines.dmi
index c56cb4deea9c..ff0c6d60d4ac 100644
Binary files a/icons/obj/items/weapons/guns/ammo_boxes/magazines.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/magazines.dmi differ
diff --git a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi
index dd08bf7e69b1..911b727ba5f6 100644
Binary files a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi differ
diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi
index 51bc441aefaa..f6bddae9b090 100644
Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi differ
diff --git a/icons/rebase_icons.dmi b/icons/rebase_icons.dmi
index 6b0a25a1f7e6..14c19d8b27e6 100644
Binary files a/icons/rebase_icons.dmi and b/icons/rebase_icons.dmi differ
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index d2d3111364df..2e1ebb3ea204 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -576,6 +576,10 @@
},
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/exterior/scrubland)
+"aKg" = (
+/obj/structure/tunnel,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/interior/colony_South)
"aKl" = (
/obj/structure/machinery/landinglight/ds1{
dir = 1
@@ -984,7 +988,7 @@
"bsq" = (
/obj/structure/tunnel,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/colony_north)
"bsw" = (
/obj/structure/platform/kutjevo/smooth{
dir = 8
@@ -8853,11 +8857,9 @@
/turf/open/floor/almayer/research/containment/floor2,
/area/kutjevo/interior/complex/med/auto_doc)
"lZT" = (
-/obj/structure/tunnel{
- id = "hole1"
- },
-/turf/open/auto_turf/sand/layer2,
-/area/kutjevo/interior/colony_north)
+/obj/structure/tunnel,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/construction)
"lZZ" = (
/obj/structure/platform_decoration/kutjevo{
dir = 4
@@ -9796,11 +9798,9 @@
/turf/open/desert/desert_shore/shore_corner2,
/area/kutjevo/exterior/runoff_river)
"niP" = (
-/obj/structure/tunnel{
- id = "hole3"
- },
+/obj/structure/tunnel,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/exterior/runoff_river)
"niT" = (
/obj/structure/flora/grass/tallgrass/desert/corner{
dir = 1
@@ -11982,6 +11982,10 @@
},
/turf/open/floor/kutjevo/colors/cyan/inner_corner,
/area/kutjevo/interior/complex/med/triage)
+"pVH" = (
+/obj/structure/tunnel,
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/exterior/runoff_river)
"pWe" = (
/obj/structure/platform_decoration/kutjevo/rock{
dir = 1
@@ -12502,11 +12506,9 @@
},
/area/kutjevo/interior/oob)
"qLV" = (
-/obj/structure/tunnel{
- id = "hole2"
- },
-/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/exterior/stonyfields)
+/obj/structure/tunnel,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/interior/colony_S_East)
"qMC" = (
/obj/structure/machinery/light{
dir = 4
@@ -16058,11 +16060,9 @@
/turf/open/floor/kutjevo/multi_tiles,
/area/kutjevo/exterior/runoff_bridge)
"vzy" = (
-/obj/structure/tunnel{
- id = "hole4"
- },
-/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/exterior/scrubland)
+/obj/structure/tunnel,
+/turf/open/gm/dirtgrassborder2,
+/area/kutjevo/exterior/complex_border/med_park)
"vzC" = (
/obj/structure/platform/kutjevo{
dir = 1
@@ -28074,7 +28074,7 @@ sYd
bXl
bXl
bXl
-vzy
+bXl
sYd
bXl
sYd
@@ -31570,7 +31570,7 @@ bEp
bEp
bEp
bEp
-tKY
+niP
dic
dic
dic
@@ -33635,7 +33635,7 @@ xJg
xJg
xJg
xJg
-qLV
+xJg
jfQ
jfQ
xJg
@@ -34919,7 +34919,7 @@ jhS
jhS
jhS
wff
-niP
+wff
wff
wff
jhS
@@ -35547,7 +35547,7 @@ dxF
mxB
mxB
mxB
-quy
+vzy
tUm
wYp
bGV
@@ -37793,7 +37793,7 @@ nKh
nKh
nKh
wtH
-sbX
+pVH
mtS
fPH
dTM
@@ -42736,7 +42736,7 @@ bkR
wTt
bkR
bEH
-lZT
+bEH
hUk
hUk
hUk
@@ -43083,7 +43083,7 @@ hUk
hUk
hUk
hUk
-xWK
+lZT
nlA
xWK
xWK
@@ -46807,7 +46807,7 @@ wXd
wXd
wXd
wXd
-mMH
+aKg
bpj
npL
bpj
@@ -48730,7 +48730,7 @@ bkR
bkR
bkR
wTt
-wTt
+bsq
hUk
hUk
hUk
@@ -50104,7 +50104,7 @@ kZz
feg
feg
feg
-bsq
+uiK
mnT
mnT
mnT
@@ -54310,7 +54310,7 @@ ptY
ebB
ebB
bOc
-ptY
+qLV
dxF
dxF
dxF