diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index dcc8e4bf6c4b..044271be9b5a 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -42,6 +42,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu
#define ACCESS_MARINE_OT 35
#define ACCESS_MARINE_SYNTH 36
+#define ACCESS_MARINE_ASO 37
// AI Core Accesses
/// Used in temporary passes
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index d598a8ff6f67..eac5121f173e 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -72,10 +72,13 @@ var/global/list/job_squad_roles = JOB_SQUAD_ROLES_LIST
#define JOB_COMMAND_ROLES_LIST list(JOB_CO, JOB_XO, JOB_SO)
var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
+#define JOB_AUXILIARY_OFFICER "Auxiliary Support Officer"
#define JOB_PILOT "Pilot Officer"
#define JOB_DROPSHIP_CREW_CHIEF "Dropship Crew Chief"
#define JOB_CREWMAN "Vehicle Crewman"
#define JOB_INTEL "Intelligence Officer"
+#define JOB_AUXILIARY_ROLES /datum/timelock/auxiliary
+#define JOB_AUXILIARY_ROLES_LIST list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL)
#define JOB_POLICE "Military Police"
#define JOB_WARDEN "Military Warden"
@@ -91,7 +94,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_ENGINEER_ROLES /datum/timelock/engineer
#define JOB_ENGINEER_ROLES_LIST list(JOB_SQUAD_ENGI, JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CHIEF_ENGINEER)
-#define JOB_CHIEF_REQUISITION "Requisitions Officer"
+#define JOB_CHIEF_REQUISITION "Quartermaster"
#define JOB_CARGO_TECH "Cargo Technician"
#define JOB_REQUISITION_ROLES /datum/timelock/requisition
#define JOB_REQUISITION_ROLES_LIST list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH)
@@ -143,7 +146,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_WO_CHIEF_ENGINEER "Bunker Crew Master"
#define JOB_WO_ORDNANCE_TECH "Bunker Crew"
-#define JOB_WO_CHIEF_REQUISITION "Quartermaster"
+#define JOB_WO_CHIEF_REQUISITION "Bunker Quartermaster"
#define JOB_WO_REQUISITION "Bunker Crew Logistics"
#define JOB_WO_CMO "Head Surgeon"
@@ -344,11 +347,12 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_PLAYTIME_TIER_4 (175 HOURS)
#define XENO_NO_AGE -1
-#define XENO_NORMAL 0
-#define XENO_MATURE 1
-#define XENO_ELDER 2
-#define XENO_ANCIENT 3
-#define XENO_PRIME 4
+#define XENO_YOUNG 0
+#define XENO_NORMAL 1
+#define XENO_MATURE 2
+#define XENO_ELDER 3
+#define XENO_ANCIENT 4
+#define XENO_PRIME 5
/// For monthly time tracking
#define JOB_OBSERVER "Observer"
diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm
index 557f8e6a3f68..e4c4041a3dda 100644
--- a/code/__DEFINES/language.dm
+++ b/code/__DEFINES/language.dm
@@ -20,6 +20,8 @@
#define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
+#define ALL_SYNTH_LANGUAGES_UPP list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
+
//Chinese language sound bitflags
//initial flags
diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm
index 9069ed323357..c9f21484f622 100644
--- a/code/__DEFINES/minimap.dm
+++ b/code/__DEFINES/minimap.dm
@@ -4,7 +4,8 @@
#define MINIMAP_FLAG_PMC (1<<2)
#define MINIMAP_FLAG_UPP (1<<3)
#define MINIMAP_FLAG_CLF (1<<4)
-#define MINIMAP_FLAG_ALL (1<<5) - 1
+#define MINIMAP_FLAG_YAUTJA (1<<5)
+#define MINIMAP_FLAG_ALL (1<<6) - 1
///Converts the overworld x and y to minimap x and y values
#define MINIMAP_SCALE 2
@@ -59,6 +60,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
#define MINIMAP_ICON_COLOR_COMMANDER "#c6fcfc"
#define MINIMAP_ICON_COLOR_HEAD "#F0C542"
+#define MINIMAP_ICON_COLOR_SILVER "#c0c0c0"
#define MINIMAP_ICON_COLOR_BRONZE "#eb9545"
#define MINIMAP_ICON_COLOR_DOCTOR "#b83737"
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
index 2895b3211fd3..c44a8e340546 100644
--- a/code/__DEFINES/mode.dm
+++ b/code/__DEFINES/mode.dm
@@ -70,6 +70,7 @@
#define MODE_LZ_PROTECTION (1<<7) /// Prevents the LZ from being mortared
#define MODE_SHIPSIDE_SD (1<<8) /// Toggles whether Predators can big SD when not on the groundmap
#define MODE_HARDCORE_PERMA (1<<9) /// Toggles Hardcore for all marines, meaning they instantly perma upon death
+#define MODE_DISPOSABLE_MOBS (1<<10) // Toggles if mobs fit in disposals or not. Off by default.
#define ROUNDSTATUS_FOG_DOWN 1
#define ROUNDSTATUS_PODDOORS_OPEN 2
@@ -107,12 +108,12 @@
//=================================================
//Role defines, specifically lists of roles for job bans, crew manifests and the like.
-var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN)
+var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN)
//Marine roles
-#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
+#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO)
-var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT)
+var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT)
var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH)
var/global/list/ROLES_POLICE = list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH)
diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm
index e12ec1079589..4d9268220f2b 100644
--- a/code/__DEFINES/urls.dm
+++ b/code/__DEFINES/urls.dm
@@ -34,7 +34,8 @@
#define URL_WIKI_CMP_GUIDE "https://cm-ss13.com/wiki/Chief_MP" // MP Roles //
#define URL_WIKI_MW_GUIDE "https://cm-ss13.com/wiki/Warden"
#define URL_WIKI_MP_GUIDE "https://cm-ss13.com/wiki/Military_Police"
-#define URL_WIKI_PO_GUIDE "https://cm-ss13.com/wiki/Pilot_Officer" // Auxiliary Support
+#define URL_WIKI_ASO_GUIDE "https://cm-ss13.com/wiki/Auxiliary_Support_Officer" // Auxiliary Support
+#define URL_WIKI_PO_GUIDE "https://cm-ss13.com/wiki/Pilot_Officer"
#define URL_WIKI_DCC_GUIDE "https://cm-ss13.com/wiki/Dropship_Crew_Chief"
#define URL_WIKI_IO_GUIDE "https://cm-ss13.com/wiki/Intelligence_Officer"
#define URL_WIKI_SYN_GUIDE "https://cm-ss13.com/wiki/Synthetic"
diff --git a/code/__DEFINES/weapon_stats.dm b/code/__DEFINES/weapon_stats.dm
index bef8413e9615..590223426a66 100644
--- a/code/__DEFINES/weapon_stats.dm
+++ b/code/__DEFINES/weapon_stats.dm
@@ -136,19 +136,21 @@ As such, don't expect any values assigned to common firearms to even consider ho
//How many ticks you have to wait between firing. Burst delay uses the same variable!
*/
-#define FIRE_DELAY_TIER_1 10
-#define FIRE_DELAY_TIER_2 9
-#define FIRE_DELAY_TIER_3 8
-#define FIRE_DELAY_TIER_4 7
-#define FIRE_DELAY_TIER_5 6
-#define FIRE_DELAY_TIER_6 5
-#define FIRE_DELAY_TIER_7 4
-#define FIRE_DELAY_TIER_8 3
-#define FIRE_DELAY_TIER_9 2
-#define FIRE_DELAY_TIER_LMG 1.5
-#define FIRE_DELAY_TIER_SG 1.5
-#define FIRE_DELAY_TIER_SMG 1.3
-#define FIRE_DELAY_TIER_10 1
+#define FIRE_DELAY_TIER_1 12
+#define FIRE_DELAY_TIER_2 10
+#define FIRE_DELAY_TIER_3 9
+#define FIRE_DELAY_TIER_4 8
+#define FIRE_DELAY_TIER_5 7
+#define FIRE_DELAY_TIER_6 6
+#define FIRE_DELAY_TIER_7 5
+#define FIRE_DELAY_TIER_8 4
+#define FIRE_DELAY_TIER_9 3.5
+#define FIRE_DELAY_TIER_10 3
+#define FIRE_DELAY_TIER_11 2.5
+#define FIRE_DELAY_TIER_LMG 2
+#define FIRE_DELAY_TIER_SG 2
+#define FIRE_DELAY_TIER_SMG 1.5
+#define FIRE_DELAY_TIER_12 1
/*
////RANGE RELATED////
diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm
index 222222a09d54..0f822385ad13 100644
--- a/code/__DEFINES/xeno.dm
+++ b/code/__DEFINES/xeno.dm
@@ -168,6 +168,12 @@
/// The amount of time after round start before buried larva spawns are disallowed
#define XENO_BURIED_LARVA_TIME_LIMIT (30 MINUTES)
+/// The time when xenos can start taking over comm towers
+#define XENO_COMM_ACQUISITION_TIME (90 MINUTES)
+
+/// The time it takes for a pylon to give one larva while activated
+#define XENO_PYLON_ACTIVATION_COOLDOWN (5 MINUTES)
+
/// The time against away_timer when an AFK xeno larva can be replaced
#define XENO_LEAVE_TIMER_LARVA 80 //80 seconds
/// The time against away_timer when an AFK xeno (not larva) can be replaced
diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm
index 32da4c953188..5ecbff108725 100644
--- a/code/__HELPERS/logging.dm
+++ b/code/__HELPERS/logging.dm
@@ -108,8 +108,10 @@
if (CONFIG_GET(flag/log_interact))
WRITE_LOG(GLOB.world_game_log, "INTERACT: [msg]")
LOG_REDIS("interact", "\[[time]\] [msg]")
- origin.attack_log += "\[[time]\] [msg] "
- target.attack_log += "\[[time]\] [msg] "
+ if(origin)
+ origin.attack_log += "\[[time]\] [msg] "
+ if(target)
+ target.attack_log += "\[[time]\] [msg] "
GLOB.STUI.attack.Add("\[[time]]INTERACT: [msg]")
GLOB.STUI.processing |= STUI_LOG_ATTACK
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index b63f4f279664..44fb28f4706c 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -414,6 +414,7 @@ DEFINE_BITFIELD(toggleable_flags, list(
"MODE_NO_COMBAT_CAS" = MODE_NO_COMBAT_CAS,
"MODE_LZ_PROTECTION" = MODE_LZ_PROTECTION,
"MODE_SHIPSIDE_SD" = MODE_SHIPSIDE_SD,
+ "MODE_DISPOSABLE_MOBS" = MODE_DISPOSABLE_MOBS,
))
DEFINE_BITFIELD(state, list(
diff --git a/code/_globalvars/lists/mapping_globals.dm b/code/_globalvars/lists/mapping_globals.dm
index cf5b2ad435b8..47cc22dae5e1 100644
--- a/code/_globalvars/lists/mapping_globals.dm
+++ b/code/_globalvars/lists/mapping_globals.dm
@@ -27,6 +27,7 @@ GLOBAL_LIST_EMPTY(latewhiskey)
GLOBAL_LIST_EMPTY(latejoin)
GLOBAL_LIST_EMPTY(latejoin_by_squad)
+GLOBAL_LIST_EMPTY(latejoin_by_job)
GLOBAL_LIST_EMPTY(zombie_landmarks)
diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm
index eb914e198b37..fb4a0d94e177 100644
--- a/code/datums/emergency_calls/cryo_marines.dm
+++ b/code/datums/emergency_calls/cryo_marines.dm
@@ -36,30 +36,35 @@
if(leaders < cryo_squad.max_leaders && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_SQUAD_LEADER, time_required_for_job))
leader = H
leaders++
- arm_equipment(H, /datum/equipment_preset/uscm/leader/cryo, TRUE, TRUE)
+ H.client.prefs.copy_all_to(H, JOB_SQUAD_LEADER, TRUE, TRUE)
+ arm_equipment(H, /datum/equipment_preset/uscm/leader/cryo, FALSE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Squad Leader 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_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 && 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/spec/cryo, TRUE, TRUE)
+ H.client.prefs.copy_all_to(H, JOB_SQUAD_SPECIALIST, TRUE, TRUE)
+ arm_equipment(H, /datum/equipment_preset/uscm/spec/cryo, FALSE, 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]. 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."))
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/cryo, TRUE, TRUE)
+ H.client.prefs.copy_all_to(H, JOB_SQUAD_MEDIC, TRUE, TRUE)
+ arm_equipment(H, /datum/equipment_preset/uscm/medic/cryo, FALSE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Hospital Corpsman 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_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 && 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/cryo, TRUE, TRUE)
+ H.client.prefs.copy_all_to(H, JOB_SQUAD_ENGI, TRUE, TRUE)
+ arm_equipment(H, /datum/equipment_preset/uscm/engineer/cryo, FALSE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are an Engineer 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_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
else
- arm_equipment(H, /datum/equipment_preset/uscm/pfc/cryo, TRUE, TRUE)
+ H.client.prefs.copy_all_to(H, JOB_SQUAD_MARINE, TRUE, TRUE)
+ arm_equipment(H, /datum/equipment_preset/uscm/pfc/cryo, FALSE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Rifleman 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_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm
index 4d13e7d285ca..cf77142ce5d6 100644
--- a/code/datums/factions/uscm.dm
+++ b/code/datums/factions/uscm.dm
@@ -77,6 +77,9 @@
if(JOB_SO)
marine_rk = "so"
border_rk = "command"
+ if(JOB_AUXILIARY_OFFICER)
+ marine_rk = "aso"
+ border_rk = "command"
if(JOB_GENERAL, JOB_COLONEL, JOB_ACMC, JOB_CMC)
marine_rk = "general"
border_rk = "command"
diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm
index c1f67e93a53c..aa1bc9b40783 100644
--- a/code/datums/mob_hud.dm
+++ b/code/datums/mob_hud.dm
@@ -441,9 +441,9 @@ var/list/datum/mob_hud/huds = list(
holder2_set = 1
return
- holder.icon_state = "huddead"
+ holder.icon_state = HAS_TRAIT(src, TRAIT_HARDCORE) || MODE_HAS_TOGGLEABLE_FLAG(MODE_HARDCORE_PERMA) ? "hudhcdead" : "huddead"
if(!holder2_set)
- holder2.icon_state = "huddead"
+ holder2.icon_state = holder.icon_state
holder3.icon_state = "huddead"
holder2_set = 1
diff --git a/code/datums/skills.dm b/code/datums/skills.dm
index b70b2bb9b7b0..c9aa694074aa 100644
--- a/code/datums/skills.dm
+++ b/code/datums/skills.dm
@@ -597,6 +597,7 @@ COMMAND STAFF
SKILL_SURGERY = SKILL_SURGERY_NOVICE,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
+ SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_CQC = SKILL_CQC_SKILLED,
SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
@@ -616,6 +617,7 @@ COMMAND STAFF
SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
SKILL_SURGERY = SKILL_SURGERY_NOVICE,
SKILL_POLICE = SKILL_POLICE_FLASH,
+ SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_CQC = SKILL_CQC_SKILLED,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
@@ -699,6 +701,24 @@ COMMAND STAFF
SKILL_INTEL = SKILL_INTEL_TRAINED,
)
+/datum/skills/auxiliary_officer
+ name = "Auxiliary Support Officer"
+ skills = list(
+ SKILL_PILOT = SKILL_PILOT_EXPERT,
+ SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+ SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+ SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
+ SKILL_SURGERY = SKILL_SURGERY_NOVICE,
+ SKILL_JTAC = SKILL_JTAC_EXPERT,
+ SKILL_INTEL = SKILL_INTEL_EXPERT,
+ SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
+ SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+ SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+ SKILL_POLICE = SKILL_POLICE_FLASH,
+ SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED,
+ SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+ )
+
/datum/skills/CE
name = "Chief Engineer"
skills = list(
@@ -1594,6 +1614,82 @@ COLONIAL MARSHALS
SKILL_INTEL = SKILL_INTEL_EXPERT,
SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER
)
+
+/datum/skills/military/survivor/upp_private
+ name = "UPP Private"
+ skills = list(
+ SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+ SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+ SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+ SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+ SKILL_CQC = SKILL_CQC_TRAINED,
+ SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+ SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+ SKILL_JTAC = SKILL_JTAC_TRAINED,
+ )
+
+/datum/skills/military/survivor/upp_sapper
+ name = "UPP Sapper"
+ skills = list(
+ SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+ SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+ SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+ SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+ SKILL_CQC = SKILL_CQC_TRAINED,
+ SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+ SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+ SKILL_JTAC = SKILL_JTAC_TRAINED,
+ )
+
+/datum/skills/military/survivor/upp_medic
+ name = "UPP Medic"
+ skills = list(
+ SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+ SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+ SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
+ SKILL_SURGERY = SKILL_SURGERY_TRAINED,
+ SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+ SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+ SKILL_CQC = SKILL_CQC_TRAINED,
+ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+ SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+ SKILL_JTAC = SKILL_JTAC_TRAINED,
+ )
+
+/datum/skills/military/survivor/upp_spec
+ name = "UPP Specialist"
+ skills = list(
+ SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+ SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+ SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+ SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+ SKILL_CQC = SKILL_CQC_TRAINED,
+ SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+ SKILL_JTAC = SKILL_JTAC_TRAINED,
+ SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP,
+ SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+ SKILL_CQC = SKILL_CQC_TRAINED,
+ SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+ )
+
+/datum/skills/military/survivor/upp_sl
+ name = "UPP Squad Leader"
+ skills = list(
+ SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+ SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+ SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+ SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+ SKILL_CQC = SKILL_CQC_TRAINED,
+ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+ SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+ SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
+ SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+ SKILL_JTAC = SKILL_JTAC_EXPERT,
+ )
+
/*
---------------------
SPEC-OPS
diff --git a/code/datums/statistics/entities/death_stats.dm b/code/datums/statistics/entities/death_stats.dm
index 7e26e92ae135..4a01e4e9d72b 100644
--- a/code/datums/statistics/entities/death_stats.dm
+++ b/code/datums/statistics/entities/death_stats.dm
@@ -65,13 +65,25 @@
)
/mob/proc/track_mob_death(datum/cause_data/cause_data, turf/death_loc)
- if(!mind || statistic_exempt)
- return
-
if(cause_data && !istype(cause_data))
stack_trace("track_mob_death called with string cause ([cause_data]) instead of datum")
cause_data = create_cause_data(cause_data)
+ var/log_message = "\[[time_stamp()]\] [key_name(src)] died to "
+ if(cause_data)
+ log_message += "[cause_data.cause_name]"
+ else
+ log_message += "unknown causes"
+ var/mob/cause_mob = cause_data?.resolve_mob()
+ if(cause_mob)
+ log_message += " from [key_name(cause_data.resolve_mob())]"
+ cause_mob.attack_log += "\[[time_stamp()]\] [key_name(cause_mob)] killed [key_name(src)] with [cause_data.cause_name]."
+
+ attack_log += "[log_message]."
+
+ if(!mind || statistic_exempt)
+ return
+
var/datum/entity/statistic/death/new_death = DB_ENTITY(/datum/entity/statistic/death)
var/datum/entity/player/player_entity = get_player_from_key(mind.ckey)
if(player_entity)
@@ -96,7 +108,6 @@
new_death.cause_role_name = cause_data?.role
new_death.cause_faction_name = cause_data?.faction
- var/mob/cause_mob = cause_data?.resolve_mob()
if(cause_mob)
cause_mob.life_kills_total += life_value
diff --git a/code/datums/supply_packs/attachments.dm b/code/datums/supply_packs/attachments.dm
index 2a812e94cfc1..b685e5c3c37f 100644
--- a/code/datums/supply_packs/attachments.dm
+++ b/code/datums/supply_packs/attachments.dm
@@ -84,17 +84,6 @@
containername = "extended barrel attachment crate"
group = "Attachments"
-/datum/supply_packs/muzzle_heavy
- name = "barrel charger attachment crate (x2)"
- contains = list(
- /obj/item/attachable/heavy_barrel,
- /obj/item/attachable/heavy_barrel,
- )
- cost = 30
- containertype = /obj/structure/closet/crate
- containername = "heavy barrel attachment crate"
- group = "Attachments"
-
/datum/supply_packs/muzzle_compensator
name = "compensator attachment crate (x6)"
contains = list(
diff --git a/code/datums/supply_packs/clothing.dm b/code/datums/supply_packs/clothing.dm
index 0e7604ead7c7..1c7241bb253b 100644
--- a/code/datums/supply_packs/clothing.dm
+++ b/code/datums/supply_packs/clothing.dm
@@ -110,7 +110,7 @@
/datum/supply_packs/officer_outfits//lmao this shit is so hideously out of date
contains = list(
- /obj/item/clothing/under/rank/ro_suit,
+ /obj/item/clothing/under/rank/qm_suit,
/obj/item/clothing/under/marine/officer/bridge,
/obj/item/clothing/under/marine/officer/bridge,
/obj/item/clothing/under/marine/officer/exec,
diff --git a/code/game/area/Sulaco.dm b/code/game/area/Sulaco.dm
index ffc087ad9851..851025e1b63a 100644
--- a/code/game/area/Sulaco.dm
+++ b/code/game/area/Sulaco.dm
@@ -13,6 +13,7 @@
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
is_landing_zone = TRUE
+ ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop1/Enter(atom/movable/O, atom/oldloc)
if(istype(O, /obj/structure/barricade))
@@ -23,36 +24,30 @@
name = "\improper Dropship Alamo"
icon_state = "shuttlered"
base_muffle = MUFFLE_HIGH
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop1/LV624
name = "\improper Dropship Alamo"
ambience_exterior = AMBIENCE_LV624
icon_state = "shuttle"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop1/prison
name = "\improper Dropship Alamo"
ambience_exterior = AMBIENCE_PRISON
icon_state = "shuttle"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop1/BigRed
name = "\improper Dropship Alamo"
ambience_exterior = AMBIENCE_BIGRED
icon_state = "shuttle"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop1/ice_colony
name = "\improper Dropship Alamo"
icon_state = "shuttle"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop1/DesertDam
name = "\improper Dropship Alamo"
ambience_exterior = AMBIENCE_TRIJENT
icon_state = "shuttle"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop1/transit
ambience_exterior = 'sound/ambience/dropship_ambience_loop.ogg'
@@ -75,41 +70,36 @@
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
is_landing_zone = TRUE
+ ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop2/sulaco
name = "\improper Dropship Normandy"
icon_state = "shuttle"
base_muffle = MUFFLE_HIGH
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop2/LV624
name = "\improper Dropship Normandy"
ambience_exterior = AMBIENCE_LV624
icon_state = "shuttle2"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop2/prison
name = "\improper Dropship Normandy"
ambience_exterior = AMBIENCE_PRISON
icon_state = "shuttle2"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop2/BigRed
name = "\improper Dropship Normandy"
ambience_exterior = AMBIENCE_BIGRED
icon_state = "shuttle2"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop2/ice_colony
name = "\improper Dropship Normandy"
icon_state = "shuttle2"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop2/DesertDam
name = "\improper Dropship Normandy"
ambience_exterior = AMBIENCE_TRIJENT
icon_state = "shuttle2"
- ceiling = CEILING_REINFORCED_METAL
/area/shuttle/drop2/transit
ambience_exterior = 'sound/ambience/dropship_ambience_loop.ogg'
diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm
index d19cbd3a6dec..6ced81a22b15 100644
--- a/code/game/area/almayer.dm
+++ b/code/game/area/almayer.dm
@@ -317,6 +317,11 @@
icon_state = "livingspace"
fake_zlevel = 2
+/area/almayer/living/auxiliary_officer_office
+ name = "\improper Auxiliary Support Officer office"
+ icon_state = "livingspace"
+ fake_zlevel = 2
+
/area/almayer/squads/tankdeliveries
name = "\improper Vehicle ASRS"
icon_state = "req"
diff --git a/code/game/area/strata.dm b/code/game/area/strata.dm
index 91bdff277c3d..1cf0eac58d1c 100644
--- a/code/game/area/strata.dm
+++ b/code/game/area/strata.dm
@@ -50,6 +50,10 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
temperature = T20C //Nice and room temp
ceiling = CEILING_METAL
+/area/strata/ag/interior/mountain
+ name = "Outside mountain"
+ icon_state = "ag_e"
+
/area/strata/ag/interior/restricted
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm
index 067201277e38..cf2b7819a596 100644
--- a/code/game/gamemodes/colonialmarines/colonialmarines.dm
+++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm
@@ -372,11 +372,11 @@
var/headcount = count_per_faction()
var/living = headcount["total_headcount"]
if ((headcount["WY_headcount"] / living) > MAJORITY)
- musical_track = pick('sound/theme/LastManStanding_WY.ogg')
+ musical_track = pick('sound/theme/lastmanstanding_wy.ogg')
else if ((headcount["UPP_headcount"] / living) > MAJORITY)
- musical_track = pick('sound/theme/LastManStanding_UPP.ogg')
+ musical_track = pick('sound/theme/lastmanstanding_upp.ogg')
else if ((headcount["CLF_headcount"] / living) > MAJORITY)
- musical_track = pick('sound/theme/LastManStanding_CLF.ogg')
+ musical_track = pick('sound/theme/lastmanstanding_clf.ogg')
else if ((headcount["marine_headcount"] / living) > MAJORITY)
musical_track = pick('sound/theme/neutral_melancholy2.ogg') //This is the theme song for Colonial Marines the game, fitting
else
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 54f79ce32881..425a09afb591 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -156,6 +156,7 @@
ACCESS_MARINE_KITCHEN,
ACCESS_MARINE_SYNTH,
ACCESS_PRESS,
+ ACCESS_MARINE_ASO,
)
/proc/get_all_weyland_access()
diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm
index 37e0b01ad711..615df24ecb47 100644
--- a/code/game/jobs/job/civilians/other/mess_seargent.dm
+++ b/code/game/jobs/job/civilians/other/mess_seargent.dm
@@ -4,7 +4,7 @@
spawn_positions = 1
selection_class = "job_ot"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
- supervisors = "the acting commanding officer"
+ supervisors = "the auxiliary support officer"
gear_preset = /datum/equipment_preset/uscm_ship/chef
entry_message_body = "Your job is to service the marines with excellent food, drinks and entertaining the shipside crew when needed. You have a lot of freedom and it is up to you, to decide what to do with it. Good luck!"
diff --git a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm
new file mode 100644
index 000000000000..262ba271edbf
--- /dev/null
+++ b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm
@@ -0,0 +1,26 @@
+/datum/job/command/auxiliary_officer
+ title = JOB_AUXILIARY_OFFICER
+ total_positions = 1
+ spawn_positions = 1
+ allow_additional = TRUE
+ flags_startup_parameters = ROLE_ADD_TO_DEFAULT
+ gear_preset = /datum/equipment_preset/uscm_ship/auxiliary_officer
+ entry_message_body = "Your job is to oversee the hangar crew, the intel officers, the engineering department, and requisition department. You have many responsibilities and a few plates to keep spinning but your subordinates are mostly self-reliant. Assist where you can and make sure command personnel are confident the auxiliary departments are operating at peak efficiency."
+
+AddTimelock(/datum/job/command/auxiliary_officer, list(
+ JOB_SQUAD_ROLES = 5 HOURS,
+ JOB_REQUISITION_ROLES = 5 HOURS,
+ JOB_ENGINEER_ROLES = 5 HOURS,
+ JOB_AUXILIARY_ROLES = 5 HOURS,
+))
+
+/obj/effect/landmark/start/auxiliary_officer
+ name = JOB_AUXILIARY_OFFICER
+ job = /datum/job/command/auxiliary_officer
+
+/datum/timelock/auxiliary
+ name = "Auxiliary Roles"
+
+/datum/timelock/auxiliary/New(name, time_required, list/roles)
+ . = ..()
+ src.roles = JOB_AUXILIARY_ROLES_LIST
diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm
index 3bf7f0bcd33e..5f846bf6581e 100644
--- a/code/game/jobs/job/command/auxiliary/crew_chief.dm
+++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm
@@ -4,6 +4,7 @@
spawn_positions = 2
allow_additional = TRUE
scaled = TRUE
+ supervisors = "the pilot officers"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/dcc
entry_message_body = "Your job is to assist the pilot officer maintain the ship's dropship. You have authority only on the dropship, but you are expected to maintain order, as not to disrupt the pilot."
diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm
index f30bb62e8d72..10b8381c417e 100644
--- a/code/game/jobs/job/command/auxiliary/intel.dm
+++ b/code/game/jobs/job/command/auxiliary/intel.dm
@@ -5,6 +5,7 @@
spawn_positions = 3
allow_additional = 1
scaled = 1
+ supervisors = "the auxiliary support officer"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = "USCM Intelligence Officer (IO) (Cryo)"
entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources."
diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm
index b7c9d15fa366..57495fe8be28 100644
--- a/code/game/jobs/job/command/auxiliary/pilot.dm
+++ b/code/game/jobs/job/command/auxiliary/pilot.dm
@@ -4,6 +4,7 @@
spawn_positions = 2
allow_additional = TRUE
scaled = TRUE
+ supervisors = "the auxiliary support officer"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/po
entry_message_body = "Your job is to fly, protect, and maintain the ship's dropship. While you are an officer, your authority is limited to the dropship, where you have authority over the enlisted personnel. If you are not piloting, there is an autopilot fallback for command, but don't leave the dropship without reason."
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index b860667486be..234902e11d22 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -288,6 +288,8 @@
join_turf = get_turf(pick(GLOB.spawns_by_job[type]))
else if(assigned_squad && GLOB.latejoin_by_squad[assigned_squad])
join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad]))
+ else if(GLOB.latejoin_by_job[title])
+ join_turf = get_turf(pick(GLOB.latejoin_by_job[title]))
else
join_turf = get_turf(pick(GLOB.latejoin))
human.forceMove(join_turf)
diff --git a/code/game/jobs/job/logistics/cargo/chief_req.dm b/code/game/jobs/job/logistics/cargo/chief_req.dm
index ffdb04da3421..3b6fb7262a80 100644
--- a/code/game/jobs/job/logistics/cargo/chief_req.dm
+++ b/code/game/jobs/job/logistics/cargo/chief_req.dm
@@ -1,9 +1,8 @@
-//Requisitions Officer
/datum/job/logistics/requisition
title = JOB_CHIEF_REQUISITION
- selection_class = "job_ro"
+ selection_class = "job_qm"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
- gear_preset = /datum/equipment_preset/uscm_ship/ro
+ gear_preset = /datum/equipment_preset/uscm_ship/qm
entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Your cargo techs can help you out, but you have final say in your department. Make sure they're not goofing off. While you may request paperwork for supplies, do not go out of your way to screw with marines, unless you want to get deposed. A happy ship is a well-functioning ship."
AddTimelock(/datum/job/logistics/requisition, list(
diff --git a/code/game/jobs/job/logistics/logistics.dm b/code/game/jobs/job/logistics/logistics.dm
index 6c0a2d0447e1..ef4364354067 100644
--- a/code/game/jobs/job/logistics/logistics.dm
+++ b/code/game/jobs/job/logistics/logistics.dm
@@ -1,5 +1,5 @@
/datum/job/logistics
- supervisors = "the acting commanding officer"
+ supervisors = "the auxiliary support officer"
total_positions = 1
spawn_positions = 1
diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
index e7697d54f0de..d1934c597da7 100644
--- a/code/game/jobs/role_authority.dm
+++ b/code/game/jobs/role_authority.dm
@@ -553,6 +553,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
var/turf/late_join_turf
if(GLOB.latejoin_by_squad[assigned_squad])
late_join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad]))
+ else if(GLOB.latejoin_by_job[J.title])
+ late_join_turf = get_turf(pick(GLOB.latejoin_by_job[J.title]))
else
late_join_turf = get_turf(pick(GLOB.latejoin))
H.forceMove(late_join_turf)
diff --git a/code/game/machinery/computer/almayer_control.dm b/code/game/machinery/computer/almayer_control.dm
index b2a931224464..7d63a2e8c3af 100644
--- a/code/game/machinery/computer/almayer_control.dm
+++ b/code/game/machinery/computer/almayer_control.dm
@@ -1,16 +1,3 @@
-#define STATE_DEFAULT 1
-#define STATE_EVACUATION 2
-#define STATE_EVACUATION_CANCEL 3
-#define STATE_DISTRESS 4
-#define STATE_DESTROY 5
-#define STATE_DEFCONLIST 6
-
-#define STATE_MESSAGELIST 7
-#define STATE_VIEWMESSAGE 8
-#define STATE_DELMESSAGE 9
-
-
-
#define COMMAND_SHIP_ANNOUNCE "Command Ship Announcement"
/obj/structure/machinery/computer/almayer_control
@@ -21,273 +8,149 @@
unslashable = TRUE
unacidable = TRUE
- var/state = STATE_DEFAULT
-
- var/is_announcement_active = TRUE
-
- var/cooldown_request = 0
- var/cooldown_destruct = 0
- var/cooldown_central = 0
+ /// requesting a distress beacon
+ COOLDOWN_DECLARE(cooldown_request)
+ /// requesting evac
+ COOLDOWN_DECLARE(cooldown_destruct)
+ /// messaging HC (admins)
+ COOLDOWN_DECLARE(cooldown_central)
+ /// making a ship announcement
+ COOLDOWN_DECLARE(cooldown_message)
var/list/messagetitle = list()
var/list/messagetext = list()
- var/currmsg = 0
- var/aicurrmsg = 0
/obj/structure/machinery/computer/almayer_control/attack_remote(mob/user as mob)
return attack_hand(user)
/obj/structure/machinery/computer/almayer_control/attack_hand(mob/user as mob)
- if(..() || !allowed(user) || inoperable())
+ if(..() || inoperable())
return
+ if(!allowed(user))
+ to_chat(usr, SPAN_WARNING("Access denied."))
+ return FALSE
+
if(!istype(loc.loc, /area/almayer/command/cic)) //Has to be in the CIC. Can also be a generic CIC area to communicate, if wanted.
to_chat(usr, SPAN_WARNING("Unable to establish a connection."))
return FALSE
- ui_interact(user)
-
-/obj/structure/machinery/computer/almayer_control/ui_interact(mob/user as mob)
- user.set_interaction(src)
+ tgui_interact(user)
- var/dat = "Almayer Control Console"
+// tgui boilerplate \\
- if(EvacuationAuthority.evac_status == EVACUATION_STATUS_INITIATING)
- dat += "Evacuation in Progress\n \nETA: [EvacuationAuthority.get_status_panel_eta()] "
-
- switch(state)
- if(STATE_DEFAULT)
- dat += "Alert Level: [get_security_level()] "
- dat += " [is_announcement_active ? "Make a ship announcement" : "*Unavailable*"]"
- dat += GLOB.admins.len > 0 ? " Send a message to USCM" : " USCM communication offline"
- dat += " Award a medal"
- dat += " "
- dat += " "
-
-
- dat += " Message list"
- dat += " Send Distress Beacon"
- dat += " Activate Self-Destruct"
- switch(EvacuationAuthority.evac_status)
- if(EVACUATION_STATUS_STANDING_BY)
- dat += " Initiate emergency evacuation"
- if(EVACUATION_STATUS_INITIATING)
- dat += " Cancel emergency evacuation"
-
- if(STATE_EVACUATION)
- dat += "Are you sure you want to evacuate the [MAIN_SHIP_NAME]? Confirm"
-
- if(STATE_EVACUATION_CANCEL)
- dat += "Are you sure you want to cancel the evacuation of the [MAIN_SHIP_NAME]? Confirm"
-
- if(STATE_DISTRESS)
- dat += "Are you sure you want to trigger a distress signal? The signal can be picked up by anyone listening, friendly or not. Confirm"
-
- if(STATE_DESTROY)
- dat += "Are you sure you want to trigger the self-destruct? This would mean abandoning ship. Confirm"
-
- if(STATE_MESSAGELIST)
- dat += "Messages:"
- for(var/i = 1; i<=messagetitle.len; i++)
- dat += " [messagetitle[i]]"
-
- if(STATE_VIEWMESSAGE)
- if (currmsg)
- dat += "[messagetitle[currmsg]]
[messagetext[currmsg]]"
- dat += "
Delete"
- else
- state = STATE_MESSAGELIST
- attack_hand(user)
- return FALSE
+/obj/structure/machinery/computer/almayer_control/tgui_interact(mob/user, datum/tgui/ui, datum/ui_state/state)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "AlmayerControl", "[name]")
+ ui.open()
- if(STATE_DELMESSAGE)
- if (currmsg)
- dat += "Are you sure you want to delete this message? OK|Cancel"
- else
- state = STATE_MESSAGELIST
- attack_hand(user)
- return FALSE
+/obj/structure/machinery/computer/almayer_control/ui_status(mob/user, datum/ui_state/state)
+ . = ..()
+ if(!allowed(user))
+ return UI_CLOSE
+ if(!operable())
+ return UI_CLOSE
- dat += " [(state != STATE_DEFAULT) ? "Main Menu|" : ""]Close"
+/obj/structure/machinery/computer/almayer_control/ui_state(mob/user)
+ return GLOB.not_incapacitated_and_adjacent_strict_state
- show_browser(user, dat, name, "almayer_control")
- onclose(user, "almayer_control")
+// tgui data \\
-/obj/structure/machinery/computer/almayer_control/Topic(href, href_list)
- if(..())
- return FALSE
-
- usr.set_interaction(src)
- var/datum/ares_link/link = GLOB.ares_link
- switch(href_list["operation"])
- if("main")
- state = STATE_DEFAULT
-
- if("ship_announce")
- if(!is_announcement_active)
- to_chat(usr, SPAN_WARNING("Please allow at least [COOLDOWN_COMM_MESSAGE*0.1] second\s to pass between announcements."))
- return FALSE
- var/input = stripped_multiline_input(usr, "Please write a message to announce to the station crew.", "Priority Announcement", "")
- if(!input || !is_announcement_active || !(usr in view(1,src)))
- return FALSE
-
- is_announcement_active = FALSE
-
- var/signed = null
- if(ishuman(usr))
- var/mob/living/carbon/human/H = usr
- var/obj/item/card/id/id = H.wear_id
- if(istype(id))
- var/paygrade = get_paygrades(id.paygrade, FALSE, H.gender)
- signed = "[paygrade] [id.registered_name]"
+/obj/structure/machinery/computer/almayer_control/ui_static_data(mob/user)
+ var/list/data = list()
- shipwide_ai_announcement(input, COMMAND_SHIP_ANNOUNCE, signature = signed)
- addtimer(CALLBACK(src, PROC_REF(reactivate_announcement), usr), COOLDOWN_COMM_MESSAGE)
- message_admins("[key_name(usr)] has made a shipwide annoucement.")
- log_announcement("[key_name(usr)] has announced the following to the ship: [input]")
+ data["cooldown_request"] = COOLDOWN_COMM_REQUEST
+ data["cooldown_destruct"] = COOLDOWN_COMM_DESTRUCT
+ data["cooldown_central"] = COOLDOWN_COMM_CENTRAL
+ data["cooldown_message"] = COOLDOWN_COMM_MESSAGE
+ data["distresstimelock"] = DISTRESS_TIME_LOCK
+ return data
- if("evacuation_start")
- if(state == STATE_EVACUATION)
- if(security_level < SEC_LEVEL_RED)
- to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
- return FALSE
+/obj/structure/machinery/computer/almayer_control/ui_data(mob/user)
+ var/list/data = list()
+ var/list/messages = list()
- if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY)
- to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
- return FALSE
+ data["alert_level"] = security_level
- if(!EvacuationAuthority.initiate_evacuation())
- to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
- return FALSE
+ data["time_request"] = cooldown_request
+ data["time_destruct"] = cooldown_destruct
+ data["time_central"] = cooldown_central
+ data["time_message"] = cooldown_message
- log_game("[key_name(usr)] has called for an emergency evacuation.")
- message_admins("[key_name_admin(usr)] has called for an emergency evacuation.")
- link.log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.")
- return TRUE
+ data["worldtime"] = world.time
- state = STATE_EVACUATION
+ data["evac_status"] = EvacuationAuthority.evac_status
+ if(EvacuationAuthority.evac_status == EVACUATION_STATUS_INITIATING)
+ data["evac_eta"] = EvacuationAuthority.get_status_panel_eta()
- if("evacuation_cancel")
- if(state == STATE_EVACUATION_CANCEL)
- if(!EvacuationAuthority.cancel_evacuation())
- to_chat(usr, SPAN_WARNING("You are unable to cancel the evacuation right now!"))
- return FALSE
+ if(!messagetitle.len)
+ data["messages"] = null
+ else
+ for(var/i in 1 to length(messagetitle))
+ var/list/messagedata = list(list(
+ "title" = messagetitle[i],
+ "text" = messagetext[i],
+ "number" = i
+ ))
+ messages += messagedata
- spawn(35)//some time between AI announcements for evac cancel and SD cancel.
- if(EvacuationAuthority.evac_status == EVACUATION_STATUS_STANDING_BY)//nothing changed during the wait
- //if the self_destruct is active we try to cancel it (which includes lowering alert level to red)
- if(!EvacuationAuthority.cancel_self_destruct(1))
- //if SD wasn't active (likely canceled manually in the SD room), then we lower the alert level manually.
- set_security_level(SEC_LEVEL_RED, TRUE) //both SD and evac are inactive, lowering the security level.
+ data["messages"] = messages
- log_game("[key_name(usr)] has canceled the emergency evacuation.")
- message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.")
- link.log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.")
- return TRUE
+ return data
- state = STATE_EVACUATION_CANCEL
+// end tgui data \\
- if("distress")
- if(state == STATE_DISTRESS)
- if(world.time < DISTRESS_TIME_LOCK)
- to_chat(usr, SPAN_WARNING("The distress beacon cannot be launched this early in the operation. Please wait another [time_left_until(DISTRESS_TIME_LOCK, world.time, 1 MINUTES)] minutes before trying again."))
- return FALSE
+// tgui interact \\
- if(!SSticker.mode)
- return FALSE //Not a game mode?
+/obj/structure/machinery/computer/almayer_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
- if(SSticker.mode.force_end_at == 0)
- to_chat(usr, SPAN_WARNING("ARES has denied your request for operational security reasons."))
- return FALSE
+ switch(action)
+ if("award")
+ print_medal(usr, src)
+ . = TRUE
- if(world.time < cooldown_request + COOLDOWN_COMM_REQUEST)
- to_chat(usr, SPAN_WARNING("The distress beacon has recently broadcast a message. Please wait."))
- return FALSE
+ // evac stuff start \\
- if(security_level == SEC_LEVEL_DELTA)
- to_chat(usr, SPAN_WARNING("The ship is already undergoing self-destruct procedures!"))
- return FALSE
+ if("evacuation_start")
+ if(security_level < SEC_LEVEL_RED)
+ to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
+ return FALSE
- for(var/client/C in GLOB.admins)
- if((R_ADMIN|R_MOD) & C.admin_holder.rights)
- C << 'sound/effects/sos-morse-code.ogg'
- message_admins("[key_name(usr)] has requested a Distress Beacon! [CC_MARK(usr)] (SEND) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
- to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))
+ if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY)
+ to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
+ return FALSE
- cooldown_request = world.time
- return TRUE
+ if(!EvacuationAuthority.initiate_evacuation())
+ to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
+ return FALSE
- state = STATE_DISTRESS
+ log_game("[key_name(usr)] has called for an emergency evacuation.")
+ message_admins("[key_name_admin(usr)] has called for an emergency evacuation.")
+ var/datum/ares_link/link = GLOB.ares_link
+ link.log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.")
+ . = TRUE
- if("destroy")
- if(state == STATE_DESTROY)
- //Comment to test
- if(world.time < DISTRESS_TIME_LOCK)
- to_chat(usr, SPAN_WARNING("The self-destruct cannot be activated this early in the operation. Please wait another [time_left_until(DISTRESS_TIME_LOCK, world.time, 1 MINUTES)] minutes before trying again."))
- return FALSE
-
- if(!SSticker.mode)
- return FALSE //Not a game mode?
-
- if(SSticker.mode.force_end_at == 0)
- to_chat(usr, SPAN_WARNING("ARES has denied your request for operational security reasons."))
- return FALSE
-
- if(world.time < cooldown_destruct + COOLDOWN_COMM_DESTRUCT)
- to_chat(usr, SPAN_WARNING("A self-destruct request has already been sent to high command. Please wait."))
- return FALSE
-
- if(get_security_level() == "delta")
- to_chat(usr, SPAN_WARNING("The [MAIN_SHIP_NAME]'s self-destruct is already activated."))
- return FALSE
-
- for(var/client/C in GLOB.admins)
- if((R_ADMIN|R_MOD) & C.admin_holder.rights)
- C << 'sound/effects/sos-morse-code.ogg'
- message_admins("[key_name(usr)] has requested Self-Destruct! [CC_MARK(usr)] (GRANT) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
- to_chat(usr, SPAN_NOTICE("A self-destruct request has been sent to USCM Central Command."))
- cooldown_destruct = world.time
- return TRUE
-
- state = STATE_DESTROY
-
- if("messagelist")
- currmsg = 0
- state = STATE_MESSAGELIST
-
- if("viewmessage")
- state = STATE_VIEWMESSAGE
- if (!currmsg)
- if(href_list["message-num"]) currmsg = text2num(href_list["message-num"])
- else state = STATE_MESSAGELIST
+ if("evacuation_cancel")
+ if(!EvacuationAuthority.cancel_evacuation())
+ to_chat(usr, SPAN_WARNING("You are unable to cancel the evacuation right now!"))
+ return FALSE
- if("delmessage")
- state = (currmsg) ? STATE_DELMESSAGE : STATE_MESSAGELIST
-
- if("delmessage2")
- if(currmsg)
- var/title = messagetitle[currmsg]
- var/text = messagetext[currmsg]
- messagetitle.Remove(title)
- messagetext.Remove(text)
- if(currmsg == aicurrmsg) aicurrmsg = 0
- currmsg = 0
- state = STATE_MESSAGELIST
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/machinery/computer/almayer_control, cancel_evac)), 4 SECONDS)
- if("messageUSCM")
- if(world.time < cooldown_central + COOLDOWN_COMM_CENTRAL)
- to_chat(usr, SPAN_WARNING("Arrays recycling. Please stand by."))
- return FALSE
- var/input = stripped_input(usr, "Please choose a message to transmit to USCM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "")
- if(!input || !(usr in view(1,src)) || world.time < cooldown_central + COOLDOWN_COMM_CENTRAL) return FALSE
+ log_game("[key_name(usr)] has canceled the emergency evacuation.")
+ message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.")
+ var/datum/ares_link/link = GLOB.ares_link
+ link.log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.")
+ . = TRUE
- high_command_announce(input, usr)
- to_chat(usr, SPAN_NOTICE("Message transmitted."))
- log_announcement("[key_name(usr)] has made an USCM announcement: [input]")
- cooldown_central = world.time
+ // evac stuff end \\
- if("changeseclevel")
+ if("change_sec_level")
var/list/alert_list = list(num2seclevel(SEC_LEVEL_GREEN), num2seclevel(SEC_LEVEL_BLUE))
switch(security_level)
if(SEC_LEVEL_GREEN)
@@ -302,27 +165,125 @@
return
set_security_level(seclevel2num(level_selected))
-
log_game("[key_name(usr)] has changed the security level to [get_security_level()].")
message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
+ var/datum/ares_link/link = GLOB.ares_link
+ link.log_ares_security("Security Level Update", "[usr] has changed the security level to [get_security_level()].")
+ . = TRUE
- if("award")
- print_medal(usr, src)
+ if("messageUSCM")
+ if(!COOLDOWN_FINISHED(src, cooldown_central))
+ to_chat(usr, SPAN_WARNING("Arrays are re-cycling. Please stand by."))
+ return FALSE
+ var/input = stripped_input(usr, "Please choose a message to transmit to USCM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "")
+ if(!input || !(usr in view(1,src)) || !COOLDOWN_FINISHED(src, cooldown_central))
+ return FALSE
+
+ high_command_announce(input, usr)
+ to_chat(usr, SPAN_NOTICE("Message transmitted."))
+ log_announcement("[key_name(usr)] has made an USCM announcement: [input]")
+ COOLDOWN_START(src, cooldown_central, COOLDOWN_COMM_CENTRAL)
+ . = TRUE
+
+ if("ship_announce")
+ if(!COOLDOWN_FINISHED(src, cooldown_message))
+ to_chat(usr, SPAN_WARNING("Please allow at least [COOLDOWN_TIMELEFT(src, cooldown_message)/10] second\s to pass between announcements."))
+ return FALSE
+ var/input = stripped_multiline_input(usr, "Please write a message to announce to the station crew.", "Priority Announcement", "")
+ if(!input || !COOLDOWN_FINISHED(src, cooldown_message) || !(usr in view(1,src)))
+ return FALSE
+
+ var/signed = null
+ if(ishuman(usr))
+ var/mob/living/carbon/human/human_user = usr
+ var/obj/item/card/id/id = human_user.wear_id
+ if(istype(id))
+ var/paygrade = get_paygrades(id.paygrade, FALSE, human_user.gender)
+ signed = "[paygrade] [id.registered_name]"
+
+ COOLDOWN_START(src, cooldown_message, COOLDOWN_COMM_MESSAGE)
+ shipwide_ai_announcement(input, COMMAND_SHIP_ANNOUNCE, signature = signed)
+ message_admins("[key_name(usr)] has made a shipwide annoucement.")
+ log_announcement("[key_name(usr)] has announced the following to the ship: [input]")
+ . = TRUE
+
+ if("distress")
+ if(world.time < DISTRESS_TIME_LOCK)
+ to_chat(usr, SPAN_WARNING("The distress beacon cannot be launched this early in the operation. Please wait another [time_left_until(DISTRESS_TIME_LOCK, world.time, 1 MINUTES)] minutes before trying again."))
+ return FALSE
+
+ if(!SSticker.mode)
+ return FALSE //Not a game mode?
+
+ if(SSticker.mode.force_end_at == 0)
+ to_chat(usr, SPAN_WARNING("ARES has denied your request for operational security reasons."))
+ return FALSE
+
+ if(!COOLDOWN_FINISHED(src, cooldown_request))
+ to_chat(usr, SPAN_WARNING("The distress beacon has recently broadcast a message. Please wait."))
+ return FALSE
- updateUsrDialog()
+ if(security_level == SEC_LEVEL_DELTA)
+ to_chat(usr, SPAN_WARNING("The ship is already undergoing self-destruct procedures!"))
+ return FALSE
+
+ for(var/client/admin_client as anything in GLOB.admins)
+ if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights)
+ admin_client << 'sound/effects/sos-morse-code.ogg'
+ message_admins("[key_name(usr)] has requested a Distress Beacon! [CC_MARK(usr)] (SEND) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
+ to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))
+
+ COOLDOWN_START(src, cooldown_request, COOLDOWN_COMM_REQUEST)
+ . = TRUE
+
+ // sd \\
+
+ if("destroy")
+ if(world.time < DISTRESS_TIME_LOCK)
+ to_chat(usr, SPAN_WARNING("The self-destruct cannot be activated this early in the operation. Please wait another [time_left_until(DISTRESS_TIME_LOCK, world.time, 1 MINUTES)] minutes before trying again."))
+ return FALSE
+
+ if(!SSticker.mode)
+ return FALSE //Not a game mode?
+
+ if(SSticker.mode.force_end_at == 0)
+ to_chat(usr, SPAN_WARNING("ARES has denied your request for operational security reasons."))
+ return FALSE
+
+ if(!COOLDOWN_FINISHED(src, cooldown_destruct))
+ to_chat(usr, SPAN_WARNING("A self-destruct request has already been sent to high command. Please wait."))
+ return FALSE
+
+ if(get_security_level() == "delta")
+ to_chat(usr, SPAN_WARNING("The [MAIN_SHIP_NAME]'s self-destruct is already activated."))
+ return FALSE
+
+ for(var/client/admin_client as anything in GLOB.admins)
+ if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights)
+ admin_client << 'sound/effects/sos-morse-code.ogg'
+ message_admins("[key_name(usr)] has requested Self-Destruct! [CC_MARK(usr)] (GRANT) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
+ to_chat(usr, SPAN_NOTICE("A self-destruct request has been sent to USCM Central Command."))
+ COOLDOWN_START(src, cooldown_destruct, COOLDOWN_COMM_DESTRUCT)
+ . = TRUE
+
+ if("delmessage")
+ var/number_of_message = params["number"]
+ if(!number_of_message)
+ return FALSE
+ var/title = messagetitle[number_of_message]
+ var/text = messagetext[number_of_message]
+ messagetitle.Remove(title)
+ messagetext.Remove(text)
+ . = TRUE
-/obj/structure/machinery/computer/almayer_control/proc/reactivate_announcement(mob/user)
- is_announcement_active = TRUE
- updateUsrDialog()
+// end tgui interact \\
-#undef STATE_DEFAULT
-#undef STATE_EVACUATION
-#undef STATE_EVACUATION_CANCEL
-#undef STATE_DISTRESS
-#undef STATE_DESTROY
-#undef STATE_DEFCONLIST
+// end tgui \\
-#undef STATE_MESSAGELIST
-#undef STATE_VIEWMESSAGE
-#undef STATE_DELMESSAGE
+/obj/structure/machinery/computer/almayer_control/proc/cancel_evac()
+ if(EvacuationAuthority.evac_status == EVACUATION_STATUS_STANDING_BY)//nothing changed during the wait
+ //if the self_destruct is active we try to cancel it (which includes lowering alert level to red)
+ if(!EvacuationAuthority.cancel_self_destruct(1))
+ //if SD wasn't active (likely canceled manually in the SD room), then we lower the alert level manually.
+ set_security_level(SEC_LEVEL_RED, TRUE) //both SD and evac are inactive, lowering the security level.
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index b538f55292c1..ef6c74a052cd 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -11,6 +11,8 @@
var/mode = 1 // 1 is injecting, 0 is taking blood.
var/obj/item/reagent_container/beaker = null
var/datum/beam/current_beam
+ //make it so that IV doesn't require power to function.
+ use_power = USE_POWER_NONE
/obj/structure/machinery/iv_drip/update_icon()
if(attached)
@@ -39,38 +41,31 @@
overlays += filling
/obj/structure/machinery/iv_drip/proc/update_beam()
- if(current_beam)
+ if(current_beam && !attached)
QDEL_NULL(current_beam)
- else if(!QDELETED(src) && attached)
+ else if(!current_beam && attached && !QDELETED(src))
current_beam = beam(attached, "iv_tube")
-/obj/structure/machinery/iv_drip/power_change()
- . = ..()
- if(stat & NOPOWER && attached)
- visible_message("\The [src] retracts its IV tube and shuts down.")
- attached.active_transfusions -= src
- attached = null
- update_beam()
- update_icon()
-
/obj/structure/machinery/iv_drip/Destroy()
attached?.active_transfusions -= src
+ attached = null
update_beam()
. = ..()
/obj/structure/machinery/iv_drip/MouseDrop(over_object, src_location, over_location)
..()
- if(inoperable())
- visible_message("\The [src] is not powered.")
- return
if(ishuman(usr))
- var/mob/living/carbon/human/H = usr
- if(H.stat || get_dist(H, src) > 1 || H.blinded || H.lying)
+ var/mob/living/carbon/human/user = usr
+ if(user.stat || get_dist(user, src) > 1 || user.blinded || user.lying)
+ return
+
+ if(!skillcheck(user, SKILL_SURGERY, SKILL_SURGERY_NOVICE))
+ to_chat(user, SPAN_WARNING("You don't know how to [attached ? "disconnect" : "connect"] this!"))
return
if(attached)
- H.visible_message("[H] detaches \the [src] from \the [attached].", \
+ user.visible_message("[user] detaches \the [src] from \the [attached].", \
"You detach \the [src] from \the [attached].")
attached.active_transfusions -= src
attached = null
@@ -80,7 +75,7 @@
return
if(in_range(src, usr) && iscarbon(over_object) && get_dist(over_object, src) <= 1)
- H.visible_message("[H] attaches \the [src] to \the [over_object].", \
+ user.visible_message("[user] attaches \the [src] to \the [over_object].", \
"You attach \the [src] to \the [over_object].")
attached = over_object
attached.active_transfusions += src
@@ -88,27 +83,27 @@
update_icon()
start_processing()
-
-/obj/structure/machinery/iv_drip/attackby(obj/item/W, mob/living/user)
- if (istype(W, /obj/item/reagent_container))
+/obj/structure/machinery/iv_drip/attackby(obj/item/container, mob/living/user)
+ if (istype(container, /obj/item/reagent_container))
if(beaker)
to_chat(user, SPAN_WARNING("There is already a reagent container loaded!"))
return
- if((!istype(W, /obj/item/reagent_container/blood) && !istype(W, /obj/item/reagent_container/glass)) || istype(W, /obj/item/reagent_container/glass/bucket))
+ if((!istype(container, /obj/item/reagent_container/blood) && !istype(container, /obj/item/reagent_container/glass)) || istype(container, /obj/item/reagent_container/glass/bucket))
to_chat(user, SPAN_WARNING("That won't fit!"))
return
- if(user.drop_inv_item_to_loc(W, src))
- beaker = W
+ if(user.drop_inv_item_to_loc(container, src))
+ beaker = container
var/reagentnames = ""
- for(var/datum/reagent/R in beaker.reagents.reagent_list)
- reagentnames += ";[R.name]"
+
+ 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]).")
- to_chat(user, "You attach \the [W] to \the [src].")
+ to_chat(user, "You attach \the [container] to \the [src].")
update_beam()
update_icon()
return
@@ -151,20 +146,20 @@
if(prob(5)) visible_message("\The [src] pings.")
return
- var/mob/living/carbon/T = attached
+ var/mob/living/carbon/patient = attached
- if(!istype(T))
+ if(!istype(patient))
return
- if(ishuman(T))
- var/mob/living/carbon/human/H = T
- if(H.species && H.species.flags & NO_BLOOD)
+ if(ishuman(patient))
+ var/mob/living/carbon/human/human_patient = patient
+ if(human_patient.species && human_patient.species.flags & NO_BLOOD)
return
// If the human is losing too much blood, beep.
- if(T.blood_volume < BLOOD_VOLUME_SAFE) if(prob(5))
+ if(patient.blood_volume < BLOOD_VOLUME_SAFE) if(prob(5))
visible_message("\The [src] beeps loudly.")
- T.take_blood(beaker,amount)
+ patient.take_blood(beaker,amount)
update_icon()
/obj/structure/machinery/iv_drip/attack_hand(mob/user as mob)
diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm
index c56360953650..47d4bb20849b 100644
--- a/code/game/machinery/telecomms/presets.dm
+++ b/code/game/machinery/telecomms/presets.dm
@@ -212,12 +212,27 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers)
freq_listening = list(COLONY_FREQ)
var/toggle_cooldown = 0
+ /// Tower has been taken over by xenos, is not usable
+ var/corrupted = FALSE
+
+ /// Held image for the current overlay on the tower from xeno corruption
+ var/image/corruption_image
+
+/obj/structure/machinery/telecomms/relay/preset/tower/mapcomms/Initialize()
+ . = ..()
+
+ RegisterSignal(src, COMSIG_ATOM_TURF_CHANGE, PROC_REF(register_with_turf))
+ register_with_turf()
+
/obj/structure/machinery/telecomms/relay/preset/tower/mapcomms/attack_hand(mob/user)
if(user.action_busy)
return
if(toggle_cooldown > world.time) //cooldown only to prevent spam toggling
to_chat(user, SPAN_WARNING("\The [src]'s processors are still cooling! Wait before trying to flip the switch again."))
return
+ if(corrupted)
+ to_chat(user, SPAN_WARNING("[src] is entangled in resin. Impossible to interact with."))
+ return
var/current_state = on
if(!do_after(user, 20, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, src))
return
@@ -282,6 +297,84 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers)
else
update_icon()
+/// Handles xenos corrupting the tower when weeds touch the turf it is located on
+/obj/structure/machinery/telecomms/relay/preset/tower/mapcomms/proc/handle_xeno_acquisition(turf/weeded_turf)
+ SIGNAL_HANDLER
+
+ if(corrupted)
+ return
+
+ if(!weeded_turf.weeds)
+ return
+
+ if(weeded_turf.weeds.weed_strength < WEED_LEVEL_HIVE)
+ return
+
+ if(!weeded_turf.weeds.parent)
+ return
+
+ if(!istype(weeded_turf.weeds.parent, /obj/effect/alien/weeds/node/pylon/cluster))
+ return
+
+ if(SSticker.mode.is_in_endgame)
+ return
+
+ if(ROUND_TIME < XENO_COMM_ACQUISITION_TIME)
+ addtimer(CALLBACK(src, PROC_REF(handle_xeno_acquisition), weeded_turf), (XENO_COMM_ACQUISITION_TIME - ROUND_TIME))
+ return
+
+ var/obj/effect/alien/weeds/node/pylon/cluster/parent_node = weeded_turf.weeds.parent
+
+ var/obj/effect/alien/resin/special/cluster/cluster_parent = parent_node.resin_parent
+
+ var/list/held_children_weeds = parent_node.children
+ var/cluster_loc = cluster_parent.loc
+ var/linked_hive = cluster_parent.linked_hive
+
+ parent_node.children = list()
+
+ qdel(cluster_parent)
+
+ var/obj/effect/alien/resin/special/pylon/endgame/new_pylon = new(cluster_loc, linked_hive)
+ new_pylon.node.children = held_children_weeds
+
+ for(var/obj/effect/alien/weeds/weed in new_pylon.node.children)
+ weed.parent = new_pylon.node
+
+ RegisterSignal(new_pylon, COMSIG_PARENT_QDELETING, PROC_REF(uncorrupt))
+
+ corrupted = TRUE
+
+ corruption_image = image(icon, icon_state = "resin_growing")
+
+ flick_overlay(src, corruption_image, (2 SECONDS))
+ addtimer(CALLBACK(src, PROC_REF(switch_to_idle_corruption)), (2 SECONDS))
+
+ new_pylon.comms_relay_connection()
+
+/// Handles removing corruption effects from the comms relay
+/obj/structure/machinery/telecomms/relay/preset/tower/mapcomms/proc/uncorrupt(datum/deleting_datum)
+ SIGNAL_HANDLER
+
+ corrupted = FALSE
+
+ overlays -= corruption_image
+
+/// Handles moving the overlay from growing to idle
+/obj/structure/machinery/telecomms/relay/preset/tower/mapcomms/proc/switch_to_idle_corruption()
+ if(!corrupted)
+ return
+
+ corruption_image = image(icon, icon_state = "resin_idle")
+
+ overlays += corruption_image
+
+/// Handles re-registering signals on new turfs if changed
+/obj/structure/machinery/telecomms/relay/preset/tower/mapcomms/proc/register_with_turf()
+ SIGNAL_HANDLER
+
+ RegisterSignal(get_turf(src), COMSIG_WEEDNODE_GROWTH, PROC_REF(handle_xeno_acquisition))
+
/obj/structure/machinery/telecomms/relay/preset/telecomms
id = "Telecomms Relay"
autolinkers = list("relay")
diff --git a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm
index 3d6a48b45daa..fac4182ea5fe 100644
--- a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm
+++ b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm
@@ -42,7 +42,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list(
list("Underbarrel Flamethrower", 15, /obj/item/attachable/attached_gun/flamer, null, VENDOR_ITEM_REGULAR),
list("BARREL ATTACHMENTS", 0, null, null, null),
- list("Barrel Charger", 25, /obj/item/attachable/heavy_barrel, null, VENDOR_ITEM_RECOMMENDED),
list("Suppressor", 15, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR),
list("Extended Barrel", 15, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 15, /obj/item/attachable/compensator, null, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/crew/mp.dm b/code/game/machinery/vending/vendor_types/crew/mp.dm
index cdf374249211..b63a02248168 100644
--- a/code/game/machinery/vending/vendor_types/crew/mp.dm
+++ b/code/game/machinery/vending/vendor_types/crew/mp.dm
@@ -1,38 +1,50 @@
//------------ MP CLOTHING VENDOR---------------
GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list(
+ list("POLICE SET (MANDATORY)", 0, null, null, null),
+ list("Essential Police Set", 0, /obj/effect/essentials_set/police, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Uniform", 0, /obj/item/clothing/under/marine/mp, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mmpo, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
- list("Satchel", 0, /obj/item/storage/backpack/satchel/sec, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
-
- list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
- list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
- list("M4A3 Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
- list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
+ list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
list("ARMOR (TAKE ALL)", 0, null, null, null),
list("Military Police M2 Armor", 0, /obj/item/clothing/suit/storage/marine/MP, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
+ list("MP Beret", 0, /obj/item/clothing/head/beret/marine/mp, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
- list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
- list("Military Police M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
- list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
+ list("HANDGUN CASE (CHOOSE 1)", 0, null, null, null),
+ list("88 mod 4 Combat Pistol Case", 0, /obj/item/storage/box/guncase/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
+ list("M44 Combat Revolver Case", 0, /obj/item/storage/box/guncase/m44, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
+ list("M4A3 Service Pistol Case", 0, /obj/item/storage/box/guncase/m4a3, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
- list("EYEWEAR (TAKE ALL)", 0, null, null, null),
- list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+ list("BACKPACK (CHOOSE 1)", 0, null, null, null),
+ list("Military Police Satchel", 0, /obj/item/storage/backpack/satchel/sec, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
+
+ list("BELT (CHOOSE 1)", 0, null, null, null),
+ list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("POUCHES (CHOOSE 2)", 0, null, null, null),
- list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+
+ list("MASK (CHOOSE 1)", 0, null, null, null),
+ list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+ list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+ list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
+ list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
+ list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
-
- list("HAT (CHOOSE 1)", 0, null, null, null),
- list("MP Beret", 0, /obj/item/clothing/head/beret/marine/mp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
-
))
/obj/structure/machinery/cm_vending/clothing/military_police
@@ -47,38 +59,50 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list(
//------------ Warden CLOTHING VENDOR---------------
GLOBAL_LIST_INIT(cm_vending_clothing_military_police_warden, list(
+ list("POLICE SET (MANDATORY)", 0, null, null, null),
+ list("Essential Police Set", 0, /obj/effect/essentials_set/police, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Warden Uniform", 0, /obj/item/clothing/under/marine/warden, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/cmpcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
- list("Satchel", 0, /obj/item/storage/backpack/satchel/sec, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
-
- list("PERSONAL SIDEARM (Take ALL)", 0, null, null, null),
- list("M4A3 Service Pistol ", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
- list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
- list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
+ list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
list("ARMOR (TAKE ALL)", 0, null, null, null),
list("Military Warden M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/warden, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
+ list("Warden Peaked Cap", 0, /obj/item/clothing/head/beret/marine/mp/warden, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
- list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
- list("Military Police M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
- list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
+ list("HANDGUN CASE (CHOOSE 1)", 0, null, null, null),
+ list("88 mod 4 Combat Pistol Case", 0, /obj/item/storage/box/guncase/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
+ list("M44 Combat Revolver Case", 0, /obj/item/storage/box/guncase/m44, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
+ list("M4A3 Service Pistol Case", 0, /obj/item/storage/box/guncase/m4a3, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
+
+ list("BACKPACK (CHOOSE 1)", 0, null, null, null),
+ list("Military Police Satchel", 0, /obj/item/storage/backpack/satchel/sec, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
- list("EYEWEAR (TAKE ALL)", 0, null, null, null),
- list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+ list("BELT (CHOOSE 1)", 0, null, null, null),
+ list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("POUCHES (CHOOSE 2)", 0, null, null, null),
- list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+
+ list("MASK (CHOOSE 1)", 0, null, null, null),
+ list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+ list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+ list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
+ list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
+ list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
-
- list("HAT (CHOOSE 1)", 0, null, null, null),
- list("Warden Peaked Cap", 0, /obj/item/clothing/head/beret/marine/mp/warden, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
))
/obj/structure/machinery/cm_vending/clothing/military_police_warden
@@ -89,3 +113,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_warden, list(
/obj/structure/machinery/cm_vending/clothing/military_police_warden/get_listed_products(mob/user)
return GLOB.cm_vending_clothing_military_police_warden
+
+/obj/effect/essentials_set/police
+ spawned_gear_list = list(
+ /obj/item/clothing/glasses/sunglasses/sechud,
+ /obj/item/storage/belt/security/MP/full,
+ /obj/item/clothing/head/helmet/marine/MP,
+ )
diff --git a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm
index 231e02bb5118..8d86669a1f70 100644
--- a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm
+++ b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm
@@ -65,11 +65,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list(
list("M30 Tactical Helmet", 0, /obj/item/clothing/head/helmet/marine/pilot, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
-
+
list("ARMOR (CHOOSE 1)", 0, null, null, null),
list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
-
+
list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
list("88 Mod 4 Combat Pistol", 0, /obj/item/weapon/gun/pistol/mod88, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("VP78 Pistol", 0, /obj/item/weapon/gun/pistol/vp78, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
@@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list(
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
@@ -153,8 +153,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list(
list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
- list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
-
+ list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
+
list("ARMOR (CHOOSE 1)", 0, null, null, null),
list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
@@ -168,7 +168,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list(
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm
index 24b60079692b..55053bd724bd 100644
--- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm
+++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm
@@ -2,7 +2,7 @@
name = "\improper ColMarTech Senior Officer Equipment Rack"
desc = "An automated equipment vendor for Senior Officers."
req_access = list(ACCESS_MARINE_SENIOR)
- vendor_role = list(JOB_CHIEF_POLICE,JOB_CMO,JOB_XO,JOB_CHIEF_ENGINEER,JOB_CHIEF_REQUISITION)
+ vendor_role = list(JOB_CHIEF_POLICE, JOB_CMO, JOB_XO, JOB_CHIEF_ENGINEER, JOB_CHIEF_REQUISITION, JOB_AUXILIARY_OFFICER)
/obj/structure/machinery/cm_vending/clothing/senior_officer/get_listed_products(mob/user)
if(!user)
@@ -23,53 +23,62 @@
return GLOB.cm_vending_clothing_cmo
else if(user.job == JOB_CHIEF_POLICE)
return GLOB.cm_vending_clothing_military_police_chief
+ else if(user.job == JOB_AUXILIARY_OFFICER)
+ return GLOB.cm_vending_clothing_auxiliary_officer
return ..()
-
//------------ CHIEF MP ---------------
GLOBAL_LIST_INIT(cm_vending_clothing_military_police_chief, list(
+ list("POLICE SET (MANDATORY)", 0, null, null, null),
+ list("Essential Police Set", 0, /obj/effect/essentials_set/chiefmilitarypolice, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("CMP Uniform", 0, /obj/item/clothing/under/marine/officer/warrant, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/cmpcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
- list("Satchel", 0, /obj/item/storage/backpack/satchel/sec, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
- list("Gear Belt", 0, /obj/item/storage/belt/security/MP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY),
-
- list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
- list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
- list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
- list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
+ list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
list("ARMOR (TAKE ALL)", 0, null, null, null),
list("Military Police Chief M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/WO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
-
- list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Chief MP M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/WO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
- list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
+ list("CMP Beret", 0, /obj/item/clothing/head/beret/marine/mp/cmp, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
- list("EYEWEAR (TAKE ALL)", 0, null, null, null),
- list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY),
+ list("HANDGUN CASE (CHOOSE 1)", 0, null, null, null),
+ list("88 mod 4 Combat Pistol Case", 0, /obj/item/storage/box/guncase/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
+ list("M44 Combat Revolver Case", 0, /obj/item/storage/box/guncase/m44, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
+ list("M4A3 Service Pistol Case", 0, /obj/item/storage/box/guncase/m4a3, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
+
+ list("BACKPACK (CHOOSE 1)", 0, null, null, null),
+ list("Military Police Satchel", 0, /obj/item/storage/backpack/satchel/sec, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
+
+ list("BELT (CHOOSE 1)", 0, null, null, null),
+ list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("POUCHES (CHOOSE 2)", 0, null, null, null),
- list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
- list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("MASK (CHOOSE 1)", 0, null, null, null),
+ list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+ list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+ list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+
list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
- list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
- list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
-
- list("HAT (CHOOSE 1)", 0, null, null, null),
- list("CMP Beret", 0, /obj/item/clothing/head/beret/marine/mp/cmp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
))
-
//------------ CHIEF ENGINEER ---------------
GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list(
@@ -161,11 +170,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_req_officer, list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
- list("RO Uniform", 0, /obj/item/clothing/under/rank/ro_suit, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
- list("Headset", 0, /obj/item/device/radio/headset/almayer/ro, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
+ list("Quartermaster Uniform", 0, /obj/item/clothing/under/rank/qm_suit, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+ list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("Req Cap", 0, /obj/item/clothing/head/cmcap/req, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
- list("RO Jacket", 0, /obj/item/clothing/suit/storage/RO, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
+ list("Quartermaster Jacket", 0, /obj/item/clothing/suit/storage/RO, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
@@ -201,9 +210,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Gloves", 0, /obj/item/clothing/gloves/latex, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/cmo, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
- list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY),
list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
+ list("EYEWARE (CHOOSE 1)", 0, null, null, null),
+ list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY),
+ list("Reagent Scanner HUD Goggles", 0, /obj/item/clothing/glasses/science, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+
list("UNIFORM (CHOOSE 1)", 0, null, null, null),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
@@ -308,3 +320,47 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list(
list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
list("Officer Cap", 0, /obj/item/clothing/head/cmcap/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
))
+
+
+
+//------------ AUXILIARY SUPPORT OFFICER ---------------
+GLOBAL_LIST_INIT(cm_vending_clothing_auxiliary_officer, list(
+
+ list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+ list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
+ list("Officer Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+ list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
+ list("Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
+ list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
+ list("Auxiliary Support Officer Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service/aso, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
+
+ list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
+ list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
+ list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
+ list("M44 Custom Revolver", 0, /obj/item/storage/belt/gun/m44/custom, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
+
+ list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
+ list("Officer M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/SO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
+ list("Officer M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
+ list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
+
+ list("POUCHES (CHOOSE 2)", 0, null, null, null),
+ list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("Tools Pouch (Empty)", 0, /obj/item/storage/pouch/tools, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+
+ list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
+ list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
+ list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ ))
+
+/obj/effect/essentials_set/chiefmilitarypolice
+ spawned_gear_list = list(
+ /obj/item/clothing/glasses/sunglasses/sechud,
+ /obj/item/storage/belt/security/MP/full,
+ /obj/item/clothing/head/helmet/marine/MP/WO,
+ )
diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm
index 103efeedde61..3edbee6bbc47 100644
--- a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm
+++ b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm
@@ -41,7 +41,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list(
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
index 4cd6857f8dc4..0496530be861 100644
--- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm
+++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
@@ -21,6 +21,7 @@
list("Industrial Blowtorch", 2, /obj/item/tool/weldingtool/largetank, null, VENDOR_ITEM_REGULAR),
list("High-Capacity Industrial Blowtorch", 4, /obj/item/tool/weldingtool/hugetank, null, VENDOR_ITEM_REGULAR),
list("Plastic Explosive", 3, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR),
+ list("Toolkit", 1, /obj/item/storage/firstaid/toolkit/empty, null, VENDOR_ITEM_REGULAR),
list("FIRSTAID KITS", 0, null, null, null),
list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR),
@@ -251,7 +252,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("Windbreaker, Exploration", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant, null, VENDOR_ITEM_REGULAR),
list("Labcoat", 12, /obj/item/clothing/suit/storage/labcoat, null, VENDOR_ITEM_REGULAR),
list("Labcoat, Researcher", 12, /obj/item/clothing/suit/storage/labcoat/researcher, null, VENDOR_ITEM_REGULAR),
- list("RO Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR),
+ list("Quartermaster Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR),
list("USCM Poncho", 12, /obj/item/clothing/accessory/poncho, null, VENDOR_ITEM_REGULAR),
list("BACKPACK", 0, null, null, null),
diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
index 023bbe390bfc..fb9b662be1bc 100644
--- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
+++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
@@ -319,7 +319,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list(
list("M103 Vehicle-Ammo Rig", 0, /obj/item/storage/belt/tank, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/engineering.dm b/code/game/machinery/vending/vendor_types/engineering.dm
index 83f69ae09889..2fe6962e93bb 100644
--- a/code/game/machinery/vending/vendor_types/engineering.dm
+++ b/code/game/machinery/vending/vendor_types/engineering.dm
@@ -25,6 +25,7 @@
list("Utility Tool Belt", round(scale * 2), /obj/item/storage/belt/utility, VENDOR_ITEM_REGULAR),
list("Welding Goggles", round(scale * 2), /obj/item/clothing/glasses/welding, VENDOR_ITEM_REGULAR),
list("Welding Helmet", round(scale * 2), /obj/item/clothing/head/welding, VENDOR_ITEM_REGULAR),
+ list("Toolkit", round(scale * 4), /obj/item/storage/firstaid/toolkit/empty, VENDOR_ITEM_REGULAR),
list("SCANNERS", -1, null, null),
list("Atmos Scanner", round(scale * 2), /obj/item/device/analyzer, VENDOR_ITEM_REGULAR),
@@ -54,6 +55,8 @@
list("EQUIPMENT", -1, null, null),
list("Utility Tool Belt", round(scale * 4), /obj/item/storage/belt/utility, VENDOR_ITEM_REGULAR),
list("Cable Coil", round(scale * 4), /obj/item/stack/cable_coil/random, VENDOR_ITEM_REGULAR),
+ list("Welding Goggles", round(scale * 2), /obj/item/clothing/glasses/welding, VENDOR_ITEM_REGULAR),
+ list("Toolkit", round(scale * 12), /obj/item/storage/firstaid/toolkit/empty, VENDOR_ITEM_REGULAR),
list("TOOLS", -1, null, null),
list("Blowtorch", round(scale * 4), /obj/item/tool/weldingtool, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm
index 829c542f6b26..a2afe897b495 100644
--- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm
+++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm
@@ -73,7 +73,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_intelligence_officer, list(
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm
index f85657e887a8..b979fe4a03a9 100644
--- a/code/game/machinery/vending/vendor_types/requisitions.dm
+++ b/code/game/machinery/vending/vendor_types/requisitions.dm
@@ -82,7 +82,7 @@
list("M276 Ammo Load Rig", round(scale * 15), /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR),
list("M276 General Pistol Holster Rig", round(scale * 10), /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR),
list("M276 Knife Rig", round(scale * 5), /obj/item/storage/belt/knifepouch, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", round(scale * 5), /obj/item/storage/large_holster/m39, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/m39, VENDOR_ITEM_REGULAR),
list("M276 M40 Grenade Rig", round(scale * 2), /obj/item/storage/belt/grenade, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", round(scale * 2), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
@@ -342,7 +342,6 @@
/obj/structure/machinery/cm_vending/sorted/attachments/populate_product_list(scale)
listed_products = list(
list("BARREL", -1, null, null),
- list("Barrel Charger", round(scale * 2.5), /obj/item/attachable/heavy_barrel, VENDOR_ITEM_REGULAR),
list("Extended Barrel", round(scale * 6.5), /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR),
list("M5 Bayonet", round(scale * 10.5), /obj/item/attachable/bayonet, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", round(scale * 6.5), /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
index 445ae80d401c..faff01f7f299 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
@@ -116,7 +116,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list(
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm
index fdfdabd8335e..9757576e6d0b 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm
@@ -127,7 +127,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list(
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Medical Storage Rig", 0, /obj/item/storage/belt/medical, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
index 532c8e58dd02..7c9682985298 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
@@ -130,7 +130,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
index 4fcd3d25237c..d2e50aee9042 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -55,6 +55,7 @@
//------------SQUAD PREP UNIFORM VENDOR---------------
+
/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep
name = "\improper ColMarTech Surplus Uniform Vendor"
desc = "An automated supply rack hooked up to a small storage of standard marine uniforms."
@@ -68,46 +69,92 @@
/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/populate_product_list(scale)
listed_products = list(
- list("UNIFORM & STORAGE", -1, null, null),
- list("Lightweight IMP Backpack", 10, /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
- list("Marine Radio Headset", 10, /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR),
- list("Marine Combat Gloves", 10, /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
- list("Marine Black Combat Gloves", 10, /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR),
- list("Marine Combat Boots", 20, /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR),
- list("Shotgun Scabbard", 5, /obj/item/storage/large_holster/m37, VENDOR_ITEM_REGULAR),
- list("USCM Satchel", 10, /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR),
- list("USCM Technical Satchel", 10, /obj/item/storage/backpack/marine/satchel/tech, VENDOR_ITEM_REGULAR),
- list("USCM Technical Chestrig", 10, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, VENDOR_ITEM_REGULAR),
- list("USCM Uniform", 20, /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),
+ list("STANDARD EQUIPMENT", -1, null, null, null),
+ list("Marine Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR),
+ list("USCM Uniform", round(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),
+ list("Marine Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
+ list("Marine Black Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR),
+ list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR),
+ list("M10 Pattern Marine Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
- list("BELTS", -1, null, null),
- list("M276 Pattern Ammo Load Rig", 10, /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR),
- list("M276 Pattern M40 Grenade Rig", 8, /obj/item/storage/belt/grenade, VENDOR_ITEM_REGULAR),
- list("M276 Pattern Shotgun Shell Loading Rig", 10, /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR),
- list("M276 Pattern General Pistol Holster Rig", 10, /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR),
- list("M276 Pattern M39 Holster Rig", 10, /obj/item/storage/large_holster/m39, VENDOR_ITEM_REGULAR),
- list("M276 Pattern M44 Holster Rig", 10, /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
- list("M276 Pattern M82F Holster Rig", 5, /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
+ list("WEBBINGS", -1, null, null),
+ list("Brown Webbing Vest", round(scale * 1.25), /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR),
+ list("Black Webbing Vest", round(scale * 0.5), /obj/item/clothing/accessory/storage/black_vest, VENDOR_ITEM_REGULAR),
+ list("Webbing", round(scale * 2), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR),
+ list("Drop Pouch", round(scale * 0.5), /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
+ list("Shoulder Holster", round(scale * 0.5), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),
list("ARMOR", -1, null, null),
- list("M10 Pattern Marine Helmet", 20, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
- list("M3 Pattern Carrier Marine Armor", 20, /obj/item/clothing/suit/storage/marine/carrier, VENDOR_ITEM_REGULAR),
- list("M3 Pattern Padded Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padded, VENDOR_ITEM_REGULAR),
- list("M3 Pattern Padless Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padless, VENDOR_ITEM_REGULAR),
- list("M3 Pattern Ridged Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padless_lines, VENDOR_ITEM_REGULAR),
- list("M3 Pattern Skull Marine Armor", 20, /obj/item/clothing/suit/storage/marine/skull, VENDOR_ITEM_REGULAR),
- list("M3 Pattern Smooth Marine Armor", 20, /obj/item/clothing/suit/storage/marine/smooth, VENDOR_ITEM_REGULAR),
- list("M3-EOD Pattern Heavy Armor", 10, /obj/item/clothing/suit/storage/marine/heavy, VENDOR_ITEM_REGULAR),
- list("M3-L Pattern Light Armor", 10, /obj/item/clothing/suit/storage/marine/light, VENDOR_ITEM_REGULAR),
+ list("M3 Pattern Carrier Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/carrier, VENDOR_ITEM_REGULAR),
+ list("M3 Pattern Padded Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/padded, VENDOR_ITEM_REGULAR),
+ list("M3 Pattern Padless Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/padless, VENDOR_ITEM_REGULAR),
+ list("M3 Pattern Ridged Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/padless_lines, VENDOR_ITEM_REGULAR),
+ list("M3 Pattern Skull Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/skull, VENDOR_ITEM_REGULAR),
+ list("M3 Pattern Smooth Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/smooth, VENDOR_ITEM_REGULAR),
+ list("M3-EOD Pattern Heavy Armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/heavy, VENDOR_ITEM_REGULAR),
+ list("M3-L Pattern Light Armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/light, VENDOR_ITEM_REGULAR),
+
+ list("BACKPACK", -1, null, null, null),
+ list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
+ list("Technician Backpack", round(scale * 15), /obj/item/storage/backpack/marine/tech, VENDOR_ITEM_REGULAR),
+ list("Medical Backpack", round(scale * 15), /obj/item/storage/backpack/marine/medic, VENDOR_ITEM_REGULAR),
+ list("USCM Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR),
+ list("USCM Technical Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel/tech, VENDOR_ITEM_REGULAR),
+ list("USCM Technical Chestrig", round(scale * 15), /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, VENDOR_ITEM_REGULAR),
+ list("Medical Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel/medic, VENDOR_ITEM_REGULAR),
+ list("Shotgun Scabbard", round(scale * 5), /obj/item/storage/large_holster/m37, VENDOR_ITEM_REGULAR),
+
+ list("RESTRICTED BACKPACKS", -1, null, null),
+ list("USCM Technician Welderpack", round(scale * 1.25), /obj/item/storage/backpack/marine/engineerpack, VENDOR_ITEM_REGULAR),
+ list("Technician Welder-Satchel", round(scale * 2), /obj/item/storage/backpack/marine/engineerpack/satchel, VENDOR_ITEM_REGULAR),
+ list("Radio Telephone Backpack", round(scale * 0.5), /obj/item/storage/backpack/marine/satchel/rto, VENDOR_ITEM_REGULAR),
+
+ list("BELTS", -1, null, null),
+ list("M276 Pattern Ammo Load Rig", round(scale * 15), /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR),
+ list("M276 Pattern M40 Grenade Rig", round(scale * 10), /obj/item/storage/belt/grenade, VENDOR_ITEM_REGULAR),
+ list("M276 Pattern Shotgun Shell Loading Rig", round(scale * 15), /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR),
+ list("M276 Pattern General Pistol Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR),
+ list("M276 Pattern M39 Holster Rig", round(scale * 15), /obj/item/storage/large_holster/m39, VENDOR_ITEM_REGULAR),
+ list("M276 Pattern M39 Holster Rig And Pouch", round(scale * 10), /obj/item/storage/belt/gun/m39, VENDOR_ITEM_REGULAR),
+ list("M276 Pattern M44 Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
+ list("M276 Pattern M82F Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
+ list("M276 Knife Rig (Full)", round(scale * 15), /obj/item/storage/belt/knifepouch, VENDOR_ITEM_REGULAR),
+ list("M276 G8-A General Utility Pouch", round(scale * 15), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR),
+
+ list("POUCHES", -1, null, null, null),
+ list("Bayonet Sheath (Full)",round(scale * 15), /obj/item/storage/pouch/bayonet, VENDOR_ITEM_REGULAR),
+ list("First-Aid Pouch (Splints, Gauze, Ointment)", round(scale * 15), /obj/item/storage/pouch/firstaid/full/alternate, VENDOR_ITEM_REGULAR),
+ list("First-Aid Pouch (Pill Packets)", round(scale * 15), /obj/item/storage/pouch/firstaid/full/pills, VENDOR_ITEM_REGULAR),
+ list("Flare Pouch (Full)", round(scale * 15), /obj/item/storage/pouch/flare/full, VENDOR_ITEM_REGULAR),
+ list("Small Document Pouch", round(scale * 15), /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR),
+ list("Magazine Pouch", round(scale * 15), /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR),
+ list("Shotgun Shell Pouch", round(scale * 15), /obj/item/storage/pouch/shotgun, VENDOR_ITEM_REGULAR),
+ list("Medium General Pouch", round(scale * 15), /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR),
+ list("Pistol Magazine Pouch", round(scale * 15), /obj/item/storage/pouch/magazine/pistol, VENDOR_ITEM_REGULAR),
+ list("Pistol Pouch", round(scale * 15), /obj/item/storage/pouch/pistol, VENDOR_ITEM_REGULAR),
+
+ list("RESTRICTED POUCHES", -1, null, null, null),
+ list("Construction Pouch", round(scale * 1.25), /obj/item/storage/pouch/construction, VENDOR_ITEM_REGULAR),
+ list("Explosive Pouch", round(scale * 1.25), /obj/item/storage/pouch/explosive, VENDOR_ITEM_REGULAR),
+ list("First Responder Pouch (Empty)", round(scale * 2.5), /obj/item/storage/pouch/first_responder, VENDOR_ITEM_REGULAR),
+ list("Large Pistol Magazine Pouch", round(scale * 2), /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR),
+ list("Tools Pouch", round(scale * 1.25), /obj/item/storage/pouch/tools, VENDOR_ITEM_REGULAR),
+ list("Sling Pouch", round(scale * 1.25), /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR),
+
+ list("MASK", -1, null, null, null),
+ list("Gas Mask", round(scale * 15), /obj/item/clothing/mask/gas, VENDOR_ITEM_REGULAR),
+ list("Heat Absorbent Coif", round(scale * 10), /obj/item/clothing/mask/rebreather/scarf, VENDOR_ITEM_REGULAR),
+ list("Rebreather", round(scale * 10), /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
list("MISCELLANEOUS", -1, null, null, null),
- list("Gas Mask", 20, /obj/item/clothing/mask/gas, VENDOR_ITEM_REGULAR),
- list("Heat Absorbent Coif", 10, /obj/item/clothing/mask/rebreather/scarf, VENDOR_ITEM_REGULAR),
- list("M5 Integrated Gas Mask", 10, /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR),
- list("M10 Helmet Netting", 10, /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR),
- list("M10 Helmet Rain Cover", 10, /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR),
- list("Firearm Lubricant", 20, /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),
- list("USCM Flair", 20, /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR),
+ list("Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR),
+ list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
+ list("Marine RPG glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
+ list("M5 Integrated Gas Mask", round(scale * 10), /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR),
+ list("M10 Helmet Netting", round(scale * 10), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR),
+ list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR),
+ list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),
+ list("USCM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR),
)
//--------------SQUAD SPECIFIC VERSIONS--------------
@@ -172,7 +219,6 @@
/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad/populate_product_list(scale)
listed_products = list(
-
list("ARMOR-PIERCING AMMUNITION", -1, null, null),
list("M4RA AP Magazine (10x24mm)", round(scale * 3.5), /obj/item/ammo_magazine/rifle/m4ra/ap, VENDOR_ITEM_REGULAR),
list("M39 AP Magazine (10x20mm)", round(scale * 3), /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR),
@@ -194,15 +240,15 @@
list("M56D Drum Magazine", round(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR),
list("M2C Box Magazine", round(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR),
list("HIRR Baton Slugs", round(scale * 6), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR),
- list("M74 AGM-S Star Shell", round(scale * 2), /obj/item/explosive/grenade/high_explosive/airburst/starshell, VENDOR_ITEM_REGULAR),
+ list("M74 AGM-S Star Shell", round(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/starshell, VENDOR_ITEM_REGULAR),
list("M74 AGM-S Hornet Shell", round(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/hornet_shell, VENDOR_ITEM_REGULAR),
)
//--------------SQUAD ARMAMENTS VENDOR--------------
/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad
- name = "\improper ColMarTech Automated Armaments Squad Vendor"
- desc = "An automated supply rack hooked up to a small storage of various firearms and explosives. Can be accessed by any Marine Rifleman."
+ name = "\improper ColMarTech Automated Utilities Squad Vendor"
+ desc = "An automated supply rack hooked up to a small storage of various utilities and tools. Can be accessed by any Marine Rifleman."
req_access = list(ACCESS_MARINE_ALPHA)
req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_SPECPREP, ACCESS_MARINE_RO)
hackable = TRUE
@@ -216,47 +262,30 @@
/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad/populate_product_list(scale)
listed_products = list(
- list("WEBBINGS", -1, null, null),
- list("Brown Webbing Vest", round(scale * 2), /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR),
- list("Black Webbing Vest", round(scale * 1), /obj/item/clothing/accessory/storage/black_vest, VENDOR_ITEM_REGULAR),
- list("Webbing", round(scale * 3), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR),
- list("Drop Pouch", round(scale * 1), /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
- list("Shoulder Holster", round(scale * 1), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),
+ list("FOOD", -1, null, null),
+ list("MRE", round(scale * 5), /obj/item/storage/box/MRE, VENDOR_ITEM_REGULAR),
+ list("MRE Box", round(scale * 1), /obj/item/ammo_box/magazine/misc/mre, VENDOR_ITEM_REGULAR),
- list("BACKPACKS", -1, null, null),
- list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
- list("Shotgun Scabbard", round(scale * 5), /obj/item/storage/large_holster/m37, VENDOR_ITEM_REGULAR),
- list("USCM Technician Welderpack", round(scale * 2), /obj/item/storage/backpack/marine/engineerpack, VENDOR_ITEM_REGULAR),
- list("Technician Welder-Satchel", round(scale * 3), /obj/item/storage/backpack/marine/engineerpack/satchel, VENDOR_ITEM_REGULAR),
- list("Radio Telephone Backpack", round(scale * 1), /obj/item/storage/backpack/marine/satchel/rto, VENDOR_ITEM_REGULAR),
-
- list("BELTS", -1, null, null),
- list("G8-A General Utility Pouch", round(scale * 2), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR),
- list("M276 General Pistol Holster Rig", round(scale * 10), /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", round(scale * 2), /obj/item/storage/large_holster/m39, VENDOR_ITEM_REGULAR),
- list("M276 M44 Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
- list("M276 M82F Holster Rig", round(scale * 2), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
- list("M276 M40 Grenade Rig", round(scale * 3), /obj/item/storage/belt/grenade, VENDOR_ITEM_REGULAR),
-
- list("POUCHES", -1, null, null),
- list("Construction Pouch", round(scale * 2), /obj/item/storage/pouch/construction, VENDOR_ITEM_REGULAR),
- list("Document Pouch", round(scale * 2), /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR),
- list("Explosive Pouch", round(scale * 2), /obj/item/storage/pouch/explosive, VENDOR_ITEM_REGULAR),
- list("First-Aid Pouch (Full)", round(scale * 5), /obj/item/storage/pouch/firstaid/full/alternate, VENDOR_ITEM_REGULAR),
- list("First Responder Pouch (Empty)", round(scale * 4), /obj/item/storage/pouch/first_responder, VENDOR_ITEM_REGULAR),
- list("Flare Pouch", round(scale * 5), /obj/item/storage/pouch/flare/full, VENDOR_ITEM_REGULAR),
- list("Large Pistol Magazine Pouch", round(scale * 3), /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR),
- list("Magazine Pouch", round(scale * 5), /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR),
- list("Medium General Pouch", round(scale * 2), /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR),
- list("Shotgun Shell Pouch", round(scale *5), /obj/item/storage/pouch/shotgun, VENDOR_ITEM_REGULAR),
- list("Sidearm Pouch", round(scale * 15), /obj/item/storage/pouch/pistol, VENDOR_ITEM_REGULAR),
- list("Tools Pouch", round(scale * 2), /obj/item/storage/pouch/tools, VENDOR_ITEM_REGULAR),
- list("Sling Pouch", round(scale * 2), /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR),
+ list("TOOLS", -1, null, null),
+ list("Entrenching Tool (ET)", round(scale * 2), /obj/item/tool/shovel/etool/folded, VENDOR_ITEM_REGULAR),
+ list("Screwdriver", round(scale * 5), /obj/item/tool/screwdriver, VENDOR_ITEM_REGULAR),
+ list("Wirecutters", round(scale * 5), /obj/item/tool/wirecutters, VENDOR_ITEM_REGULAR),
+ list("Crowbar", round(scale * 5), /obj/item/tool/crowbar, VENDOR_ITEM_REGULAR),
+ list("Wrench", round(scale * 5), /obj/item/tool/wrench, VENDOR_ITEM_REGULAR),
+ list("ME3 hand welder", round(scale * 2), /obj/item/tool/weldingtool/simple, VENDOR_ITEM_REGULAR),
- list("MISCELLANEOUS", -1, null, null),
+ list("FLARE AND LIGHT", -1, null, null),
list("Combat Flashlight", round(scale * 5), /obj/item/device/flashlight/combat, VENDOR_ITEM_REGULAR),
- list("Entrenching Tool (ET)", round(scale * 2), /obj/item/tool/shovel/etool/folded, VENDOR_ITEM_REGULAR),
+ list("Flashlight", round(scale * 5), /obj/item/device/flashlight/combat, VENDOR_ITEM_REGULAR),
+ list("Box of Flashlight", round(scale * 1), /obj/item/ammo_box/magazine/misc/flashlight, VENDOR_ITEM_REGULAR),
+ list("Box of Flares", round(scale * 1), /obj/item/ammo_box/magazine/misc/flares, VENDOR_ITEM_REGULAR),
+ list("M94 Marking Flare Pack", round(scale * 10), /obj/item/storage/box/m94, VENDOR_ITEM_REGULAR),
list("M89-S Signal Flare Pack", round(scale * 1), /obj/item/storage/box/m94/signal, VENDOR_ITEM_REGULAR),
+
+ list("MISCELLANEOUS", -1, null, null),
+ list("Toolkit", round(scale * 1), /obj/item/storage/firstaid/toolkit/empty, VENDOR_ITEM_REGULAR),
+ list("Map", round(scale * 5), /obj/item/map/current_map, VENDOR_ITEM_REGULAR),
+ list("Extinguisher", round(scale * 5), /obj/item/tool/extinguisher, VENDOR_ITEM_REGULAR),
list("Machete Scabbard (Full)", round(scale * 5), /obj/item/storage/large_holster/machete/full, VENDOR_ITEM_REGULAR),
list("Binoculars", round(scale * 1), /obj/item/device/binoculars, VENDOR_ITEM_REGULAR),
list("MB-6 Folding Barricades (x3)", round(scale * 2), /obj/item/stack/folding_barricade/three, VENDOR_ITEM_REGULAR),
@@ -281,7 +310,6 @@
/obj/structure/machinery/cm_vending/sorted/attachments/squad/populate_product_list(scale)
listed_products = list(
list("BARREL", -1, null, null),
- list("Barrel Charger", round(scale * 0.9), /obj/item/attachable/heavy_barrel, VENDOR_ITEM_REGULAR),
list("Extended Barrel", round(scale * 2.5), /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", round(scale * 2.5), /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
list("Suppressor", round(scale * 2.5), /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm
index 543288c71706..d92eaabf52c1 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list(
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Knife Rig (Full)", 0, /obj/item/storage/belt/knifepouch, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm
index 6b763936fdc8..e0900c3fd3c8 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm
@@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list(
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm
index 4311a3982c86..ceef80ab6952 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm
@@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tl, list(
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", 0, /obj/item/storage/large_holster/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/wo_vendors.dm b/code/game/machinery/vending/vendor_types/wo_vendors.dm
index bdba638c577e..645640f9dc84 100644
--- a/code/game/machinery/vending/vendor_types/wo_vendors.dm
+++ b/code/game/machinery/vending/vendor_types/wo_vendors.dm
@@ -12,7 +12,7 @@
list("Lightweight IMP Backpack", 10, /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
list("M276 Ammo Load Rig", 10, /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR),
list("M276 General Pistol Holster Rig", 10, /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR),
- list("M276 M39 Holster Rig", 10, /obj/item/storage/large_holster/m39, VENDOR_ITEM_REGULAR),
+ list("M276 M39 Holster Rig", 10, /obj/item/storage/belt/gun/m39, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 10, /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 10, /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 10, /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR),
@@ -236,7 +236,7 @@
list("G8-A General Utility Pouch", round(scale * 3), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR),
list("M276 Pattern Ammo Load Rig", round(scale * 15), /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR),
list("M276 Pattern General Pistol Holster Rig", round(scale * 10), /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR),
- list("M276 Pattern M39 Holster Rig", round(scale * 5), /obj/item/storage/large_holster/m39, VENDOR_ITEM_REGULAR),
+ list("M276 Pattern M39 Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/m39, VENDOR_ITEM_REGULAR),
list("M276 Pattern M44 Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", round(scale * 2), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
list("M276 Pattern Shotgun Shell Loading Rig", round(scale * 10), /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR),
diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm
index 1cbe10c497f6..5f4a374ba31c 100644
--- a/code/game/objects/effects/landmarks/landmarks.dm
+++ b/code/game/objects/effects/landmarks/landmarks.dm
@@ -378,6 +378,8 @@
name = "late join"
icon_state = "x2"
var/squad
+ /// What job should latejoin on this landmark
+ var/job
/obj/effect/landmark/late_join/alpha
name = "alpha late join"
@@ -396,16 +398,24 @@
squad = SQUAD_MARINE_4
+/obj/effect/landmark/late_join/working_joe
+ name = "working joe late join"
+ job = JOB_WORKING_JOE
+
/obj/effect/landmark/late_join/Initialize(mapload, ...)
. = ..()
if(squad)
LAZYADD(GLOB.latejoin_by_squad[squad], src)
+ else if(job)
+ LAZYADD(GLOB.latejoin_by_job[job], src)
else
GLOB.latejoin += src
/obj/effect/landmark/late_join/Destroy()
if(squad)
LAZYREMOVE(GLOB.latejoin_by_squad[squad], src)
+ else if(job)
+ LAZYREMOVE(GLOB.latejoin_by_job[job], src)
else
GLOB.latejoin -= src
return ..()
diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm
index eba13a41c89d..d19bbbe49516 100644
--- a/code/game/objects/effects/landmarks/survivor_spawner.dm
+++ b/code/game/objects/effects/landmarks/survivor_spawner.dm
@@ -117,7 +117,6 @@
spawn_priority = SPAWN_PRIORITY_VERY_HIGH
-
//Military Survivors//
/obj/effect/landmark/survivor_spawner/lv522_forecon_tech
@@ -139,3 +138,29 @@
/obj/effect/landmark/survivor_spawner/lv522_forecon_squad_leader
equipment = /datum/equipment_preset/survivor/forecon/squad_leader
spawn_priority = SPAWN_PRIORITY_HIGH
+
+/obj/effect/landmark/survivor_spawner/upp/soldier
+ equipment = /datum/equipment_preset/survivor/upp/soldier
+ synth_equipment = /datum/equipment_preset/synth/survivor/upp
+ spawn_priority = SPAWN_PRIORITY_MEDIUM
+
+/obj/effect/landmark/survivor_spawner/upp_sapper
+ equipment = /datum/equipment_preset/survivor/upp/sapper
+ synth_equipment = /datum/equipment_preset/synth/survivor/upp
+ spawn_priority = SPAWN_PRIORITY_MEDIUM
+
+/obj/effect/landmark/survivor_spawner/upp_medic
+ equipment = /datum/equipment_preset/survivor/upp/medic
+ synth_equipment = /datum/equipment_preset/synth/survivor/upp
+ spawn_priority = SPAWN_PRIORITY_HIGH
+
+/obj/effect/landmark/survivor_spawner/upp_specialist
+ equipment = /datum/equipment_preset/survivor/upp/specialist
+ synth_equipment = /datum/equipment_preset/synth/survivor/upp
+ spawn_priority = SPAWN_PRIORITY_HIGH
+
+/obj/effect/landmark/survivor_spawner/squad_leader
+ equipment = /datum/equipment_preset/survivor/upp/squad_leader
+ synth_equipment = /datum/equipment_preset/synth/survivor/upp
+ spawn_priority = SPAWN_PRIORITY_VERY_HIGH
+
diff --git a/code/game/objects/effects/spawners/wo_spawners/supplies.dm b/code/game/objects/effects/spawners/wo_spawners/supplies.dm
index f2ef887d076c..28f9936b972f 100644
--- a/code/game/objects/effects/spawners/wo_spawners/supplies.dm
+++ b/code/game/objects/effects/spawners/wo_spawners/supplies.dm
@@ -175,7 +175,7 @@
/obj/effect/landmark/wo_supplies/storage/belts/m39holster
icon_state = "m39_holster"
amount = list(1,5)
- stuff = list(/obj/item/storage/large_holster/m39)
+ stuff = list(/obj/item/storage/belt/gun/m39)
diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm
index 1a4aebe813cc..b2707a20aa90 100644
--- a/code/game/objects/items/devices/cictablet.dm
+++ b/code/game/objects/items/devices/cictablet.dm
@@ -53,6 +53,7 @@
data["faction"] = announcement_faction
data["cooldown_message"] = cooldown_between_messages
+ data["distresstimelock"] = DISTRESS_TIME_LOCK
return data
@@ -63,7 +64,6 @@
data["evac_status"] = EvacuationAuthority.evac_status
data["endtime"] = announcement_cooldown
data["distresstime"] = distress_cooldown
- data["distresstimelock"] = DISTRESS_TIME_LOCK
data["worldtime"] = world.time
return data
diff --git a/code/game/objects/items/devices/defibrillator.dm b/code/game/objects/items/devices/defibrillator.dm
index 0596ae9d14b8..30d0467a9b76 100644
--- a/code/game/objects/items/devices/defibrillator.dm
+++ b/code/game/objects/items/devices/defibrillator.dm
@@ -11,7 +11,10 @@
w_class = SIZE_MEDIUM
var/blocked_by_suit = TRUE
- var/heart_damage_to_deal = 5
+ /// Min damage defib deals to victims' heart
+ var/min_heart_damage_dealt = 3
+ /// Max damage defib deals to victims' heart
+ var/max_heart_damage_dealt = 5
var/ready = 0
var/damage_heal_threshold = 12 //This is the maximum non-oxy damage the defibrillator will heal to get a patient above -100, in all categories
var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread
@@ -191,8 +194,11 @@
shock_cooldown = world.time + 10 //1 second cooldown before you can shock again
var/datum/internal_organ/heart/heart = H.internal_organs_by_name["heart"]
+ /// Has the defib already caused the chance of heart damage, to not potentially double up later
+ var/heart_already_damaged = FALSE
if(heart && prob(25))
- heart.take_damage(heart_damage_to_deal, TRUE) //Allow the defibrillator to possibly worsen heart damage. Still rare enough to just be the "clone damage" of the defib
+ heart.take_damage(rand(min_heart_damage_dealt, max_heart_damage_dealt), TRUE) // Make death and revival leave lasting consequences
+ heart_already_damaged = TRUE
if(!H.is_revivable())
playsound(get_turf(src), 'sound/items/defib_failed.ogg', 25, 0)
@@ -230,6 +236,9 @@
user.track_life_saved(user.job)
user.life_revives_total++
H.handle_revive()
+ if(heart && !heart_already_damaged)
+ heart.take_damage(rand(min_heart_damage_dealt, max_heart_damage_dealt), TRUE) // Make death and revival leave lasting consequences
+
to_chat(H, SPAN_NOTICE("You suddenly feel a spark and your consciousness returns, dragging you back to the mortal plane."))
if(H.client?.prefs.toggles_flashing & FLASH_CORPSEREVIVE)
window_flash(H.client)
@@ -239,13 +248,14 @@
/obj/item/device/defibrillator/compact_adv
name = "advanced compact defibrillator"
- desc = "An advanced compact defibrillator that trades capacity for strong immediate power. Ignores armor and heals strongly and quickly, at the cost of very low charge."
+ desc = "An advanced compact defibrillator that trades capacity for strong immediate power. Ignores armor and heals strongly and quickly, at the cost of very low charge. It does not damage the heart."
icon = 'icons/obj/items/experimental_tools.dmi'
icon_state = "compact_defib"
item_state = "defib"
w_class = SIZE_MEDIUM
blocked_by_suit = FALSE
- heart_damage_to_deal = 0
+ min_heart_damage_dealt = 0
+ max_heart_damage_dealt = 0
damage_heal_threshold = 40
charge_cost = 198
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 07b56eedb7d2..9bcda4a82bbb 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -441,7 +441,7 @@
if(mapload)
return INITIALIZE_HINT_QDEL
. = ..()
- fuel = rand(5 SECONDS, 60 SECONDS)
+ fuel = rand(30 SECONDS, 60 SECONDS)
/obj/item/device/flashlight/flare/on/illumination/chemical
name = "chemical light"
diff --git a/code/game/objects/items/devices/motion_detector.dm b/code/game/objects/items/devices/motion_detector.dm
index ade74531bc91..dd0c5d45eda4 100644
--- a/code/game/objects/items/devices/motion_detector.dm
+++ b/code/game/objects/items/devices/motion_detector.dm
@@ -229,11 +229,14 @@
if(human_user)
show_blip(human_user, M)
- for(var/mob/hologram/queen/Q in GLOB.hologram_list)
- if(Q.z != cur_turf.z || !(range_bounds.contains_atom(Q))) continue
+ for(var/mob/hologram/holo as anything in GLOB.hologram_list)
+ if(!holo.motion_sensed)
+ continue
+ if(holo.z != cur_turf.z || !(range_bounds.contains_atom(holo)))
+ continue
ping_count++
if(human_user)
- show_blip(human_user, Q, "queen_eye")
+ show_blip(human_user, holo, "queen_eye")
if(ping_count > 0)
playsound(loc, pick('sound/items/detector_ping_1.ogg', 'sound/items/detector_ping_2.ogg', 'sound/items/detector_ping_3.ogg', 'sound/items/detector_ping_4.ogg'), 60, 0, 7, 2)
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 9fa85f03b9b1..d724e1cec10f 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -68,6 +68,9 @@
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)
+/obj/item/device/encryptionkey/mcom/alt
+ channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)
+
// MARINE ENGINEERING
/obj/item/device/encryptionkey/ce
@@ -85,7 +88,7 @@
/obj/item/device/encryptionkey/cmo
name = "Chief Medical Officer's Encryption Key"
icon_state = "cmo_key"
- channels = list(RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_COMMAND = TRUE)
+ channels = list(RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_INTEL = TRUE)
/obj/item/device/encryptionkey/med
name = "Medical Radio Encryption Key"
@@ -116,7 +119,7 @@
// MARINE REQUISTIONS
-/obj/item/device/encryptionkey/ro
+/obj/item/device/encryptionkey/qm
name = "Requisition Officer's Encryption Key"
icon_state = "ce_key"
channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = FALSE, RADIO_CHANNEL_MEDSCI = FALSE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE)
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 0bd0fae364e5..7e6b0db056d0 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -451,11 +451,11 @@
icon_state = "req_headset"
initial_keys = list(/obj/item/device/encryptionkey/req/ct)
-/obj/item/device/radio/headset/almayer/ro
- desc = "A headset used by the RO for controlling their slave(s). Channels are as follows: :u - requisitions, :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad."
+/obj/item/device/radio/headset/almayer/qm
+ desc = "A headset used by the quartermaster for controlling their slave(s). Channels are as follows: :u - requisitions, :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad."
name = "requisition officer radio headset"
icon_state = "ro_headset"
- initial_keys = list(/obj/item/device/encryptionkey/ro)
+ initial_keys = list(/obj/item/device/encryptionkey/qm)
volume = RADIO_VOLUME_CRITICAL
multibroadcast_cooldown = LOW_MULTIBROADCAST_COOLDOWN
@@ -494,6 +494,9 @@
volume = RADIO_VOLUME_CRITICAL
multibroadcast_cooldown = LOW_MULTIBROADCAST_COOLDOWN
+/obj/item/device/radio/headset/almayer/mcom/alt
+ initial_keys = list(/obj/item/device/encryptionkey/mcom/alt)
+
/obj/item/device/radio/headset/almayer/marine/mp_honor/com
name = "marine honor guard command radio headset"
desc = "Given to highly trusted marine honor guard only. It features a non-standard brace. Channels are as follows: :v - marine command, :p - military police, :n - engineering, :m - medbay, :u - requisitions, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad."
diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm
index 1892c7543414..a8e0e1803a33 100644
--- a/code/game/objects/items/explosives/grenades/marines.dm
+++ b/code/game/objects/items/explosives/grenades/marines.dm
@@ -547,31 +547,32 @@
ram_distance -- //for max pinballing.
icon_state = inactive_icon
-/obj/item/explosive/grenade/slug/proc/impact_mob(mob/living/M)
- var/direction = Get_Angle(src,M)
- var/target_turf = get_angle_target_turf(src,direction,throw_max)
- var/fling = rand(throw_min,throw_max) //WEEEEEEEEEEEEEEEEEEEE What is going to be put into throw_atom
+/obj/item/explosive/grenade/slug/proc/impact_mob(mob/living/smacked)
+ var/direction = Get_Angle(src, smacked)
+ var/target_turf = get_angle_target_turf(src,direction, throw_max)
+ var/fling = rand(throw_min, throw_max) //WEEEEEEEEEEEEEEEEEEEE What is going to be put into throw_atom
var/random_tile = 0 //random tile for bounce
- playsound(M.loc, impact_sound, 75, 1)
- M.apply_damage(impact_damage, BRUTE)
+ playsound(smacked.loc, impact_sound, 75, 1)
+ smacked.apply_damage(impact_damage, BRUTE)
+ smacked.attack_log += "\[[time_stamp()]\] [src], fired by [fingerprintslast], struck [key_name(smacked)]."
random_tile = get_random_turf_in_range(src,ram_distance,ram_distance) //getting random tile for bounce
src.throw_atom(random_tile,ram_distance,SPEED_FAST,src,TRUE,NORMAL_LAUNCH,NO_FLAGS) //time for a little trolling
- if(isyautja(M)|| issynth(M))
- M.apply_effect(slowdown_time * 0.5, SLOW)
- M.apply_effect(dazed_time * 0.5, DAZE)
+ if(isyautja(smacked)|| issynth(smacked))
+ smacked.apply_effect(slowdown_time * 0.5, SLOW)
+ smacked.apply_effect(dazed_time * 0.5, DAZE)
- if(M.mob_size >= MOB_SIZE_BIG)//big xenos not KO'ed
- M.apply_effect(slowdown_time * 1.2, SLOW)//They are slowed more :trol:
- M.apply_effect(dazed_time * 1.2, DAZE)
+ if(smacked.mob_size >= MOB_SIZE_BIG)//big xenos not KO'ed
+ smacked.apply_effect(slowdown_time * 1.2, SLOW)//They are slowed more :trol:
+ smacked.apply_effect(dazed_time * 1.2, DAZE)
return
- M.apply_effect(knockout_time, WEAKEN)//but little xenos and humans are
- M.throw_atom(target_turf,fling,SPEED_AVERAGE,M,TRUE)
- M.apply_effect(slowdown_time, SLOW)
- M.apply_effect(dazed_time, DAZE)
+ smacked.apply_effect(knockout_time, WEAKEN)//but little xenos and humans are
+ smacked.throw_atom(target_turf, fling, SPEED_AVERAGE, smacked, TRUE)
+ smacked.apply_effect(slowdown_time, SLOW)
+ smacked.apply_effect(dazed_time, DAZE)
return
/obj/item/explosive/grenade/slug/baton
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 34719747bd02..98a7ab036f06 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -144,6 +144,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
/*
new/datum/stack_recipe("table parts", /obj/item/frame/table/wood, 2), \
*/
+ new/datum/stack_recipe("campfire", /obj/structure/prop/brazier/frame/full/campfire, 5, time = 15, one_per_turf = ONE_TYPE_PER_TURF, on_floor = TRUE), \
new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood/normal, 1, time = 10, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \
new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 20, one_per_turf = ONE_TYPE_PER_BORDER, on_floor = 1), \
new/datum/stack_recipe("wooden crate", /obj/structure/closet/coffin/woodencrate, 5, time = 15, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 40bd143fd074..3bf3656f4bd2 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -437,6 +437,10 @@
xeno_icon_state = "medicpack"
xeno_types = list(/mob/living/carbon/xenomorph/runner, /mob/living/carbon/xenomorph/praetorian, /mob/living/carbon/xenomorph/drone, /mob/living/carbon/xenomorph/warrior, /mob/living/carbon/xenomorph/defender, /mob/living/carbon/xenomorph/sentinel, /mob/living/carbon/xenomorph/spitter)
+/obj/item/storage/backpack/marine/medic/upp
+ name = "\improper UPP corpsman backpack"
+ desc = "Uncommon issue backpack worn by UPP medics from isolated sectors. You can swear you can see a faded USCM symbol."
+
/obj/item/storage/backpack/marine/tech
name = "\improper USCM technician backpack"
desc = "A standard-issue backpack worn by USCM technicians."
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 290460da758f..66efb08bedec 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -283,6 +283,19 @@
new /obj/item/storage/pill_bottle/tramadol(src)
new /obj/item/storage/pill_bottle/peridaxon(src)
+/obj/item/storage/belt/medical/lifesaver/upp/partial/fill_preset_inventory()
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src)
+ new /obj/item/storage/pill_bottle/bicaridine(src)
+ new /obj/item/storage/pill_bottle/kelotane(src)
+ new /obj/item/storage/pill_bottle/inaprovaline(src)
+ new /obj/item/storage/pill_bottle/tramadol(src)
+
/obj/item/storage/belt/security
name = "\improper M276 pattern security rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This configuration is commonly seen among USCM Military Police and peacekeepers, though it can hold some light munitions."
@@ -1133,6 +1146,22 @@
for(var/i = 1 to storage_slots - 1)
new /obj/item/ammo_magazine/pistol/highpower/black(src)
+/obj/item/storage/belt/gun/m39
+ name = "\improper M276 pattern M39 holster rig"
+ desc = "Special issue variant of the M276 designed to holster a M39 submachine gun and two spare magazines. Uncommonly issued to USCM support and specialist personnel."
+ icon_state = "m39_armor"
+ item_state = "s_marinebelt"
+ storage_slots = 3
+ max_w_class = 5
+ can_hold = list(
+ /obj/item/weapon/gun/smg/m39,
+ /obj/item/ammo_magazine/smg,
+ )
+ holster_slots = list(
+ "1" = list(
+ "icon_x" = -11,
+ "icon_y" = -5))
+
/obj/item/storage/belt/gun/m44
name = "\improper M276 pattern M44 holster rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the M44 magnum revolver, along with six small pouches for speedloaders. It smells faintly of hay."
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 2717b7c98501..0d976b4cdf57 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -212,6 +212,22 @@
/obj/item/storage/firstaid/surgical/empty/fill_preset_inventory()
return
+//---------TOOLKIT---------
+
+/obj/item/storage/firstaid/toolkit
+ name = "toolkit"
+ desc = "An combat engineering toolkit intended to carry electrical and mechanical supplies into combat."
+ icon_state = "toolkit"
+ item_state = "fulton"
+
+/obj/item/storage/firstaid/toolkit/update_icon()
+ if(content_watchers || !length(contents))
+ icon_state = "toolkit_empty"
+ else
+ icon_state = icon_full
+
+/obj/item/storage/firstaid/toolkit/empty/fill_preset_inventory()
+ return
//---------SYRINGE CASE---------
@@ -265,7 +281,14 @@
/obj/item/storage/surgical_case
name = "surgical case"
- desc = "It's a medical case for storing basic surgical tools."
+ desc = "It's a medical case for storing basic surgical tools. It comes with a brief description for treating common internal bleeds.\
+ \nBefore surgery: Verify correct location and patient is adequately numb to pain.\
+ \nStep one: Open an incision at the site with the scalpel.\
+ \nStep two: Clamp bleeders with the hemostat.\
+ \nStep three: Draw back the skin with the retracter.\
+ \nStep four: Patch the damaged vein with a surgical line.\
+ \nStep five: Close the incision with a surgical line."
+
icon_state = "surgical_case"
throw_speed = SPEED_FAST
throw_range = 8
@@ -448,6 +471,22 @@
..()
update_icon()
+/obj/item/storage/pill_bottle/attack_hand(mob/user, mods)
+ if(loc != user)
+ return ..()
+
+ if(!mods || !mods["alt"])
+ return ..()
+
+ if(!ishuman(user))
+ return ..()
+
+ if(skilllock && !skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC))
+ error_idlock(user)
+ return FALSE
+
+ return ..()
+
/obj/item/storage/pill_bottle/proc/error_idlock(mob/user)
to_chat(user, SPAN_WARNING("It must have some kind of ID lock..."))
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
index dc3ee0ba1506..6397c33b76c1 100644
--- a/code/game/objects/items/storage/pouch.dm
+++ b/code/game/objects/items/storage/pouch.dm
@@ -1211,6 +1211,12 @@
new /obj/item/explosive/plastic(src)
new /obj/item/explosive/plastic(src)
+/obj/item/storage/pouch/tools/uppsynth/fill_preset_inventory()
+ new /obj/item/tool/crowbar(src)
+ new /obj/item/tool/wirecutters(src)
+ new /obj/item/tool/weldingtool(src)
+ new /obj/item/tool/wrench(src)
+
/obj/item/storage/pouch/sling
name = "sling strap"
desc = "Keeps a single item attached to a strap."
diff --git a/code/game/objects/items/tools/shovel_tools.dm b/code/game/objects/items/tools/shovel_tools.dm
index 29bc19f65bbf..008b37705fe3 100644
--- a/code/game/objects/items/tools/shovel_tools.dm
+++ b/code/game/objects/items/tools/shovel_tools.dm
@@ -233,7 +233,7 @@
/obj/item/tool/shovel/etool/attack_self(mob/user as mob)
folded = !folded
if(folded)
- w_class = SIZE_MEDIUM
+ w_class = SIZE_SMALL
force = 2
else
w_class = SIZE_LARGE
@@ -242,7 +242,7 @@
/obj/item/tool/shovel/etool/folded
folded = TRUE
- w_class = SIZE_MEDIUM
+ w_class = SIZE_SMALL
force = 2
icon_state = "etool_c"
item_state = "etool_c"
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index c9bfb9b9f757..be7571fa84a1 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -323,13 +323,25 @@
item_state = "syn_breacher"
force_wielded = MELEE_FORCE_VERY_STRONG
really_heavy = TRUE
+ var/move_delay_addition = 1.5
/obj/item/weapon/twohanded/breacher/synth/pickup(mob/user)
if(!(HAS_TRAIT(user, TRAIT_SUPER_STRONG)))
- to_chat(user, SPAN_WARNING("You barely manage to lift \the [src] above your knees. This thing will probably be useless to you."))
+ to_chat(user, SPAN_HIGHDANGER("You barely manage to lift [src] above your knees. This thing will probably be useless to you."))
+ user.apply_effect(3, EYE_BLUR)
+ RegisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY, PROC_REF(handle_movedelay))
+
return
..()
+/obj/item/weapon/twohanded/breacher/synth/proc/handle_movedelay(mob/living/M, list/movedata)
+ SIGNAL_HANDLER
+ movedata["move_delay"] += move_delay_addition
+
+/obj/item/weapon/twohanded/breacher/synth/dropped(mob/user, silent)
+ . = ..()
+ UnregisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY)
+
/obj/item/weapon/twohanded/breacher/synth/attack(target as mob, mob/living/user as mob)
if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG))
to_chat(user, SPAN_WARNING("\The [src] is too heavy for you to use as a weapon!"))
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
index 4d275ee7b9d8..5772db33198d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
@@ -134,7 +134,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
new /obj/item/clothing/under/marine/officer/pilot(src)
new /obj/item/clothing/shoes/marine(src)
new /obj/item/clothing/suit/armor/vest/pilot(src)
- new /obj/item/storage/large_holster/m39(src)
+ new /obj/item/storage/belt/gun/m39(src)
new /obj/item/storage/backpack/marine/satchel(src)
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/glasses/sunglasses(src)
@@ -306,8 +306,8 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
/obj/structure/closet/secure_closet/req_officer/Initialize()
. = ..()
- new /obj/item/device/radio/headset/almayer/ro(src)
- new /obj/item/clothing/under/rank/ro_suit(src)
+ new /obj/item/device/radio/headset/almayer/qm(src)
+ new /obj/item/clothing/under/rank/qm_suit(src)
new /obj/item/clothing/shoes/marine(src)
new /obj/item/storage/belt/marine(src)
new /obj/item/clothing/head/cmcap/req(src)
diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm
index 8c7813b47a72..ea3a2af391bc 100644
--- a/code/game/objects/structures/props.dm
+++ b/code/game/objects/structures/props.dm
@@ -639,6 +639,10 @@
icon_state = ""
icon = 'icons/turf/lifeboat.dmi'
+#define STATE_COMPLETE 0
+#define STATE_FUEL 1
+#define STATE_IGNITE 2
+
/obj/structure/prop/brazier
name = "brazier"
desc = "The fire inside the brazier emits a relatively dim glow to flashlights and flares, but nothing can replace the feeling of sitting next to a fireplace with your friends."
@@ -647,6 +651,40 @@
density = TRUE
health = 150
luminosity = 6
+ /// What obj this becomes when it gets to its next stage of construction / ignition
+ var/frame_type
+ /// What is used to progress to the next stage
+ var/state = STATE_COMPLETE
+
+/obj/structure/prop/brazier/get_examine_text(mob/user)
+ . = ..()
+ switch(state)
+ if(STATE_FUEL)
+ . += "[src] requires wood to be fueled."
+ if(STATE_IGNITE)
+ . += "[src] needs to be lit."
+
+/obj/structure/prop/brazier/attackby(obj/item/hit_item, mob/user)
+ switch(state)
+ if(STATE_COMPLETE)
+ return ..()
+ if(STATE_FUEL)
+ if(!istype(hit_item, /obj/item/stack/sheet/wood))
+ return ..()
+ var/obj/item/stack/sheet/wood/wooden_boards = hit_item
+ if(!wooden_boards.use(5))
+ to_chat(user, SPAN_WARNING("Not enough wood!"))
+ return
+ user.visible_message(SPAN_NOTICE("[user] fills [src] with [hit_item]."))
+ if(STATE_IGNITE)
+ if(!hit_item.heat_source)
+ return ..()
+ if(!do_after(user, 3 SECONDS, INTERRUPT_MOVED, BUSY_ICON_BUILD))
+ return
+ user.visible_message(SPAN_NOTICE("[user] ignites [src] with [hit_item]."))
+
+ new frame_type(loc)
+ qdel(src)
/obj/structure/prop/brazier/Destroy()
SetLuminosity(0)
@@ -662,31 +700,15 @@
desc = "An empty brazier."
icon_state = "brazier_frame"
luminosity = 0
+ frame_type = /obj/structure/prop/brazier/frame/full
+ state = STATE_FUEL
-/obj/structure/prop/brazier/frame/attackby(obj/item/hit_item, mob/user)
- if(!istype(hit_item, /obj/item/stack/sheet/wood))
- return ..()
- var/obj/item/stack/wooden_boards = hit_item
- if(wooden_boards.amount < 5)
- to_chat(user, SPAN_WARNING("Not enough wood!"))
- return
- wooden_boards.use(5)
- user.visible_message(SPAN_NOTICE("[user] fills the brazier with wood."))
- new /obj/structure/prop/brazier/frame_woodened(loc)
- qdel(src)
-
-/obj/structure/prop/brazier/frame_woodened
+/obj/structure/prop/brazier/frame/full
name = "empty full brazier"
desc = "An empty brazier. Yet it's also full. What??? Use something hot to ignite it, like a welding tool."
icon_state = "brazier_frame_filled"
- luminosity = 0
-
-/obj/structure/prop/brazier/frame_woodened/attackby(obj/item/hit_item, mob/user)
- if(!hit_item.heat_source)
- return ..()
- user.visible_message(SPAN_NOTICE("[user] ignites the brazier with [hit_item]."))
- new /obj/structure/prop/brazier(loc)
- qdel(src)
+ frame_type = /obj/structure/prop/brazier
+ state = STATE_IGNITE
/obj/structure/prop/brazier/torch
name = "torch"
@@ -695,25 +717,136 @@
density = FALSE
luminosity = 5
-/obj/structure/prop/brazier/torch/frame
+/obj/structure/prop/brazier/frame/full/torch
name = "unlit torch"
desc = "It's a torch, but it's not lit. Use something hot to ignite it, like a welding tool."
icon_state = "torch_frame"
- luminosity = 0
-
-/obj/structure/prop/brazier/torch/frame/attackby(obj/item/hit_item, mob/user)
- if(!hit_item.heat_source)
- return ..()
- user.visible_message(SPAN_NOTICE("[user] ignites the torch with [hit_item]."))
- new /obj/structure/prop/brazier/torch(loc)
- qdel(src)
+ frame_type = /obj/structure/prop/brazier/torch
/obj/item/prop/torch_frame
name = "unlit torch"
icon = 'icons/obj/structures/structures.dmi'
desc = "It's a torch, but it's not lit or placed down. Click on a wall to place it."
icon_state = "torch_frame"
- luminosity = 0
+
+/obj/structure/prop/brazier/frame/full/campfire
+ name = "unlit campfire"
+ desc = "A circle of stones surrounding a pile of wood. If only you were to light it."
+ icon_state = "campfire"
+ frame_type = /obj/structure/prop/brazier/campfire
+ density = FALSE
+
+/obj/structure/prop/brazier/frame/full/campfire/smolder
+ name = "smoldering campfire"
+ desc = "A campfire that used to be lit, but was extinguished. You can still see the embers, and smoke rises from it."
+ state = STATE_FUEL
+ frame_type = /obj/structure/prop/brazier/frame/full/campfire
+
+/obj/structure/prop/brazier/campfire
+ name = "campfire"
+ desc = "A circle of stones surrounding a burning pile of wood. The fire is roaring and you can hear its crackle. You could probably stomp the fire out."
+ icon = 'icons/obj/structures/structures.dmi'
+ icon_state = "campfire_on"
+ density = FALSE
+ ///How many tiles the heating and sound goes
+ var/heating_range = 2
+ /// time between sounds
+ var/time_to_sound = 20
+ /// Time for it to burn through fuel
+ var/fuel_stage_time = 1 MINUTES
+ /// How much fuel it has
+ var/remaining_fuel = 5 //Maxes at 5, but burns one when made
+ /// If the fire can be manually put out
+ var/extinguishable = TRUE
+ /// Make no noise
+ var/quiet = FALSE
+
+/obj/structure/prop/brazier/campfire/Initialize()
+ . = ..()
+ START_PROCESSING(SSobj, src)
+ fuel_drain(TRUE)
+
+/obj/structure/prop/brazier/campfire/get_examine_text(mob/user)
+ . = ..()
+ switch(remaining_fuel)
+ if(4 to INFINITY)
+ . += "The fire is roaring."
+ if(2 to 3)
+ . += "The fire is burning warm."
+ if(-INFINITY to 1)
+ . += "The embers of the fire barely burns."
+
+/obj/structure/prop/brazier/campfire/process(delta_time)
+ if(!isturf(loc))
+ return
+
+ for(var/mob/living/carbon/human/mob in range(heating_range, src))
+ if(mob.bodytemperature < T20C)
+ mob.bodytemperature += min(round(T20C - mob.bodytemperature)*0.7, 25)
+ mob.recalculate_move_delay = TRUE
+
+ if(quiet)
+ return
+ time_to_sound -= delta_time
+ if(time_to_sound <= 0)
+ playsound(loc, 'sound/machines/firepit_ambience.ogg', 15, FALSE, heating_range)
+ time_to_sound = initial(time_to_sound)
+
+/obj/structure/prop/brazier/campfire/attack_hand(mob/user)
+ . = ..()
+ if(!extinguishable)
+ to_chat(user, SPAN_WARNING("You cannot extinguish [src]."))
+ return
+ to_chat(user, SPAN_NOTICE("You begin to extinguish [src]."))
+ while(remaining_fuel)
+ if(user.action_busy || !do_after(user, 3 SECONDS, INTERRUPT_MOVED, BUSY_ICON_BUILD))
+ return
+ fuel_drain()
+ to_chat(user, SPAN_NOTICE("You continue to extinguish [src]."))
+ visible_message(SPAN_NOTICE("[user] extinguishes [src]."))
+
+/obj/structure/prop/brazier/campfire/attackby(obj/item/attacking_item, mob/user)
+ if(!istype(attacking_item, /obj/item/stack/sheet/wood))
+ to_chat(SPAN_NOTICE("You cannot fuel [src] with [attacking_item]."))
+ return
+ var/obj/item/stack/sheet/wood/fuel = attacking_item
+ if(remaining_fuel >= initial(remaining_fuel))
+ to_chat(user, SPAN_NOTICE("You cannot fuel [src] further."))
+ if(!fuel.use(1))
+ to_chat(SPAN_NOTICE("You do not have enough [attacking_item] to fuel [src]."))
+ visible_message(SPAN_NOTICE("[user] fuels [src] with [fuel]."))
+ remaining_fuel++
+
+/obj/structure/prop/brazier/campfire/attack_alien(mob/living/carbon/xenomorph/xeno)
+ if(!extinguishable)
+ to_chat(xeno, SPAN_WARNING("You cannot extinguish [src]."))
+ return
+ to_chat(xeno, SPAN_NOTICE("You begin to extinguish [src]."))
+ while(remaining_fuel)
+ if(xeno.action_busy || !do_after(xeno, 1 SECONDS, INTERRUPT_MOVED, BUSY_ICON_HOSTILE))
+ return
+ fuel_drain()
+ to_chat(xeno, SPAN_NOTICE("You continue to extinguish [src]."))
+ visible_message(SPAN_WARNING("[xeno] extinguishes [src]!"))
+
+/obj/structure/prop/brazier/campfire/proc/fuel_drain(looping)
+ remaining_fuel--
+ if(!remaining_fuel)
+ new /obj/structure/prop/brazier/frame/full/campfire/smolder(loc)
+ qdel(src)
+ return
+ if(!looping || !fuel_stage_time)
+ return
+ addtimer(CALLBACK(src, PROC_REF(fuel_drain), TRUE), fuel_stage_time)
+
+/obj/structure/prop/brazier/campfire/Destroy()
+ SetLuminosity(0)
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+#undef STATE_COMPLETE
+#undef STATE_FUEL
+#undef STATE_IGNITE
//ICE COLONY PROPS
//Thematically look to Blackmesa's Xen levels. Generic science-y props n' stuff.
@@ -1153,8 +1286,90 @@
icon_state = "rope"
density = FALSE
+/obj/structure/prop/pred_flight
+ name = "hunter flight console"
+ desc = "A console designed by the Hunters to assist in flight pathing and navigation."
+ icon = 'icons/obj/structures/machinery/computer.dmi'
+ icon_state = "overwatch"
+ density = TRUE
+
/obj/structure/prop/invuln/joey
name = "Workin' Joey"
desc = "A defunct Seegson-brand Working Joe lifted from deep storage by a crew of marines after the last shore leave. Attempts have been made to modify the janitorial synthetic to serve as a crude bartender, but with little success."
icon = 'icons/obj/structures/props/props.dmi'
icon_state = "joey"
+ unslashable = FALSE
+ wrenchable = FALSE
+ /// converted into minutes when used to determine cooldown timer between quips
+ var/quip_delay_minimum = 5
+ /// delay between Quips. Slightly randomized with quip_delay_minimum plus a random number
+ COOLDOWN_DECLARE(quip_delay)
+ /// delay between attack voicelines. Short but done for anti-spam
+ COOLDOWN_DECLARE(damage_delay)
+ /// list of quip emotes, taken from Working Joe
+ var/static/list/quips = list(
+ /datum/emote/living/carbon/human/synthetic/working_joe/quip/alwaysknow_damaged,
+ /datum/emote/living/carbon/human/synthetic/working_joe/quip/not_liking,
+ /datum/emote/living/carbon/human/synthetic/working_joe/greeting/how_can_i_help,
+ /datum/emote/living/carbon/human/synthetic/working_joe/task_update/day_never_done,
+ /datum/emote/living/carbon/human/synthetic/working_joe/task_update/required_by_apollo,
+ /datum/emote/living/carbon/human/synthetic/working_joe/warning/safety_breach
+ )
+ /// list of voicelines to use when damaged
+ var/static/list/damaged = list(
+ /datum/emote/living/carbon/human/synthetic/working_joe/warning/damage,
+ /datum/emote/living/carbon/human/synthetic/working_joe/warning/that_stings,
+ /datum/emote/living/carbon/human/synthetic/working_joe/warning/irresponsible,
+ /datum/emote/living/carbon/human/synthetic/working_joe/warning/this_is_futile,
+ /datum/emote/living/carbon/human/synthetic/working_joe/warning/hysterical,
+ /datum/emote/living/carbon/human/synthetic/working_joe/warning/patience
+ )
+
+/obj/structure/prop/invuln/joey/Initialize()
+ . = ..()
+ START_PROCESSING(SSobj, src)
+
+/obj/structure/prop/invuln/joey/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/obj/structure/prop/invuln/joey/process()
+ //check if quip_delay cooldown finished. If so, random chance it says a line
+ if(COOLDOWN_FINISHED(src, quip_delay) && prob(10))
+ emote(pick(quips))
+ var/delay = rand(3) + quip_delay_minimum
+ COOLDOWN_START(src, quip_delay, delay MINUTES)
+
+// Advert your eyes.
+/obj/structure/prop/invuln/joey/attackby(obj/item/W, mob/user)
+ attacked()
+ return ..()
+
+/obj/structure/prop/invuln/joey/bullet_act(obj/item/projectile/P)
+ attacked()
+ return ..()
+
+/// A terrible way of handling being hit. If signals would work it should be used.
+/obj/structure/prop/invuln/joey/proc/attacked()
+ if(COOLDOWN_FINISHED(src, damage_delay) && prob(25))
+ emote(pick(damaged))
+ COOLDOWN_START(src, damage_delay, 8 SECONDS)
+
+/// SAY THE LINE JOE
+/obj/structure/prop/invuln/joey/proc/emote(datum/emote/living/carbon/human/synthetic/working_joe/emote)
+ if (!emote)
+ return FALSE
+
+ for(var/mob/mob in hearers(src, null))
+ mob.show_message("[src] says, \"[initial(emote.say_message)]\"", SHOW_MESSAGE_AUDIBLE)
+
+ var/list/viewers = get_mobs_in_view(7, src)
+ for(var/mob/current_mob in viewers)
+ if(!(current_mob.client?.prefs.toggles_langchat & LANGCHAT_SEE_EMOTES))
+ viewers -= current_mob
+ langchat_speech(initial(emote.say_message), viewers, GLOB.all_languages, skip_language_check = TRUE)
+
+ if(initial(emote.sound))
+ playsound(loc, initial(emote.sound), 50, FALSE)
+ return TRUE
+
diff --git a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
index c8f5a7f82c0f..7a4274c2c16e 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
@@ -20,8 +20,6 @@
var/force_nest = FALSE
/// counterpart to buckling_y --> offsets the buckled mob when it buckles
var/list/buckling_x
- /// saves the density of the buckled_mob
- var/buckled_mob_density
/obj/structure/bed/nest/Initialize(mapload, hive)
. = ..()
@@ -52,7 +50,6 @@
resisting_ready = FALSE
if(buckled_mob == current_mob)
- buckled_mob_density = current_mob.density
current_mob.pixel_y = buckling_y["[dir]"]
current_mob.pixel_x = buckling_x["[dir]"]
current_mob.dir = turn(dir, 180)
@@ -70,7 +67,7 @@
current_mob.pixel_y = initial(buckled_mob.pixel_y)
current_mob.pixel_x = initial(buckled_mob.pixel_x)
- current_mob.density = buckled_mob_density
+ current_mob.density = !(current_mob.lying || current_mob.stat == DEAD)
if(dir == SOUTH)
current_mob.layer = initial(current_mob.layer)
if(!ishuman(current_mob))
@@ -281,8 +278,6 @@
buckled_mob.old_y = 0
REMOVE_TRAIT(buckled_mob, TRAIT_NESTED, TRAIT_SOURCE_BUCKLE)
var/mob/living/carbon/human/buckled_human = buckled_mob
- if(buckled_human.stat == DEAD )
- buckled_mob_density = FALSE
var/mob/dead/observer/G = ghost_of_buckled_mob
var/datum/mind/M = G?.mind
@@ -311,7 +306,6 @@
/obj/structure/bed/nest/proc/healthcheck()
if(health <= 0)
- buckled_mob_density = FALSE
deconstruct()
/obj/structure/bed/nest/fire_act()
diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm
index 3599d5bb980b..2387a2086192 100644
--- a/code/game/turfs/walls/walls.dm
+++ b/code/game/turfs/walls/walls.dm
@@ -403,7 +403,7 @@
if(istype(attacking_item, /obj/item/prop/torch_frame))
to_chat(user, SPAN_NOTICE("You place the torch down on the wall."))
- new /obj/structure/prop/brazier/torch/frame(src)
+ new /obj/structure/prop/brazier/frame/full/torch(src)
qdel(attacking_item)
if(hull)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 20ff65ed144e..05e27625daeb 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -121,6 +121,7 @@ var/list/admin_verbs_minor_event = list(
/client/proc/toggle_sniper_upgrade,
/client/proc/toggle_attack_dead,
/client/proc/toggle_strip_drag,
+ /client/proc/toggle_disposal_mobs,
/client/proc/toggle_uniform_strip,
/client/proc/toggle_strong_defibs,
/client/proc/toggle_blood_optimization,
@@ -576,6 +577,10 @@ var/list/roundstart_mod_verbs = list(
set desc = "Tells everyone about a random statistic in the round."
set category = "OOC"
+ var/prompt = tgui_alert(usr, "Are you sure you want to do this?", "Announce Random Fact", list("No", "Yes"))
+ if(prompt != "Yes")
+ return
+
message_admins("[key_name(usr)] announced a random fact.")
SSticker.mode?.declare_fun_facts()
diff --git a/code/modules/admin/player_panel/actions/transform.dm b/code/modules/admin/player_panel/actions/transform.dm
index 185165357e05..91a62b1a1d02 100644
--- a/code/modules/admin/player_panel/actions/transform.dm
+++ b/code/modules/admin/player_panel/actions/transform.dm
@@ -127,7 +127,7 @@ GLOBAL_LIST_INIT(pp_transformables, list(
"Alien Tier 4" = list(
list(
- name = XENO_CASTE_QUEEN+" (Young)",
+ name = XENO_CASTE_QUEEN+" (Immature)",
key = /mob/living/carbon/xenomorph/queen,
color = "purple"
),
diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm
index a2f3bd42df5f..6dc08c63e5de 100644
--- a/code/modules/admin/tabs/admin_tab.dm
+++ b/code/modules/admin/tabs/admin_tab.dm
@@ -708,6 +708,20 @@
SSticker.mode.toggleable_flags ^= MODE_NO_ATTACK_DEAD
message_admins("[src] has [MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_ATTACK_DEAD) ? "prevented dead mobs from being" : "allowed dead mobs to be"] attacked.")
+/client/proc/toggle_disposal_mobs()
+ set name = "Toggle Disposable Mobs"
+ set category = "Admin.Flags"
+
+ if(!admin_holder || !check_rights(R_EVENT, FALSE))
+ return
+
+ if(!SSticker.mode)
+ to_chat(usr, SPAN_WARNING("A mode hasn't been selected yet!"))
+ return
+
+ SSticker.mode.toggleable_flags ^= MODE_DISPOSABLE_MOBS
+ message_admins("[src] has [MODE_HAS_TOGGLEABLE_FLAG(MODE_DISPOSABLE_MOBS) ? "allowed mobs to fit" : "prevented mobs fitting"] inside disposals.")
+
/client/proc/toggle_strip_drag()
set name = "Toggle Strip/Drag Dead"
set category = "Admin.Flags"
diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm
index b9eb4fd47ea1..fdf70d314c21 100644
--- a/code/modules/admin/tabs/event_tab.dm
+++ b/code/modules/admin/tabs/event_tab.dm
@@ -491,10 +491,10 @@
for(var/obj/structure/machinery/computer/almayer_control/C in machines)
if(!(C.inoperable()))
var/obj/item/paper/P = new /obj/item/paper( C.loc )
- P.name = "'[command_name] Update.'"
+ P.name = "'[customname].'"
P.info = input
P.update_icon()
- C.messagetitle.Add("[command_name] Update")
+ C.messagetitle.Add("[customname]")
C.messagetext.Add(P.info)
if(alert("Press \"Yes\" if you want to announce it to ship crew and marines. Press \"No\" to keep it only as printed report on communication console.",,"Yes","No") == "Yes")
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 03d2ae517354..3d50b50e414c 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -519,6 +519,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
AddInteraction("Deferred to Mentors by [key_name_admin(usr)].", player_message = "Deferred to Mentors.")
to_chat(initiator, SPAN_ADMINHELP("Your ticket has been deferred to Mentors."))
+ log_admin_private("Ticket [TicketHref("#[id]")] deferred to mentors by [usr.key].")
log_ahelp(id, "Defer", "Deferred to mentors by [usr.key]", null, usr.ckey)
Close(silent = TRUE)
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index e00f4a2d1263..3f0775c0b65d 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -143,6 +143,7 @@
assets = list(
"wylogo.png" = 'html/images/wylogo.png',
"uscmlogo.png" = 'html/images/uscmlogo.png',
+ "upplogo.png" = 'html/images/upplogo.png',
"faxwylogo.png" = 'html/images/faxwylogo.png',
"faxbackground.jpg" = 'html/images/faxbackground.jpg',
)
@@ -204,10 +205,10 @@
/datum/asset/spritesheet/playtime_rank/register()
var/icon_file = 'icons/mob/hud/hud.dmi'
- var/tier1_state = "hudxenoupgrade1"
- var/tier2_state = "hudxenoupgrade2"
- var/tier3_state = "hudxenoupgrade3"
- var/tier4_state = "hudxenoupgrade4"
+ var/tier1_state = "hudxenoupgrade2"
+ var/tier2_state = "hudxenoupgrade3"
+ var/tier3_state = "hudxenoupgrade4"
+ var/tier4_state = "hudxenoupgrade5"
var/icon/tier1_icon = icon(icon_file, tier1_state, SOUTH)
var/icon/tier2_icon = icon(icon_file, tier2_state, SOUTH)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 16afa8d1b4f2..4f1161709657 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1955,11 +1955,17 @@ var/const/MAX_SAVE_SLOTS = 10
load_character(slot_for_job)
/// Transfers both physical characteristics and character information to character
-/datum/preferences/proc/copy_all_to(mob/living/carbon/human/character, job_title, is_late_join = FALSE)
+/datum/preferences/proc/copy_all_to(mob/living/carbon/human/character, job_title, is_late_join = FALSE, check_datacore = FALSE)
if(!istype(character))
return
find_assigned_slot(job_title, is_late_join)
+ if(check_datacore && !(be_random_body && be_random_name))
+ for(var/datum/data/record/record as anything in GLOB.data_core.locked)
+ if(record.fields["name"] == real_name)
+ be_random_body = TRUE
+ be_random_name = TRUE
+ break
if(be_random_name)
real_name = random_name(gender)
@@ -1987,10 +1993,11 @@ var/const/MAX_SAVE_SLOTS = 10
character.flavor_texts["legs"] = flavor_texts["legs"]
character.flavor_texts["feet"] = flavor_texts["feet"]
- character.med_record = strip_html(med_record)
- character.sec_record = strip_html(sec_record)
- character.gen_record = strip_html(gen_record)
- character.exploit_record = strip_html(exploit_record)
+ if(!be_random_name)
+ character.med_record = strip_html(med_record)
+ character.sec_record = strip_html(sec_record)
+ character.gen_record = strip_html(gen_record)
+ character.exploit_record = strip_html(exploit_record)
character.age = age
character.gender = gender
diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm
index 713b6df355c2..910bb032349e 100644
--- a/code/modules/clothing/suits/marine_armor.dm
+++ b/code/modules/clothing/suits/marine_armor.dm
@@ -75,6 +75,7 @@
/obj/item/storage/belt/gun/flaregun,
/obj/item/device/motiondetector,
/obj/item/device/walkman,
+ /obj/item/storage/belt/gun/m39,
)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_PONCHO)
@@ -271,7 +272,7 @@
/obj/item/clothing/suit/storage/marine/rto/intel
name = "\improper XM4 pattern intelligence officer armor"
- uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/ro_suit, /obj/item/clothing/under/marine/officer/intel)
+ uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/marine/officer/intel)
specialty = "XM4 pattern intel"
/obj/item/clothing/suit/storage/marine/MP
@@ -347,7 +348,7 @@
icon_state = "officer"
storage_slots = 3
flags_atom = null
- uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/ro_suit, /obj/item/clothing/under/rank/chief_medical_officer)
+ uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/chief_medical_officer)
specialty = "M2 pattern officer"
item_state_slots = list(WEAR_JACKET = "officer")
@@ -362,7 +363,7 @@
storage_slots = 3
flags_atom = NO_SNOW_TYPE
flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS
- uniform_restricted = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/rank/ro_suit)
+ uniform_restricted = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/rank/qm_suit)
specialty = "M3 pattern captain"
item_state_slots = list(WEAR_JACKET = "co_officer")
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_PONCHO)
@@ -1516,7 +1517,7 @@
pockets.max_storage_space = 8
/obj/item/clothing/suit/storage/RO
- name = "\improper RO jacket"
+ name = "quartermaster jacket"
desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it."
icon_state = "RO_jacket"
blood_overlay_type = "coat"
diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm
index 3113b38e6e41..4ca2a54af4bf 100644
--- a/code/modules/clothing/suits/marine_coat.dm
+++ b/code/modules/clothing/suits/marine_coat.dm
@@ -217,6 +217,13 @@
icon_state = "bridge_coat_grey"
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_MEDAL)
+/obj/item/clothing/suit/storage/jacket/marine/service/aso
+ name = "auxiliary support officer jacket"
+ desc = "A comfortable vest for officers who are expected to work long hours staring at rows of numbers and inspecting equipment from knives to torpedos to entire dropships."
+ icon_state = "aso_jacket"
+ blood_overlay_type = "coat"
+ flags_armor_protection = BODY_FLAG_CHEST
+ has_buttons = FALSE
//=========================//PROVOST\\================================\\
diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm
index eca050cc4b88..a4b38b657735 100644
--- a/code/modules/clothing/under/marine_uniform.dm
+++ b/code/modules/clothing/under/marine_uniform.dm
@@ -527,7 +527,7 @@
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
has_sensor = UNIFORM_HAS_SENSORS
sensor_faction = FACTION_UPP
- suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP, /obj/item/clothing/suit/gimmick/jason, /obj/item/clothing/suit/storage/snow_suit/soviet, /obj/item/clothing/suit/storage/snow_suit/survivor)
+ suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP, /obj/item/clothing/suit/gimmick/jason, /obj/item/clothing/suit/storage/snow_suit/soviet, /obj/item/clothing/suit/storage/snow_suit/survivor, /obj/item/clothing/suit/storage/webbing)
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
/obj/item/clothing/under/marine/veteran/UPP/medic
@@ -839,9 +839,9 @@
desc = "A formal white undersuit."
flags_jumpsuit = FALSE
-/obj/item/clothing/under/rank/ro_suit
- name = "requisition officer suit"
- desc = "A nicely-fitting military suit for a requisition officer. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
+/obj/item/clothing/under/rank/qm_suit
+ name = "quartermaster suit"
+ desc = "A nicely-fitting military suit for a quartermaster. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
icon_state = "RO_jumpsuit"
worn_state = "RO_jumpsuit"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index d42e7d17bfd2..329e2055778e 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -359,6 +359,11 @@
desc = "A fire-resistant shoulder patch, worn by the men and women of the USS Hanyut, USCM FORECON."
icon_state = "forecon_patch"
+/obj/item/clothing/accessory/patch/upp
+ name = "UPP Airborne Reconnaissance patch"
+ desc = "A fire-resistant shoulder patch, worn by the men and women of the 173rd Airborne Reconnaissance Platoon."
+ icon_state = "upppatch"
+
/obj/item/clothing/accessory/poncho
name = "USCM Poncho"
desc = "The standard USCM poncho has variations for every climate. Custom fitted to be attached to standard USCM armor variants it is comfortable, warming or cooling as needed, and well-fit. A marine couldn't ask for more. Affectionately referred to as a \"woobie\"."
diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm
index 993d4f833fa6..068ffeb659eb 100644
--- a/code/modules/cm_aliens/structures/special/pylon_core.dm
+++ b/code/modules/cm_aliens/structures/special/pylon_core.dm
@@ -12,6 +12,7 @@
block_range = 0
var/cover_range = WEED_RANGE_PYLON
var/node_type = /obj/effect/alien/weeds/node/pylon
+ var/obj/effect/alien/weeds/node/node
var/linked_turfs = list()
var/damaged = FALSE
@@ -25,7 +26,7 @@
/obj/effect/alien/resin/special/pylon/Initialize(mapload, hive_ref)
. = ..()
- place_node()
+ node = place_node()
for(var/turf/A in range(round(cover_range*PYLON_COVERAGE_MULT), loc))
LAZYADD(A.linked_pylons, src)
linked_turfs += A
@@ -34,9 +35,8 @@
for(var/turf/A as anything in linked_turfs)
LAZYREMOVE(A.linked_pylons, src)
- var/obj/effect/alien/weeds/node/pylon/W = locate() in loc
- if(W)
- qdel(W)
+ if(node)
+ QDEL_NULL(node)
. = ..()
/obj/effect/alien/resin/special/pylon/attack_alien(mob/living/carbon/xenomorph/M)
@@ -87,8 +87,78 @@
playsound(loc, "alien_resin_build", 25)
/obj/effect/alien/resin/special/pylon/proc/place_node()
- var/obj/effect/alien/weeds/node/pylon/W = new node_type(loc, null, null, linked_hive)
- W.resin_parent = src
+ var/obj/effect/alien/weeds/node/pylon/pylon_node = new node_type(loc, null, null, linked_hive)
+ pylon_node.resin_parent = src
+ return pylon_node
+
+/obj/effect/alien/resin/special/pylon/endgame
+ cover_range = WEED_RANGE_CORE
+ var/activated = FALSE
+
+/obj/effect/alien/resin/special/pylon/endgame/Destroy()
+ if(activated)
+ activated = FALSE
+
+ if(hijack_delete)
+ return ..()
+
+ marine_announcement("ALERT.\n\nEnergy build up around communication relay at [get_area(src)] halted.", "[MAIN_AI_SYSTEM] Biological Scanner")
+
+ for(var/hivenumber in GLOB.hive_datum)
+ var/datum/hive_status/checked_hive = GLOB.hive_datum[hivenumber]
+ if(!length(checked_hive.totalXenos))
+ continue
+
+ if(checked_hive == linked_hive)
+ xeno_announcement(SPAN_XENOANNOUNCE("We have lost our control of the tall's communication relay at [get_area(src)]."), hivenumber, XENO_GENERAL_ANNOUNCE)
+ else
+ xeno_announcement(SPAN_XENOANNOUNCE("Another hive has lost control of the tall's communication relay at [get_area(src)]."), hivenumber, XENO_GENERAL_ANNOUNCE)
+
+ return ..()
+
+/// Checks if all comms towers are connected and then starts end game content on all pylons if they are
+/obj/effect/alien/resin/special/pylon/endgame/proc/comms_relay_connection()
+ marine_announcement("ALERT.\n\nIrregular build up of energy around communication relays at [get_area(src)].", "[MAIN_AI_SYSTEM] Biological Scanner")
+
+ for(var/hivenumber in GLOB.hive_datum)
+ var/datum/hive_status/checked_hive = GLOB.hive_datum[hivenumber]
+ if(!length(checked_hive.totalXenos))
+ continue
+
+ if(checked_hive == linked_hive)
+ xeno_announcement(SPAN_XENOANNOUNCE("We have harnessed the tall's communication relay at [get_area(src)]. Hold it!"), hivenumber, XENO_GENERAL_ANNOUNCE)
+ else
+ xeno_announcement(SPAN_XENOANNOUNCE("Another hive has harnessed the tall's communication relay at [get_area(src)].[linked_hive.faction_is_ally(checked_hive.name) ? "" : " Stop them!"]"), hivenumber, XENO_GENERAL_ANNOUNCE)
+
+ activated = TRUE
+ addtimer(CALLBACK(src, PROC_REF(give_larva)), XENO_PYLON_ACTIVATION_COOLDOWN, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_LOOP|TIMER_DELETE_ME)
+
+#define ENDGAME_LARVA_CAP_MULTIPLIER 0.4
+#define LARVA_ADDITION_MULTIPLIER 0.10
+
+/// Looped proc via timer to give larva after time
+/obj/effect/alien/resin/special/pylon/endgame/proc/give_larva()
+ if(!activated)
+ return
+
+ if(!linked_hive.hive_location || !linked_hive.living_xeno_queen)
+ return
+
+ var/list/hive_xenos = linked_hive.totalXenos
+
+ for(var/mob/living/carbon/xenomorph/xeno in hive_xenos)
+ if(!xeno.counts_for_slots)
+ hive_xenos -= xeno
+
+ if(length(hive_xenos) > (length(GLOB.alive_human_list) * ENDGAME_LARVA_CAP_MULTIPLIER))
+ return
+
+ linked_hive.partial_larva += length(hive_xenos) * LARVA_ADDITION_MULTIPLIER
+ linked_hive.convert_partial_larva_to_full_larva()
+ linked_hive.hive_ui.update_burrowed_larva()
+
+#undef ENDGAME_LARVA_CAP_MULTIPLIER
+#undef LARVA_ADDITION_MULTIPLIER
//Hive Core - Generates strong weeds, supports other buildings
/obj/effect/alien/resin/special/pylon/core
diff --git a/code/modules/cm_aliens/structures/special_structure.dm b/code/modules/cm_aliens/structures/special_structure.dm
index caa729f1df87..69bdcc2438ac 100644
--- a/code/modules/cm_aliens/structures/special_structure.dm
+++ b/code/modules/cm_aliens/structures/special_structure.dm
@@ -39,6 +39,9 @@
plane = FLOOR_PLANE
+ /// Tells the structure if they are being deleted because of hijack
+ var/hijack_delete = FALSE
+
/obj/effect/alien/resin/special/Initialize(mapload, hive_ref)
. = ..()
maxhealth = health
diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm
index f20fa842e446..01140beae304 100644
--- a/code/modules/cm_aliens/weeds.dm
+++ b/code/modules/cm_aliens/weeds.dm
@@ -55,7 +55,7 @@
linked_hive = GLOB.hive_datum[hivenumber]
set_hive_data(src, hivenumber)
- if(spread_on_semiweedable)
+ if(spread_on_semiweedable && weed_strength < WEED_LEVEL_HIVE)
if(color)
var/list/RGB = ReadRGB(color)
RGB[1] = Clamp(RGB[1] + 35, 0, 255)
@@ -588,9 +588,13 @@
weed_strength = WEED_LEVEL_HIVE
node_range = WEED_RANGE_PYLON
overlay_node = FALSE
+ spread_on_semiweedable = TRUE
var/obj/effect/alien/resin/special/resin_parent
/obj/effect/alien/weeds/node/pylon/proc/set_parent_damaged()
+ if(!resin_parent)
+ return
+
var/obj/effect/alien/resin/special/pylon/parent_pylon = resin_parent
parent_pylon.damaged = TRUE
@@ -616,7 +620,13 @@
/obj/effect/alien/weeds/node/pylon/acid_spray_act()
return
+/obj/effect/alien/weeds/node/pylon/cluster
+ spread_on_semiweedable = FALSE
+
/obj/effect/alien/weeds/node/pylon/cluster/set_parent_damaged()
+ if(!resin_parent)
+ return
+
var/obj/effect/alien/resin/special/cluster/parent_cluster = resin_parent
parent_cluster.damaged = TRUE
diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm
index 8538af7ca90e..a9a3855a53e4 100644
--- a/code/modules/cm_marines/equipment/guncases.dm
+++ b/code/modules/cm_marines/equipment/guncases.dm
@@ -295,3 +295,47 @@
new /obj/item/weapon/gun/shotgun/double/cane(src)
new /obj/item/ammo_magazine/handful/revolver/marksman/six_rounds(src)
new /obj/item/ammo_magazine/handful/revolver/marksman/six_rounds(src)
+
+//Handgun case for Military police vendor three mag , a railflashligh and the handgun.
+
+//88 Mod 4 Combat Pistol
+/obj/item/storage/box/guncase/mod88
+ name = "\improper 88 Mod 4 Combat Pistol case"
+ desc = "A gun case containing an 88 Mod 4 Combat Pistol."
+ storage_slots = 5
+ can_hold = list(/obj/item/attachable/flashlight, /obj/item/weapon/gun/pistol/mod88, /obj/item/ammo_magazine/pistol/mod88)
+
+/obj/item/storage/box/guncase/mod88/fill_preset_inventory()
+ new /obj/item/attachable/flashlight(src)
+ new /obj/item/weapon/gun/pistol/mod88(src)
+ new /obj/item/ammo_magazine/pistol/mod88(src)
+ new /obj/item/ammo_magazine/pistol/mod88(src)
+ new /obj/item/ammo_magazine/pistol/mod88(src)
+
+//M44 Combat Revolver
+/obj/item/storage/box/guncase/m44
+ name = "\improper M44 Combat Revolver case"
+ desc = "A gun case containing an M44 Combat Revolver."
+ storage_slots = 5
+ can_hold = list(/obj/item/attachable/flashlight, /obj/item/weapon/gun/revolver/m44, /obj/item/ammo_magazine/revolver)
+
+/obj/item/storage/box/guncase/m44/fill_preset_inventory()
+ new /obj/item/attachable/flashlight(src)
+ new /obj/item/weapon/gun/revolver/m44(src)
+ new /obj/item/ammo_magazine/revolver(src)
+ new /obj/item/ammo_magazine/revolver(src)
+ new /obj/item/ammo_magazine/revolver(src)
+
+//M4A3 Service Pistol
+/obj/item/storage/box/guncase/m4a3
+ name = "\improper M4A3 Service Pistol case"
+ desc = "A gun case containing an M4A3 Service Pistol."
+ storage_slots = 5
+ can_hold = list(/obj/item/attachable/flashlight, /obj/item/weapon/gun/pistol/m4a3, /obj/item/ammo_magazine/pistol)
+
+/obj/item/storage/box/guncase/m4a3/fill_preset_inventory()
+ new /obj/item/attachable/flashlight(src)
+ new /obj/item/weapon/gun/pistol/m4a3(src)
+ new /obj/item/ammo_magazine/pistol(src)
+ new /obj/item/ammo_magazine/pistol(src)
+ new /obj/item/ammo_magazine/pistol(src)
diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm
index 36535a0b5141..ad0ebac8307b 100644
--- a/code/modules/cm_marines/marines_consoles.dm
+++ b/code/modules/cm_marines/marines_consoles.dm
@@ -679,11 +679,13 @@
idle_power_usage = 250
active_power_usage = 500
var/faction = FACTION_MARINE
+ /// What type of /datum/crewmonitor this will create
+ var/crewmonitor_type = /datum/crewmonitor
/obj/structure/machinery/computer/crew/Initialize()
. = ..()
if(!GLOB.crewmonitor[faction])
- GLOB.crewmonitor[faction] = new /datum/crewmonitor(faction)
+ GLOB.crewmonitor[faction] = new crewmonitor_type(faction)
/obj/structure/machinery/computer/crew/attack_remote(mob/living/user)
attack_hand(user)
@@ -714,6 +716,12 @@
icon_state = "cmonitor"
density = FALSE
+/obj/structure/machinery/computer/crew/alt/yautja
+ name = "\improper Yautja health monitor"
+ desc = "Used to monitor active health sensors of all Yautja in the system. You can see that the console highlights the human's ship areas with BLUE and the hunting locations with RED."
+ faction = FACTION_YAUTJA
+ crewmonitor_type = /datum/crewmonitor/yautja
+
/obj/structure/machinery/computer/crew/upp
faction = FACTION_UPP
@@ -790,7 +798,7 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
/datum/crewmonitor/ui_data(mob/user)
. = list(
"sensors" = update_data(),
- "link_allowed" = isAI(user)
+ "link_allowed" = isAI(user),
)
/datum/crewmonitor/proc/update_data()
@@ -902,10 +910,11 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
RAIDER_OFFICER_SQUAD = 11,
JOB_SO = 12,
JOB_SEA = 13,
- // 20-29: Aux Command (Synth isn't Aux head, but important - make him bold)
- JOB_SYNTH = 20,
- JOB_PILOT = 21,
- JOB_DROPSHIP_CREW_CHIEF = 22,
+ // 20-29: Aux Command
+ JOB_AUXILIARY_OFFICER = 20,
+ JOB_SYNTH = 21,
+ JOB_PILOT = 22,
+ JOB_DROPSHIP_CREW_CHIEF = 23,
JOB_INTEL = 24,
// 30-39: Security
JOB_CHIEF_POLICE = 30,
@@ -929,11 +938,11 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
// 60-69: Cargo
JOB_CHIEF_REQUISITION = 60,
JOB_CARGO_TECH = 61,
+ JOB_MESS_SERGEANT = 62,
// 70-139: SQUADS (look below)
// 140+: Civilian/other
JOB_CORPORATE_LIAISON = 140,
- JOB_MESS_SERGEANT = 141,
- JOB_PASSENGER = 142,
+ JOB_PASSENGER = 141,
// Non Almayer jobs lower then registered
JOB_SYNTH_SURVIVOR = 150,
JOB_SURVIVOR = 151,
@@ -1102,6 +1111,51 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
else
jobs = list()
+/datum/crewmonitor/yautja
+ faction = FACTION_YAUTJA
+
+/datum/crewmonitor/yautja/update_data()
+ var/list/results = list()
+ for(var/mob/living/carbon/human/human_mob as anything in GLOB.human_mob_list)
+
+ if(!isyautja(human_mob))
+ continue
+
+ if(faction != human_mob.faction)
+ continue
+
+ // Check if z-level is correct
+ var/turf/pos = get_turf(human_mob)
+ if(!pos)
+ continue
+
+ // The entry for this human
+ var/list/entry = list(
+ "ref" = REF(human_mob),
+ "name" = human_mob.real_name,
+ "ijob" = UNKNOWN_JOB_ID,
+ "assignment" = "Hunter",
+ "oxydam" = round(human_mob.getOxyLoss(), 1),
+ "toxdam" = round(human_mob.getToxLoss(), 1),
+ "burndam" = round(human_mob.getFireLoss(), 1),
+ "brutedam" = round(human_mob.getBruteLoss(), 1),
+ "can_track" = TRUE,
+ )
+
+ if(is_mainship_level(pos.z))
+ entry["side"] = "Almayer"
+
+ var/area/mob_area = get_area(human_mob)
+ entry["area"] = sanitize_area(mob_area.name)
+
+ results[++results.len] = entry
+
+ // Cache result
+ data = results
+ last_update = world.time
+
+ return results
+
#undef SENSOR_LIVING
#undef SENSOR_VITALS
#undef SENSOR_COORDS
diff --git a/code/modules/cm_phone/phone.dm b/code/modules/cm_phone/phone.dm
index ac00e717f79a..b3e0ecd87206 100644
--- a/code/modules/cm_phone/phone.dm
+++ b/code/modules/cm_phone/phone.dm
@@ -312,6 +312,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter)
P.handle_hear(message, L, speaking)
attached_to.handle_hear(message, L, speaking)
+ log_say("TELEPHONE: [key_name(speaking)] on Phone '[phone_id]' to '[T.phone_id]' said '[message]'")
/obj/structure/transmitter/attackby(obj/item/W, mob/user)
if(W == attached_to)
diff --git a/code/modules/cm_preds/falcon.dm b/code/modules/cm_preds/falcon.dm
index 19977a7bd84a..4461f9b4f7e7 100644
--- a/code/modules/cm_preds/falcon.dm
+++ b/code/modules/cm_preds/falcon.dm
@@ -68,6 +68,7 @@
var/obj/item/falcon_drone/parent_drone
var/obj/item/clothing/gloves/yautja/owned_bracers
desc = "An agile drone used by Yautja to survey the hunting grounds."
+ motion_sensed = TRUE
/mob/hologram/falcon/Initialize(mapload, mob/M, obj/item/falcon_drone/drone, obj/item/clothing/gloves/yautja/bracers)
. = ..()
diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm
index f33d5f9a5554..a94cde9887c3 100644
--- a/code/modules/cm_preds/yaut_bracers.dm
+++ b/code/modules/cm_preds/yaut_bracers.dm
@@ -46,6 +46,8 @@
var/mob/living/carbon/human/owner //Pred spawned on, or thrall given to.
var/obj/item/clothing/gloves/yautja/linked_bracer //Bracer linked to this one (thrall or mentor).
COOLDOWN_DECLARE(bracer_recharge)
+ /// What minimap icon this bracer should have
+ var/minimap_icon = "predator"
/obj/item/clothing/gloves/yautja/equipped(mob/user, slot)
. = ..()
@@ -54,6 +56,8 @@
if(!owner)
owner = user
toggle_lock_internal(user, TRUE)
+ RegisterSignal(user, list(COMSIG_MOB_STAT_SET_ALIVE, COMSIG_MOB_DEATH), PROC_REF(update_minimap_icon))
+ INVOKE_NEXT_TICK(src, PROC_REF(update_minimap_icon), user)
/obj/item/clothing/gloves/yautja/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -65,6 +69,8 @@
/obj/item/clothing/gloves/yautja/dropped(mob/user)
STOP_PROCESSING(SSobj, src)
flags_item = initial(flags_item)
+ UnregisterSignal(user, list(COMSIG_MOB_STAT_SET_ALIVE, COMSIG_MOB_DEATH))
+ SSminimaps.remove_marker(user)
..()
/obj/item/clothing/gloves/yautja/pickup(mob/living/user)
@@ -94,7 +100,7 @@
return
if(human_holder.stat == DEAD)
decloak(human_holder, TRUE)
- if(!HAS_TRAIT(human_holder, TRAIT_YAUTJA_TECH) && !human_holder.hunter_data.thralled && prob(15))
+ if(!HAS_TRAIT(human_holder, TRAIT_YAUTJA_TECH) && !human_holder.hunter_data.thralled && prob(2))
decloak(human_holder)
shock_user(human_holder)
@@ -102,6 +108,27 @@
/obj/item/clothing/gloves/yautja/proc/decloak()
return
+/// Called to update the minimap icon of the predator
+/obj/item/clothing/gloves/yautja/proc/update_minimap_icon()
+ if(!ishuman(owner))
+ return
+
+ var/mob/living/carbon/human/human_owner = owner
+ var/turf/wearer_turf = get_turf(owner)
+ SSminimaps.remove_marker(owner)
+ if(!isyautja(owner))
+ if(owner.stat >= DEAD)
+ if(human_owner.undefibbable)
+ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable"))
+ else
+ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("defibbable"))
+ else
+ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi')
+ else
+ if(owner?.stat >= DEAD)
+ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) //defib/undefib status doesn't really matter because they're gonna explode in the end regardless
+ else
+ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi')
/*
*This is the main proc for checking AND draining the bracer energy. It must have human passed as an argument.
*It can take a negative value in amount to restore energy.
@@ -193,8 +220,23 @@
desc = "A pair of strange alien bracers, adapted for human biology."
color = "#b85440"
+ minimap_icon = "thrall"
+/obj/item/clothing/gloves/yautja/thrall/update_minimap_icon()
+ if(!ishuman(owner))
+ return
+
+ var/mob/living/carbon/human/human_owner = owner
+ var/turf/wearer_turf = get_turf(owner)
+ if(owner.stat >= DEAD)
+ if(human_owner.undefibbable)
+ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, overlay_iconstates = list("undefibbable"))
+ else
+ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, overlay_iconstates = list("defibbable"))
+ else
+ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon)
+
/obj/item/clothing/gloves/yautja/hunter
name = "clan bracers"
desc = "An extremely complex, yet simple-to-operate set of armored bracers worn by the Yautja. It has many functions, activate them to use some."
@@ -293,7 +335,7 @@
var/mob/living/carbon/human/human = loc
//Non-Yautja have a chance to get stunned with each power drain
- if((!HAS_TRAIT(human, TRAIT_YAUTJA_TECH) && !human.hunter_data.thralled) && prob(15))
+ if((!HAS_TRAIT(human, TRAIT_YAUTJA_TECH) && !human.hunter_data.thralled) && prob(4))
if(cloaked)
decloak(human, TRUE, DECLOAK_SPECIES)
shock_user(human)
@@ -955,19 +997,10 @@
if(.)
return
- for(var/obj/item/weapon/yautja/combistick/C in range(7))
- if(C in caller.contents) //Can't yank if they are wearing it
- return FALSE
- if(caller.put_in_active_hand(C))//Try putting it in our active hand, or, if it's full...
- if(!drain_power(caller, 70)) //We should only drain power if we actually yank the chain back. Failed attempts can quickly drain the charge away.
- return TRUE
- caller.visible_message(SPAN_WARNING("[caller] yanks [C]'s chain back!"), SPAN_WARNING("You yank [C]'s chain back!"))
- else if(caller.put_in_inactive_hand(C))///...Try putting it in our inactive hand.
- if(!drain_power(caller, 70)) //We should only drain power if we actually yank the chain back. Failed attempts can quickly drain the charge away.
- return TRUE
- caller.visible_message(SPAN_WARNING("[caller] yanks [C]'s chain back!"), SPAN_WARNING("You yank [C]'s chain back!"))
- else //If neither hand can hold it, you must not have a free hand.
- to_chat(caller, SPAN_WARNING("You need a free hand to do this!"))
+ for(var/datum/effects/tethering/tether in caller.effects_list)
+ if(istype(tether.tethered.affected_atom, /obj/item/weapon/yautja/combistick))
+ var/obj/item/weapon/yautja/combistick/stick = tether.tethered.affected_atom
+ stick.recall()
/obj/item/clothing/gloves/yautja/hunter/verb/translate()
set name = "Translator"
diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm
index fbbe6c183aaa..5ff13c843ee3 100644
--- a/code/modules/cm_preds/yaut_weapons.dm
+++ b/code/modules/cm_preds/yaut_weapons.dm
@@ -254,6 +254,17 @@
var/force_wielded = MELEE_FORCE_TIER_6
var/force_unwielded = MELEE_FORCE_TIER_2
var/force_storage = MELEE_FORCE_TIER_1
+ /// Ref to the tether effect when thrown
+ var/datum/effects/tethering/chain
+
+/obj/item/weapon/yautja/combistick/Destroy()
+ cleanup_chain()
+ return ..()
+
+/obj/item/weapon/yautja/combistick/dropped(mob/user)
+ . = ..()
+ if(on && isturf(loc))
+ setup_chain(user)
/obj/item/weapon/yautja/combistick/try_to_throw(mob/living/user)
if(!charged)
@@ -262,8 +273,66 @@
charged = FALSE
remove_filter("combistick_charge")
unwield(user) //Otherwise stays wielded even when thrown
+ if(on)
+ setup_chain(user)
return TRUE
+/obj/item/weapon/yautja/combistick/proc/setup_chain(mob/living/user)
+ var/list/tether_effects = apply_tether(user, src, range = 6, resistable = FALSE)
+ chain = tether_effects["tetherer_tether"]
+ RegisterSignal(chain, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_chain))
+ RegisterSignal(src, COMSIG_ITEM_PICKUP, PROC_REF(on_pickup))
+ RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+
+/// The chain normally breaks if it's put into a container, so let's yank it back if that's the case
+/obj/item/weapon/yautja/combistick/proc/on_move(datum/source, atom/moved, dir, forced)
+ SIGNAL_HANDLER
+ if(!z && !is_type_in_list(loc, list(/obj/structure/surface, /mob))) // I rue for the day I can remove the surface snowflake check
+ recall()
+
+/// Clean up the chain, deleting/nulling/unregistering as needed
+/obj/item/weapon/yautja/combistick/proc/cleanup_chain()
+ SIGNAL_HANDLER
+ if(!QDELETED(chain))
+ QDEL_NULL(chain)
+
+ else
+ chain = null
+
+ UnregisterSignal(src, COMSIG_ITEM_PICKUP)
+ UnregisterSignal(src, COMSIG_MOVABLE_MOVED)
+
+/obj/item/weapon/yautja/combistick/proc/on_pickup(datum/source, mob/user)
+ SIGNAL_HANDLER
+ if(user != chain.affected_atom)
+ to_chat(chain.affected_atom, SPAN_WARNING("You feel the chain of [src] be torn from your grasp!")) // Recall the fuckin combi my man
+
+ cleanup_chain()
+
+/// recall the combistick to the pred's hands or to be at their feet
+/obj/item/weapon/yautja/combistick/proc/recall()
+ SIGNAL_HANDLER
+ if(!chain)
+ return
+
+ var/mob/living/carbon/human/user = chain.affected_atom
+ if((src in user.contents) || !istype(user.gloves, /obj/item/clothing/gloves/yautja/hunter))
+ cleanup_chain()
+ return
+
+ var/obj/item/clothing/gloves/yautja/hunter/pred_gloves = user.gloves
+
+ if(user.put_in_hands(src, TRUE))
+ if(!pred_gloves.drain_power(user, 70))
+ return TRUE
+ user.visible_message(SPAN_WARNING("[user] yanks [src]'s chain back, catching it in [user.p_their()] hand!"), SPAN_WARNING("You yank [src]'s chain back, catching it inhand!"))
+ cleanup_chain()
+
+ else
+ if(!pred_gloves.drain_power(user, 70))
+ return TRUE
+ user.visible_message(SPAN_WARNING("[user] yanks [src]'s chain back, letting [src] fall at [user.p_their()]!"), SPAN_WARNING("You yank [src]'s chain back, letting it drop at your feet!"))
+ cleanup_chain()
/obj/item/weapon/yautja/combistick/IsShield()
return on
@@ -823,7 +892,7 @@
/obj/item/weapon/gun/energy/yautja/plasmarifle
name = "plasma rifle"
- desc = "A long-barreled heavy plasma weapon capable of taking down large game. It has a mounted scope for distant shots and an integrated battery."
+ desc = "A long-barreled heavy plasma weapon. Intended for combat, not hunting. Has an integrated battery that allows for a functionally unlimited amount of shots to be discharged. Equipped with an internal gyroscopic stabilizer allowing its operator to fire the weapon one-handed if desired"
icon_state = "plasmarifle"
item_state = "plasmarifle"
unacidable = TRUE
@@ -836,7 +905,7 @@
var/charge_time = 0
var/last_regen = 0
flags_gun_features = GUN_UNUSUAL_DESIGN
- flags_item = ITEM_PREDATOR
+ flags_item = ITEM_PREDATOR|TWOHANDED
/obj/item/weapon/gun/energy/yautja/plasmarifle/Initialize(mapload, spawn_empty)
. = ..()
@@ -889,12 +958,8 @@
return ..()
/obj/item/weapon/gun/energy/yautja/plasmarifle/load_into_chamber()
- if(charge_time >= 80)
- ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/rifle/blast]
- charge_time -= 80
- else
- ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/rifle/bolt]
- charge_time -= 10
+ ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/rifle/bolt]
+ charge_time -= 10
var/obj/item/projectile/projectile = create_bullet(ammo, initial(name))
projectile.SetLuminosity(1)
in_chamber = projectile
diff --git a/code/modules/cm_tech/hologram.dm b/code/modules/cm_tech/hologram.dm
index 83cc0937b46e..5c0e986f45b2 100644
--- a/code/modules/cm_tech/hologram.dm
+++ b/code/modules/cm_tech/hologram.dm
@@ -1,4 +1,4 @@
-GLOBAL_LIST_EMPTY(hologram_list)
+GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram)
/mob/hologram
name = "Hologram"
@@ -16,6 +16,8 @@ GLOBAL_LIST_EMPTY(hologram_list)
var/mob/linked_mob
var/datum/action/leave_hologram/leave_button
+ ///If can be detected on motion detectors.
+ var/motion_sensed = FALSE
/mob/hologram/movement_delay()
. = -2 // Very fast speed, so they can navigate through easily, they can't ever have movement delay whilst as a hologram
diff --git a/code/modules/cm_tech/implements/medical_czsp.dm b/code/modules/cm_tech/implements/medical_czsp.dm
index e0b00ebf5afd..3eed2fc9f619 100644
--- a/code/modules/cm_tech/implements/medical_czsp.dm
+++ b/code/modules/cm_tech/implements/medical_czsp.dm
@@ -83,10 +83,11 @@
/obj/item/device/defibrillator/upgraded
name = "upgraded emergency defibrillator"
icon_state = "adv_defib"
- desc = "An advanced rechargeable defibrillator using induction to deliver shocks through metallic objects, such as armor, and does so with much greater efficiency than the standard variant."
+ desc = "An advanced rechargeable defibrillator using induction to deliver shocks through metallic objects, such as armor, and does so with much greater efficiency than the standard variant, not damaging the heart."
blocked_by_suit = FALSE
- heart_damage_to_deal = 0
+ min_heart_damage_dealt = 0
+ max_heart_damage_dealt = 0
damage_heal_threshold = 35
/obj/item/ammo_magazine/internal/pillgun
diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm
index fc70e5fc90bb..94a628553252 100644
--- a/code/modules/gear_presets/_select_equipment.dm
+++ b/code/modules/gear_presets/_select_equipment.dm
@@ -952,3 +952,53 @@ var/list/rebel_rifles = list(
list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR),
list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR)
)
+
+/datum/equipment_preset/proc/add_upp_weapon(mob/living/carbon/human/new_human)
+ var/random_gun = rand(1,3)
+ switch(random_gun)
+ if(1)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71(new_human), WEAR_L_HAND)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK)
+ if(2)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/carbine(new_human), WEAR_L_HAND)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK)
+ if(3)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23(new_human), WEAR_L_HAND)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot(new_human), WEAR_IN_BACK)
+
+/datum/equipment_preset/proc/spawn_random_upp_headgear(mob/living/carbon/human/new_human)
+ var/random_hat = rand(1,10)
+ switch(random_hat)
+ if (1, 2)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP(new_human), WEAR_HEAD)
+ if (3, 4, 5)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap(new_human), WEAR_HEAD)
+ if (6, 7)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret(new_human), WEAR_HEAD)
+ if (8, 9)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/ushanka(new_human), WEAR_HEAD)
+
+/datum/equipment_preset/proc/spawn_random_upp_armor(mob/living/carbon/human/new_human)
+ var/random_gear = rand(1, 4)
+ switch(random_gear)
+ if (1, 2, 3)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_J_STORE)
+ if (4)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)
+
+/datum/equipment_preset/proc/spawn_random_upp_belt(mob/living/carbon/human/new_human)
+ var/random_gun = rand(1, 3)
+ switch(random_gun)
+ if (1, 2)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY(new_human), WEAR_WAIST)
+ if (3)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp(new_human), WEAR_WAIST)
diff --git a/code/modules/gear_presets/survivors.dm b/code/modules/gear_presets/survivors.dm
index 8c6a118d24d4..9ab5e7c8d22c 100644
--- a/code/modules/gear_presets/survivors.dm
+++ b/code/modules/gear_presets/survivors.dm
@@ -1562,3 +1562,159 @@
new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD)
+
+ ..()
+
+/datum/equipment_preset/survivor/upp
+ name = "UPP Soldier"
+ paygrade = "UE1"
+ origin_override = ORIGIN_UPP
+ rank = JOB_SURVIVOR
+ skills = /datum/skills/military/survivor/upp_private
+ languages = list(LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_CHINESE)
+ faction = FACTION_UPP
+ faction_group = list(FACTION_UPP, FACTION_SURVIVOR)
+ role_comm_title = "UPP 173RD RECON"
+ idtype = /obj/item/card/id/dogtag
+ flags = EQUIPMENT_PRESET_EXTRA
+ uses_special_name = TRUE
+ access = list(
+ ACCESS_CIVILIAN_PUBLIC,
+ )
+
+/datum/equipment_preset/survivor/upp/load_name(mob/living/carbon/human/new_human, randomise)
+ var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male_upp : first_names_female_upp)) + " " + capitalize(pick(last_names_upp))
+ new_human.change_real_name(new_human, random_name)
+
+/datum/equipment_preset/survivor/upp/load_gear(mob/living/carbon/human/new_human)
+ var/obj/item/clothing/under/marine/veteran/UPP/uniform = new()
+ var/random_number = rand(1,2)
+ switch(random_number)
+ if(1)
+ uniform.roll_suit_jacket(new_human)
+ if(2)
+ uniform.roll_suit_sleeves(new_human)
+ new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp (new_human), WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp_knife(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare(new_human), WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
+
+/datum/equipment_preset/survivor/upp/soldier
+ name = "Survivor - UPP Soldier"
+ paygrade = "UE2"
+ assignment = "UPP Soldier"
+ skills = /datum/skills/military/survivor/upp_private
+
+/datum/equipment_preset/survivor/upp/soldier/load_gear(mob/living/carbon/human/new_human)
+ var/obj/item/clothing/under/marine/veteran/UPP/uniform = new()
+ var/random_number = rand(1,2)
+ switch(random_number)
+ if(1)
+ uniform.roll_suit_jacket(new_human)
+ if(2)
+ uniform.roll_suit_sleeves(new_human)
+ new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK)
+ add_upp_weapon(new_human)
+ spawn_random_upp_headgear(new_human)
+ spawn_random_upp_armor(new_human)
+ spawn_random_upp_belt(new_human)
+
+ ..()
+
+/datum/equipment_preset/survivor/upp/sapper
+ name = "Survivor - UPP Sapper"
+ paygrade = "UE3S"
+ assignment = "UPP Sapper"
+ skills = /datum/skills/military/survivor/upp_sapper
+
+/datum/equipment_preset/survivor/upp/sapper/load_gear(mob/living/carbon/human/new_human)
+
+ var/obj/item/clothing/under/marine/veteran/UPP/engi/uniform = new()
+ var/R = rand(1,2)
+ switch(R)
+ if(1)
+ uniform.roll_suit_jacket(new_human)
+ if(2)
+ uniform.roll_suit_sleeves(new_human)
+ new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK)
+ spawn_random_upp_armor(new_human)
+ add_upp_weapon(new_human)
+ spawn_random_upp_headgear(new_human)
+
+ ..()
+
+/datum/equipment_preset/survivor/upp/medic
+ name = "Survivor - UPP Medic"
+ paygrade = "UE3M"
+ assignment = "UPP Medic"
+ skills = /datum/skills/military/survivor/upp_medic
+
+/datum/equipment_preset/survivor/upp/medic/load_gear(mob/living/carbon/human/new_human)
+ var/obj/item/clothing/under/marine/veteran/UPP/medic/uniform = new()
+ var/random_number = rand(1,2)
+ switch(random_number)
+ if(1)
+ uniform.roll_suit_jacket(new_human)
+ if(2)
+ uniform.roll_suit_sleeves(new_human)
+ new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new/obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/partial(new_human), WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/medic/upp(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BACK)
+ spawn_random_upp_armor(new_human)
+ add_upp_weapon(new_human)
+ spawn_random_upp_headgear(new_human)
+
+ ..()
+
+/datum/equipment_preset/survivor/upp/specialist
+ name = "Survivor - UPP Specialist"
+ paygrade = "UE4"
+ assignment = "UPP Specialist"
+ skills = /datum/skills/military/survivor/upp_spec
+
+/datum/equipment_preset/survivor/upp/specialist/load_gear(mob/living/carbon/human/new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/heavy (new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer(new_human), WEAR_L_HAND)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9(new_human), WEAR_WAIST)
+
+ ..()
+
+/datum/equipment_preset/survivor/upp/squad_leader
+ name = "Survivor - UPP Squad Leader"
+ paygrade = "UE5"
+ languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_GERMAN, LANGUAGE_CHINESE)
+ assignment = "UPP Squad Leader"
+ role_comm_title = "UPP 173Rd RECON SL"
+ skills = /datum/skills/military/survivor/upp_sl
+
+/datum/equipment_preset/survivor/upp/squad_leader/load_gear(mob/living/carbon/human/new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer (new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/officer (new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9(new_human), WEAR_WAIST)
+ add_upp_weapon(new_human)
+
+ ..()
diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm
index eaf6299b88a8..eaab23630ed2 100644
--- a/code/modules/gear_presets/synths.dm
+++ b/code/modules/gear_presets/synths.dm
@@ -455,13 +455,51 @@
survivor_variant = ENGINEERING_SURVIVOR
- faction = FACTION_SURVIVOR
- faction_group = list(FACTION_SURVIVOR)
- access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND)
+/datum/equipment_preset/synth/survivor/upp
+ name = "Survivor - Synthetic - UPP Synth"
+ flags = EQUIPMENT_PRESET_EXTRA
+ languages = ALL_SYNTH_LANGUAGES_UPP
+ assignment = JOB_UPP_COMBAT_SYNTH
+ rank = JOB_SURVIVOR
+ faction = FACTION_UPP
+ faction_group = list(FACTION_UPP, FACTION_SURVIVOR)
+ skills = /datum/skills/colonial_synthetic
+ paygrade = "SYN"
+ idtype = /obj/item/card/id/dogtag
+ role_comm_title = "UPP 173Rd RECON Syn"
+
+/datum/equipment_preset/synth/survivor/upp/load_gear(mob/living/carbon/human/new_human)
+ var/obj/item/clothing/under/marine/veteran/UPP/medic/uniform = new()
+ var/random_number = rand(1,2)
+ switch(random_number)
+ if(1)
+ uniform.roll_suit_jacket(new_human)
+ if(2)
+ uniform.roll_suit_sleeves(new_human)
+ new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, WEAR_R_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing, WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/partial, WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/uppsynth, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET)
/datum/equipment_preset/synth/survivor/pmc
name = "Survivor - Synthetic - PMC Support Synth"
-
+ faction = FACTION_SURVIVOR
+ faction_group = list(FACTION_SURVIVOR)
+ access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND)
idtype = /obj/item/card/id/pmc
assignment = JOB_PMC_SYNTH
rank = JOB_PMC_SYNTH
@@ -507,6 +545,7 @@
new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE)
+
//*****************************************************************************************************/
/datum/equipment_preset/synth/working_joe
diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
index 2f7148302485..a43404c59450 100644
--- a/code/modules/gear_presets/upp.dm
+++ b/code/modules/gear_presets/upp.dm
@@ -1777,7 +1777,7 @@
name = "UPP Combat Synthetic"
flags = EQUIPMENT_PRESET_EXTRA
- languages = ALL_SYNTH_LANGUAGES
+ languages = ALL_SYNTH_LANGUAGES_UPP
skills = /datum/skills/synthetic
assignment = JOB_UPP_COMBAT_SYNTH
diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm
index 2714dd063786..457ef71e9a46 100644
--- a/code/modules/gear_presets/uscm_ship.dm
+++ b/code/modules/gear_presets/uscm_ship.dm
@@ -193,7 +193,6 @@
ACCESS_MARINE_ENGINEERING,
ACCESS_MARINE_COMMAND,
ACCESS_CIVILIAN_ENGINEERING,
- ACCESS_MARINE_SENIOR,
ACCESS_MARINE_DATABASE,
ACCESS_MARINE_MAINT,
ACCESS_MARINE_OT,
@@ -202,7 +201,7 @@
)
assignment = JOB_CHIEF_ENGINEER
rank = JOB_CHIEF_ENGINEER
- paygrade = "MO2"
+ paygrade = "MO1"
role_comm_title = "CE"
minimum_age = 27
skills = /datum/skills/CE
@@ -308,8 +307,8 @@
//*****************************************************************************************************/
-/datum/equipment_preset/uscm_ship/ro
- name = "USCM Requisitions Officer (RO)"
+/datum/equipment_preset/uscm_ship/qm
+ name = "USCM Quartermaster (QM)"
flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
idtype = /obj/item/card/id/silver
@@ -318,7 +317,6 @@
ACCESS_MARINE_RO,
ACCESS_MARINE_COMMAND,
ACCESS_MARINE_DATABASE,
- ACCESS_MARINE_SENIOR,
ACCESS_MARINE_ALPHA,
ACCESS_MARINE_BRAVO,
ACCESS_MARINE_CHARLIE,
@@ -327,23 +325,23 @@
)
assignment = JOB_CHIEF_REQUISITION
rank = JOB_CHIEF_REQUISITION
- paygrade = "MO2"
- role_comm_title = "RO"
+ paygrade = "ME7"
+ role_comm_title = "QM"
minimum_age = 27
skills = /datum/skills/RO
minimap_background = MINIMAP_ICON_BACKGROUND_CIC
minimap_icon = list("ct" = MINIMAP_ICON_COLOR_HEAD)
- utility_under = list(/obj/item/clothing/under/rank/ro_suit)
+ utility_under = list(/obj/item/clothing/under/rank/qm_suit)
-/datum/equipment_preset/uscm_ship/ro/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/uscm_ship/qm/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/industrial
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ro(new_human), WEAR_L_EAR)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/ro_suit(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/qm(new_human), WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/qm_suit(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req(new_human), WEAR_HEAD)
@@ -616,6 +614,63 @@
//*****************************************************************************************************/
+/datum/equipment_preset/uscm_ship/auxiliary_officer
+ name = "USCM Auxiliary Support Officer (ASO)"
+ flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
+
+ idtype = /obj/item/card/id/silver
+ assignment = JOB_AUXILIARY_OFFICER
+ rank = JOB_AUXILIARY_OFFICER
+ paygrade = "MO2"
+ role_comm_title = "ASO"
+ minimum_age = 27
+ skills = /datum/skills/auxiliary_officer
+
+ minimap_icon = list("cic" = MINIMAP_ICON_COLOR_SILVER)
+ minimap_background = MINIMAP_ICON_BACKGROUND_CIC
+
+/datum/equipment_preset/uscm_ship/auxiliary_officer/New()
+ . = ..()
+ access = list(
+ ACCESS_MARINE_SENIOR,
+ ACCESS_MARINE_ASO,
+ ACCESS_MARINE_COMMAND,
+ ACCESS_MARINE_BRIG,
+ ACCESS_MARINE_ARMORY,
+ ACCESS_MARINE_MEDBAY,
+ ACCESS_MARINE_CE,
+ ACCESS_MARINE_ENGINEERING,
+ ACCESS_MARINE_MAINT,
+ ACCESS_MARINE_OT,
+ ACCESS_MARINE_RO,
+ ACCESS_MARINE_CARGO,
+ ACCESS_MARINE_PREP,
+ ACCESS_MARINE_ALPHA,
+ ACCESS_MARINE_BRAVO,
+ ACCESS_MARINE_CHARLIE,
+ ACCESS_MARINE_DELTA,
+ ACCESS_MARINE_PILOT,
+ ACCESS_MARINE_DROPSHIP,
+ ACCESS_MARINE_KITCHEN,
+ ACCESS_PRESS,
+ )
+
+/datum/equipment_preset/uscm_ship/auxiliary_officer/load_gear(mob/living/carbon/human/new_human)
+ var/back_item = /obj/item/storage/backpack/satchel
+ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
+ back_item = /obj/item/storage/backpack/marine
+
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/alt(new_human), WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service/aso(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_STORE)
+
+//*****************************************************************************************************/
+
/datum/equipment_preset/uscm_ship/po
name = "USCM Pilot (DP) (Cryo)"
flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
diff --git a/code/modules/law/laws/minor_crime.dm b/code/modules/law/laws/minor_crime.dm
index 3fc257cf1cbf..651b9dd42d4f 100644
--- a/code/modules/law/laws/minor_crime.dm
+++ b/code/modules/law/laws/minor_crime.dm
@@ -50,3 +50,8 @@
desc = "To take items (or property) from another person or entity without their express permission, or to retain possession of items that have been taken without permission. This includes the removal of vendors from department areas without permission."
special_punishment = "Return of Stolen Item"
brig_time = 10
+
+/datum/law/minor_law/false_testimony
+ name = "False Testimony"
+ desc = "To intentionally and willingly lie to an MP, or deputized officer, during a legal investigation with the intent to disrupt said investigation."
+ brig_time = 5
diff --git a/code/modules/mob/camera/imaginary_friend.dm b/code/modules/mob/camera/imaginary_friend.dm
index 054dd6ea8ff4..a78de70a7e15 100644
--- a/code/modules/mob/camera/imaginary_friend.dm
+++ b/code/modules/mob/camera/imaginary_friend.dm
@@ -200,6 +200,7 @@
to_chat(owner, "[rendered]")
to_chat(src, "[rendered]")
+ log_say("Imaginary Friend: [dead_rendered]")
if(!hidden)
var/list/send_to = list()
if(!owner.client?.prefs.lang_chat_disabled)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 9e8fa264af1d..ee36d25fc687 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -544,6 +544,27 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!istype(target))
return
+ if(check_client_rights(client, R_MOD, FALSE))
+ view_health_scan(target)
+ return
+
+ if(!mind.original)
+ view_health_scan(target)
+ return
+
+ if(!ishuman(mind.original))
+ view_health_scan(target)
+ return
+
+ var/mob/living/carbon/human/original_human = mind.original
+
+ if(!original_human.check_tod() || !original_human.is_revivable() || !can_reenter_corpse)
+ view_health_scan(target)
+ return
+
+ to_chat(src, SPAN_NOTICE("You must be permanently unrevivable or unable to reenter your body to use the scan health verb."))
+
+/mob/dead/observer/proc/view_health_scan(mob/living/target)
if (!last_health_display)
last_health_display = new(target)
else
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index d5e9b288d06f..543874f380a4 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -29,27 +29,35 @@
b_volume = 0
else if(heart.stabilized)
b_volume *= 1 * heart.stabilized_effectiveness
- else if(heart.damage > 1 && heart.damage < heart.min_bruised_damage)
- b_volume *= 0.8
- else if(heart.damage >= heart.min_bruised_damage && heart.damage < heart.min_broken_damage)
- b_volume *= 0.6
- else if(heart.damage >= heart.min_broken_damage && heart.damage < INFINITY)
- b_volume *= 0.3
+ else if(heart.damage >= heart.organ_status >= ORGAN_BRUISED)
+ b_volume *= Clamp(100 - (2 * heart.damage), 30, 100) / 100
//Effects of bloodloss
+ if(b_volume <= BLOOD_VOLUME_SAFE)
+ /// The blood volume turned into a %, with BLOOD_VOLUME_NORMAL being 100%
+ var/blood_percentage = b_volume / (BLOOD_VOLUME_NORMAL / 100)
+ /// How much oxyloss will there be from the next time blood processes
+ var/additional_oxyloss = (100 - blood_percentage) / 5
+ /// The limit of the oxyloss gained, ignoring oxyloss from the switch statement
+ var/maximum_oxyloss = Clamp((100 - blood_percentage) / 2, oxyloss, 100)
+ if(oxyloss < maximum_oxyloss)
+ oxyloss += max(additional_oxyloss, 0)
+
+ //Bloodloss effects on nutrition
+ if(nutrition >= 300)
+ nutrition -= 10
+ else if(nutrition >= 200)
+ nutrition -= 3
+
switch(b_volume)
if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
if(prob(1))
var/word = pick("dizzy","woozy","faint")
to_chat(src, SPAN_DANGER("You feel [word]."))
- if(oxyloss < 20)
- oxyloss += 3
if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
if(eye_blurry < 50)
AdjustEyeBlur(6)
- if(oxyloss < 50)
- oxyloss += 10
- oxyloss += 2
+ oxyloss += 3
if(prob(15))
apply_effect(rand(1,3), PARALYZE)
var/word = pick("dizzy","woozy","faint")
@@ -57,7 +65,7 @@
if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
if(eye_blurry < 50)
AdjustEyeBlur(6)
- oxyloss += 5
+ oxyloss += 8
toxloss += 3
if(prob(15))
apply_effect(rand(1,3), PARALYZE)
@@ -66,13 +74,6 @@
if(0 to BLOOD_VOLUME_SURVIVE)
death(create_cause_data("blood loss"))
- // Without enough blood you slowly go hungry.
- if(blood_volume < BLOOD_VOLUME_SAFE)
- if(nutrition >= 300)
- nutrition -= 10
- else if(nutrition >= 200)
- nutrition -= 3
-
// Xeno blood regeneration
/mob/living/carbon/xenomorph/handle_blood()
if(stat != DEAD) //Only living xenos regenerate blood
diff --git a/code/modules/mob/living/carbon/human/species/yautja/fake_sounds.dm b/code/modules/mob/living/carbon/human/species/yautja/fake_sounds.dm
index f29a990b6254..80aa853c663f 100644
--- a/code/modules/mob/living/carbon/human/species/yautja/fake_sounds.dm
+++ b/code/modules/mob/living/carbon/human/species/yautja/fake_sounds.dm
@@ -2,21 +2,25 @@
category = YAUTJA_EMOTE_CATEGORY_FAKESOUND
/datum/emote/living/carbon/human/yautja/fake_sound/aliengrowl
+ override_say = "Xenomorph growl"
key = "aliengrowl"
/datum/emote/living/carbon/human/yautja/fake_sound/aliengrowl/get_sound(mob/living/user)
return pick('sound/voice/alien_growl1.ogg', 'sound/voice/alien_growl2.ogg')
/datum/emote/living/carbon/human/yautja/fake_sound/alienhelp
+ override_say = "Xenomorph needs help"
key = "alienhelp"
/datum/emote/living/carbon/human/yautja/fake_sound/alienhelp/get_sound(mob/living/user)
return pick('sound/voice/alien_help1.ogg', 'sound/voice/alien_help2.ogg')
/datum/emote/living/carbon/human/yautja/fake_sound/malescream
+ override_say = "Human scream (male)"
key = "malescream"
sound = "male_scream"
/datum/emote/living/carbon/human/yautja/fake_sound/femalescream
+ override_say = "Human scream (female)"
key = "femalescream"
sound = "female_scream"
diff --git a/code/modules/mob/living/carbon/human/species/yautja/fake_voice.dm b/code/modules/mob/living/carbon/human/species/yautja/fake_voice.dm
index 409fa83e7f1b..7e2c73fd41e4 100644
--- a/code/modules/mob/living/carbon/human/species/yautja/fake_voice.dm
+++ b/code/modules/mob/living/carbon/human/species/yautja/fake_voice.dm
@@ -2,49 +2,58 @@
category = YAUTJA_EMOTE_CATEGORY_VOICE
/datum/emote/living/carbon/human/yautja/voice/anytime
+ override_say = "Anytime."
key = "anytime"
sound = 'sound/voice/pred_anytime.ogg'
/datum/emote/living/carbon/human/yautja/voice/helpme
+ override_say = "Help me!"
key = "helpme"
sound = 'sound/voice/pred_helpme.ogg'
volume = 25
/datum/emote/living/carbon/human/yautja/voice/iseeyou
+ override_say = "I see you."
key = "iseeyou"
sound = 'sound/hallucinations/i_see_you2.ogg'
/datum/emote/living/carbon/human/yautja/voice/itsatrap
+ override_say = "It's a trap."
key = "itsatrap"
sound = 'sound/voice/pred_itsatrap.ogg'
volume = 25
/datum/emote/living/carbon/human/yautja/voice/overhere
+ override_say = "Over here."
key = "overhere"
sound = 'sound/voice/pred_overhere.ogg'
volume = 25
/datum/emote/living/carbon/human/yautja/voice/turnaround
+ override_say = "Turn around."
key = "turnaround"
sound = 'sound/voice/pred_turnaround.ogg'
volume = 25
/datum/emote/living/carbon/human/yautja/voice/comeonout
+ override_say = "Come on out, motherfucker."
key = "comeonout"
sound = 'sound/voice/pred_come_on_out.ogg'
/datum/emote/living/carbon/human/yautja/voice/overthere
+ override_say = "Over there."
key = "overthere"
sound = 'sound/voice/pred_over_there.ogg'
/datum/emote/living/carbon/human/yautja/voice/uglyfreak
+ override_say = "Come on, you ugly freak."
key = "uglyfreak"
sound = 'sound/voice/pred_ugly_freak.ogg'
diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm
index 54f5892ca93c..4ce266f70596 100644
--- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm
@@ -337,8 +337,8 @@
if(larva_embryo.client)
larva_embryo.set_lighting_alpha_from_prefs(larva_embryo.client)
- larva_embryo.attack_log += "\[[time_stamp()]\] chestbursted from [key_name(victim)]"
- victim.attack_log += "\[[time_stamp()]\] Was chestbursted, larva was [key_name(larva_embryo)]"
+ larva_embryo.attack_log += "\[[time_stamp()]\] chestbursted from [key_name(victim)] in [get_area_name(larva_embryo)] at X[victim.x], Y[victim.y], Z[victim.z]"
+ victim.attack_log += "\[[time_stamp()]\] Was chestbursted in [get_area_name(larva_embryo)] at X[victim.x], Y[victim.y], Z[victim.z]. The larva was [key_name(larva_embryo)]."
if(burstcount)
step(larva_embryo, pick(cardinal))
@@ -359,7 +359,7 @@
if(!victim.first_xeno)
to_chat(larva_embryo, SPAN_XENOHIGHDANGER("The Queen's will overwhelms your instincts..."))
to_chat(larva_embryo, SPAN_XENOHIGHDANGER("\"[hive.hive_orders]\""))
- log_attack("[key_name(victim)] chestbursted, the larva was [key_name(larva_embryo)].") //this is so that admins are not spammed with los logs
+ log_attack("[key_name(victim)] chestbursted in [get_area_name(larva_embryo)] at X[victim.x], Y[victim.y], Z[victim.z]. The larva was [key_name(larva_embryo)].") //this is so that admins are not spammed with los logs
for(var/obj/item/alien_embryo/AE in victim)
qdel(AE)
diff --git a/code/modules/mob/living/carbon/xenomorph/XenoUpgrade.dm b/code/modules/mob/living/carbon/xenomorph/XenoUpgrade.dm
index a89a3ad32e85..ae03d0646657 100644
--- a/code/modules/mob/living/carbon/xenomorph/XenoUpgrade.dm
+++ b/code/modules/mob/living/carbon/xenomorph/XenoUpgrade.dm
@@ -3,6 +3,7 @@
return
age = XENO_NORMAL
+ var/hours_as_xeno = client.get_total_xeno_playtime()
var/hours_as_caste = get_job_playtime(client, caste.caste_type)
switch(hours_as_caste)
@@ -15,11 +16,16 @@
if(JOB_PLAYTIME_TIER_4 to INFINITY)
age = XENO_PRIME
+ if(hours_as_xeno < JOB_PLAYTIME_TIER_1)
+ age = XENO_YOUNG
+
// For people who wish to remain anonymous
if(!client.prefs.playtime_perks)
age = XENO_NORMAL
switch(age)
+ if(XENO_YOUNG)
+ age_prefix = "Young "
if(XENO_NORMAL)
age_prefix = ""
if(XENO_MATURE)
diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
index 246e2d2809db..8e64afa3f733 100644
--- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
+++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
@@ -982,3 +982,12 @@
var/matrix/A = matrix()
apply_transform(A)
stat &= ~BROKEN //Remove broken. MAGICAL REPAIRS
+
+//Misc
+/obj/structure/prop/invuln/joey/attack_alien(mob/living/carbon/xenomorph/alien)
+ alien.animation_attack_on(src)
+ alien.visible_message(SPAN_DANGER("[alien] [alien.slashes_verb] [src]!"), \
+ SPAN_DANGER("You [alien.slash_verb] [src]!"), null, 5)
+ playsound(loc, "alien_claw_metal", 25, 1)
+ attacked()
+ return XENO_ATTACK_ACTION
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
index f3a354b42ad0..8a7425e2071a 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
@@ -68,6 +68,7 @@
/mob/hologram/queen
name = "Queen Eye"
action_icon_state = "queen_exit"
+ motion_sensed = TRUE
color = "#a800a8"
@@ -412,17 +413,24 @@
if(queen_aged)
age_xeno()
switch(age)
- if(XENO_NORMAL) name = "[name_prefix]Queen" //Young
- if(XENO_MATURE) name = "[name_prefix]Elder Queen" //Mature
- if(XENO_ELDER) name = "[name_prefix]Elder Empress" //Elite
- if(XENO_ANCIENT) name = "[name_prefix]Ancient Empress" //Ancient
- if(XENO_PRIME) name = "[name_prefix]Prime Empress" //Primordial
+ if(XENO_YOUNG)
+ name = "[name_prefix]Young Queen" //Young
+ if(XENO_NORMAL)
+ name = "[name_prefix]Queen" //Regular
+ if(XENO_MATURE)
+ name = "[name_prefix]Elder Queen" //Mature
+ if(XENO_ELDER)
+ name = "[name_prefix]Elder Empress" //Elite
+ if(XENO_ANCIENT)
+ name = "[name_prefix]Ancient Empress" //Ancient
+ if(XENO_PRIME)
+ name = "[name_prefix]Prime Empress" //Primordial
else
age = XENO_NORMAL
if(client)
hud_update()
- name = "[name_prefix]Young Queen"
+ name = "[name_prefix]Immature Queen"
var/name_client_prefix = ""
var/name_client_postfix = ""
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm
index 69e5b82aa307..f946ec44b5b7 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm
@@ -71,7 +71,7 @@
/mob/living/carbon/xenomorph/runner/initialize_pass_flags(datum/pass_flags_container/PF)
..()
if (PF)
- PF.flags_pass = PASS_FLAGS_CRAWLER
+ PF.flags_pass |= PASS_FLAGS_CRAWLER
/datum/behavior_delegate/runner_base
name = "Base Runner Behavior Delegate"
diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm
index 7a2196a3c209..7b64ae9f69d7 100644
--- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm
+++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm
@@ -159,7 +159,12 @@
new /obj/effect/particle_effect/smoke/acid_runner_harmless(T)
playsound(bound_xeno, 'sound/effects/blobattack.ogg', 75)
if(bound_xeno.client && bound_xeno.hive)
- addtimer(CALLBACK(bound_xeno.hive, TYPE_PROC_REF(/datum/hive_status, free_respawn), bound_xeno.client), 5 SECONDS)
+ var/datum/hive_status/hive_status = bound_xeno.hive
+ var/turf/spawning_turf = get_turf(bound_xeno)
+ if(!hive_status.hive_location)
+ addtimer(CALLBACK(bound_xeno.hive, TYPE_PROC_REF(/datum/hive_status, respawn_on_turf), bound_xeno.client, spawning_turf), 0.5 SECONDS)
+ else
+ addtimer(CALLBACK(bound_xeno.hive, TYPE_PROC_REF(/datum/hive_status, free_respawn), bound_xeno.client), 5 SECONDS)
bound_xeno.gib()
/mob/living/carbon/xenomorph/runner/ventcrawl_carry()
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
index acc72586e647..8a1f0ce00f3b 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -317,6 +317,7 @@
XENO_STRUCTURE_EGGMORPH = 6,
XENO_STRUCTURE_EVOPOD = 2,
XENO_STRUCTURE_RECOVERY = 6,
+ XENO_STRUCTURE_PYLON = 2,
)
var/global/list/hive_structure_types = list(
@@ -370,17 +371,25 @@
if(hivenumber != XENO_HIVE_NORMAL)
return
- RegisterSignal(SSdcs, COMSIG_GLOB_POST_SETUP, PROC_REF(setup_evolution_announcements))
+ RegisterSignal(SSdcs, COMSIG_GLOB_POST_SETUP, PROC_REF(post_setup))
-/datum/hive_status/proc/setup_evolution_announcements()
+/datum/hive_status/proc/post_setup()
SIGNAL_HANDLER
+ setup_evolution_announcements()
+ setup_pylon_limits()
+
+/datum/hive_status/proc/setup_evolution_announcements()
for(var/time in GLOB.xeno_evolve_times)
if(time == "0")
continue
addtimer(CALLBACK(src, PROC_REF(announce_evolve_available), GLOB.xeno_evolve_times[time]), text2num(time))
+/// Sets up limits on pylons in New() for potential futureproofing with more static comms
+/datum/hive_status/proc/setup_pylon_limits()
+ hive_structures_limit[XENO_STRUCTURE_PYLON] = length(GLOB.all_static_telecomms_towers) || 2
+
/datum/hive_status/proc/announce_evolve_available(list/datum/caste_datum/available_castes)
var/list/castes_available = list()
@@ -883,6 +892,7 @@
for(var/obj/effect/alien/resin/special/S in hive_structures[name_ref])
if(get_area(S) == hijacked_dropship)
continue
+ S.hijack_delete = TRUE
hive_structures[name_ref] -= S
qdel(S)
for(var/mob/living/carbon/xenomorph/xeno as anything in totalXenos)
@@ -920,10 +930,14 @@
embryo.hivenumber = XENO_HIVE_FORSAKEN
potential_host.update_med_icon()
for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list)
- if((isspecieshuman(current_human) || isspeciessynth(current_human)) && current_human.job)
- var/turf/turf = get_turf(current_human)
- if(is_mainship_level(turf?.z))
- shipside_humans_weighted_count += RoleAuthority.calculate_role_weight(current_human.job)
+ if(!(isspecieshuman(current_human) || isspeciessynth(current_human)))
+ continue
+ var/datum/job/job = RoleAuthority.roles_for_mode[current_human.job]
+ if(!job)
+ continue
+ var/turf/turf = get_turf(current_human)
+ if(is_mainship_level(turf?.z))
+ shipside_humans_weighted_count += RoleAuthority.calculate_role_weight(job)
hijack_burrowed_surge = TRUE
hijack_burrowed_left = max(n_ceil(shipside_humans_weighted_count * 0.5) - xenos_count, 5)
hivecore_cooldown = FALSE
@@ -936,6 +950,24 @@
else
hive_ui.update_burrowed_larva()
+/datum/hive_status/proc/respawn_on_turf(client/xeno_client, turf/spawning_turf)
+ var/mob/living/carbon/xenomorph/larva/new_xeno = spawn_hivenumber_larva(spawning_turf, hivenumber)
+ if(isnull(new_xeno))
+ return FALSE
+
+ if(!SSticker.mode.transfer_xeno(xeno_client.mob, new_xeno))
+ qdel(new_xeno)
+ return FALSE
+
+ new_xeno.visible_message(SPAN_XENODANGER("A larva suddenly emerges from a dead husk!"),
+ SPAN_XENOANNOUNCE("The hive has no core! You manage to emerge from your old husk as a larva!"))
+ msg_admin_niche("[key_name(new_xeno)] respawned at \a [spawning_turf]. [ADMIN_JMP(spawning_turf)]")
+ playsound(new_xeno, 'sound/effects/xeno_newlarva.ogg', 50, 1)
+ if(new_xeno.client?.prefs?.toggles_flashing & FLASH_POOLSPAWN)
+ window_flash(new_xeno.client)
+
+ hive_ui.update_burrowed_larva()
+
/datum/hive_status/proc/do_buried_larva_spawn(mob/xeno_candidate)
var/spawning_area
if(hive_location)
@@ -1104,6 +1136,10 @@
/datum/hive_status/proc/increase_larva_after_burst()
var/extra_per_burst = CONFIG_GET(number/extra_larva_per_burst)
partial_larva += extra_per_burst
+ convert_partial_larva_to_full_larva()
+
+///Called after times when partial larva are added to process them to stored larva
+/datum/hive_status/proc/convert_partial_larva_to_full_larva()
for(var/i = 1 to partial_larva)
partial_larva--
stored_larva++
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index f8c86f9c5171..1839fe191627 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -245,6 +245,8 @@
return /datum/equipment_preset/uscm_ship/so
if(JOB_XO)
return /datum/equipment_preset/uscm_ship/xo
+ if(JOB_AUXILIARY_OFFICER)
+ return /datum/equipment_preset/uscm_ship/auxiliary_officer
if(JOB_INTEL)
return /datum/equipment_preset/uscm/intel/full
if(JOB_PILOT)
@@ -277,7 +279,7 @@
if(JOB_MAINT_TECH)
return /datum/equipment_preset/uscm_ship/maint
if(JOB_CHIEF_REQUISITION)
- return /datum/equipment_preset/uscm_ship/ro
+ return /datum/equipment_preset/uscm_ship/qm
if(JOB_CARGO_TECH)
return /datum/equipment_preset/uscm_ship/cargo
if(JOB_CMO)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 7665e0a5d7ab..3b10c757f2f4 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -256,6 +256,7 @@
t = replacetext(t, "\[logo\]", "")
t = replacetext(t, "\[wy\]", "")
t = replacetext(t, "\[uscm\]", "")
+ t = replacetext(t, "\[upp\]", "")
t = "[t]"
else // If it is a crayon, and he still tries to use these, make them empty!
@@ -606,6 +607,15 @@
color = "green"
info = "
I could not do it, the fucking marshals, the minions of THEM, have gotten a whiff of my co-workers plans and started raiding us pre-emptively. We managed to get word of it and erected a few barricades to slow them down, but it is too late. Our plan, my plan to save humanity has turned to dust.
As I lay and write this, they are gassing the entire area with tear gas, while gunshots echo around the caves. \n They have gotten to my mind already, their voices are... laughing, saying that, \" it's over \" and that \n “we have risen\". Their voices are mocking me as I could do nothing to prevent their rise \n Just as I am about to finish my final entry, I overhear a few panicked radio calls from a dead officer's radio, about a code red lambda breach, and \" X-RAYS OUT OF CONTAINMENT\". \n However, not a single one of their cries has been met with a response as their fellow officers are too preoccupied with beating up poor miners... \n They have won.... they have PLANNED THIS all along.... \n only God may save us now..."
+/obj/item/paper/bigred/upp
+ name = "UPP Orders"
+
+/obj/item/paper/bigred/upp/Initialize(mapload, photo_list)
+ . = ..()
+
+ var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
+ info = "
Union Of Progressive People's Fourth Fleet Orders For 173rd Airborne Reconnaissance: 2nd Platoon No.52
Order of Military Officer of the UPP Kolonel Ganbaatar Commander of MV-35 Date: 2182 On Special Mission The actions of the hostile Weyland-Yutani corporation on the fringes of the Neroid sector have grown increasingly intolerable. However, evidence suggesting they are researching into the creation and deployment of some form of biological weapons program represent an unacceptable risk to the security of UPP interests in this sector. The risk of these items falling into UA/USCM hands is unacceptable.
Orders for the Boris squad of the 173rd Airborne Recon are as follows. Initiate airborne reconnaissance of WY colony Oxley's Buttle, Trijent Dam, location on planet Raijin (UA Code: LV-670). Ascertain veracity of onsight biological weapons program. If positive confirmation of the weapons program is identified, authorization for rapid assault and recovery is granted. Avoid all contact with UA/USCM military forces, abort missions if UA/USCM forces are encountered.
Authorizing Officer: Gaanbatar Name and Rank: Kolonel
["upplogo.png"]])
["wylogo.png"]])
")
t = replacetext(t, "\[wy\]", "["uscmlogo.png"]])
")
+ t = replacetext(t, "\[upp\]", "