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/xeno.dm b/code/__DEFINES/xeno.dm
index 82237cd793b2..0f822385ad13 100644
--- a/code/__DEFINES/xeno.dm
+++ b/code/__DEFINES/xeno.dm
@@ -8,6 +8,9 @@
#define TUNNEL_ENTER_BIG_XENO_DELAY 120
#define TUNNEL_ENTER_LARVA_DELAY 10
+/// The duration it takes a player controlled facehugger to leap or hug adjacently
+#define FACEHUGGER_WINDUP_DURATION 1 SECONDS
+
// Defines for action types and click delays used by xenomorph/unarmedattack() and attack_alien().
/// Full attack delay.
@@ -165,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 ef539b8459c7..4936609d892e 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -415,6 +415,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/_onclick/observer.dm b/code/_onclick/observer.dm
index 5acfe74f2965..b67953b1edbe 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -53,6 +53,13 @@
ManualFollow(target)
return FALSE
+ if(xeno.hive)
+ for(var/mob_name in xeno.hive.banished_ckeys)
+ if(xeno.hive.banished_ckeys[mob_name] == ckey)
+ to_chat(src, SPAN_WARNING("You are banished from the [xeno.hive], you may not rejoin unless the Queen re-admits you or dies."))
+ ManualFollow(target)
+ return FALSE
+
if(alert(src, "Are you sure you want to transfer yourself into [xeno]?", "Confirm Transfer", "Yes", "No") != "Yes")
return FALSE
if(((!islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER) || (islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER_LARVA)) || xeno.stat == DEAD) // Do it again, just in case
diff --git a/code/datums/components/weed_food.dm b/code/datums/components/weed_food.dm
index 0c578b661517..ce6c17e0af95 100644
--- a/code/datums/components/weed_food.dm
+++ b/code/datums/components/weed_food.dm
@@ -193,6 +193,8 @@
return FALSE
if(!parent_turf?.weeds)
return FALSE
+ if(SEND_SIGNAL(parent_mob, COMSIG_ATTEMPT_MOB_PULL) & COMPONENT_CANCEL_MOB_PULL)
+ return FALSE
if(unmerged_time == world.time)
return merge_with_weeds() // Weeds upgraded, re-merge now re-using the apperance
@@ -245,6 +247,9 @@
UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE)
parent_buckle = null
+ if(SEND_SIGNAL(parent_mob, COMSIG_ATTEMPT_MOB_PULL) & COMPONENT_CANCEL_MOB_PULL)
+ return FALSE
+
absorbing_weeds = parent_turf?.weeds
if(!absorbing_weeds)
return FALSE
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/entities/player.dm b/code/datums/entities/player.dm
index 9b8f95938de6..ed97c4eafaae 100644
--- a/code/datums/entities/player.dm
+++ b/code/datums/entities/player.dm
@@ -105,6 +105,7 @@ BSQL_PROTECT_DATUM(/datum/entity/player)
note.player_id = id
note.text = note_text
note.date = "[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]"
+ note.round_id = GLOB.round_id
note.is_confidential = is_confidential
note.note_category = note_category
note.is_ban = is_ban
diff --git a/code/datums/entities/player_note.dm b/code/datums/entities/player_note.dm
index f6662a153113..420bb5f0a470 100644
--- a/code/datums/entities/player_note.dm
+++ b/code/datums/entities/player_note.dm
@@ -1,8 +1,11 @@
+#define NOTE_ROUND_ID(note_entity) note_entity.round_id ? "(ID: [note_entity.round_id])" : ""
+
/datum/entity/player_note
var/player_id
var/admin_id
var/text
var/date
+ var/round_id
var/is_ban = FALSE
var/ban_time
var/is_confidential = FALSE
@@ -19,15 +22,16 @@ BSQL_PROTECT_DATUM(/datum/entity/player_note)
entity_type = /datum/entity/player_note
table_name = "player_notes"
field_types = list(
- "player_id"=DB_FIELDTYPE_BIGINT,
- "admin_id"=DB_FIELDTYPE_BIGINT,
- "text"=DB_FIELDTYPE_STRING_MAX,
- "date"=DB_FIELDTYPE_STRING_LARGE,
- "is_ban"=DB_FIELDTYPE_INT,
- "ban_time"=DB_FIELDTYPE_BIGINT,
- "is_confidential"=DB_FIELDTYPE_INT,
- "admin_rank"=DB_FIELDTYPE_STRING_MEDIUM,
- "note_category" =DB_FIELDTYPE_INT,
+ "player_id" = DB_FIELDTYPE_BIGINT,
+ "admin_id" = DB_FIELDTYPE_BIGINT,
+ "text" = DB_FIELDTYPE_STRING_MAX,
+ "date" = DB_FIELDTYPE_STRING_LARGE,
+ "round_id" = DB_FIELDTYPE_BIGINT,
+ "is_ban" = DB_FIELDTYPE_INT,
+ "ban_time" = DB_FIELDTYPE_BIGINT,
+ "is_confidential" = DB_FIELDTYPE_INT,
+ "admin_rank" = DB_FIELDTYPE_STRING_MEDIUM,
+ "note_category" = DB_FIELDTYPE_INT,
)
/datum/entity_meta/player_note/on_read(datum/entity/player_note/note)
@@ -64,6 +68,7 @@ BSQL_PROTECT_DATUM(/datum/entity/player_note)
var/is_ban
var/admin_ckey
var/date
+ var/round_id
var/ban_time
var/is_confidential
var/admin_rank
@@ -79,6 +84,7 @@ BSQL_PROTECT_DATUM(/datum/entity/player_note)
"is_ban",
"admin_ckey" = "admin.ckey",
"date",
+ "round_id",
"ban_time",
"is_confidential",
"admin_rank",
@@ -88,4 +94,4 @@ BSQL_PROTECT_DATUM(/datum/entity/player_note)
/// Returns all notes associated with a CKEY, structured as a list of strings.
/proc/get_all_notes(player_ckey)
for(var/datum/view_record/note_view/note in DB_VIEW(/datum/view_record/note_view, DB_COMP("player_ckey", DB_EQUALS, player_ckey)))
- LAZYADDASSOC(., "[note.note_category]", "\"[note.text]\", by [note.admin_ckey] ([note.admin_rank]) on [note.date]")
+ LAZYADDASSOC(., "[note.note_category]", "\"[note.text]\", by [note.admin_ckey] ([note.admin_rank]) on [note.date] ([note.round_id])")
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..584d466d948c 100644
--- a/code/datums/skills.dm
+++ b/code/datums/skills.dm
@@ -699,6 +699,23 @@ 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_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 +1611,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/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
index a7e8ab612bb4..efb92dd1678e 100644
--- a/code/game/gamemodes/cm_initialize.dm
+++ b/code/game/gamemodes/cm_initialize.dm
@@ -576,6 +576,11 @@ Additional game mode variables.
to_chat(xeno_candidate, SPAN_WARNING("The selected hive does not have a hive core to spawn from!"))
return
+ for(var/mob_name in hive.banished_ckeys)
+ if(hive.banished_ckeys[mob_name] == xeno_candidate.ckey)
+ to_chat(xeno_candidate, SPAN_WARNING("You are banished from the [hive], you may not rejoin unless the Queen re-admits you or dies."))
+ return
+
hive.hive_location.spawn_lesser_drone(xeno_candidate)
return TRUE
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/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
index 64d8795be3d2..e172939c847f 100644
--- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
+++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
@@ -664,8 +664,8 @@
/obj/item/ammo_magazine/rocket/wp)
if(2) //Smartgun supplies
spawnitems = list(
- /obj/item/cell/high,
- /obj/item/cell/high,
+ /obj/item/smartgun_battery,
+ /obj/item/smartgun_battery,
/obj/item/ammo_magazine/smartgun,
/obj/item/ammo_magazine/smartgun,
/obj/item/ammo_magazine/smartgun,
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/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/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm
index 24b60079692b..157f79cd43c2 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,6 +23,8 @@
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 ..()
@@ -161,11 +163,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 +203,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 +313,38 @@ 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),
+ ))
diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
index dd11cea0f242..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),
@@ -75,7 +76,8 @@
list("Motion Detector", 5, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR),
list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR),
list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR),
- list("Machete Scabbard (Full)", 2, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR)
+ list("Machete Scabbard (Full)", 2, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR),
+ list("Stethoscope", 2, /obj/item/clothing/accessory/stethoscope, null, VENDOR_ITEM_REGULAR)
)
@@ -250,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),
@@ -263,6 +265,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("USCM RTO Pack", 12, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR),
list("USCM Welderpack", 12, /obj/item/storage/backpack/marine/engineerpack, null, VENDOR_ITEM_REGULAR),
list("USCM Weldersatchel", 12, /obj/item/storage/backpack/marine/engineerpack/satchel, null, VENDOR_ITEM_REGULAR),
+
+ list("OTHER", 0, null, null, null),
+ list("Red Armband", 6, /obj/item/clothing/accessory/armband, null, VENDOR_ITEM_REGULAR),
+ list("Yellow Armband", 6, /obj/item/clothing/accessory/armband/engine, null, VENDOR_ITEM_REGULAR),
+ list("Green Armband", 6, /obj/item/clothing/accessory/armband/medgreen, null, VENDOR_ITEM_REGULAR),
+
))
/obj/structure/machinery/cm_vending/clothing/synth/snowflake
diff --git a/code/game/machinery/vending/vendor_types/engineering.dm b/code/game/machinery/vending/vendor_types/engineering.dm
index 83f69ae09889..f0a81d990491 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,7 @@
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("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/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm
index f85657e887a8..cdf64368c8d4 100644
--- a/code/game/machinery/vending/vendor_types/requisitions.dm
+++ b/code/game/machinery/vending/vendor_types/requisitions.dm
@@ -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 05784ec3c161..445ae80d401c 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
@@ -110,6 +110,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list(
list("Technician Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Technician Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("Technician Welder-Satchel", 0, /obj/item/storage/backpack/marine/engineerpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
+ list("Technician Welder Chestrig", 0, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("BELT (CHOOSE 1)", 0, null, null, null),
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, 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 9775c20cac33..28cc72a1708e 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
@@ -77,6 +77,7 @@
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("BELTS", -1, null, null),
@@ -193,7 +194,7 @@
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),
)
@@ -280,7 +281,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/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/items.dm b/code/game/objects/items.dm
index 2edfc3d6ea2b..dd5e99545d11 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1064,3 +1064,7 @@ cases. Override_icon_state should be a list.*/
animate(attack_image, alpha = 175, transform = copy_transform.Scale(0.75), pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3)
animate(time = 1)
animate(alpha = 0, time = 3, easing = CIRCULAR_EASING|EASE_OUT)
+
+///Called by /mob/living/carbon/swap_hand() when hands are swapped
+/obj/item/proc/hands_swapped(mob/living/carbon/swapper_of_hands)
+ return
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/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/portable_vendor.dm b/code/game/objects/items/devices/portable_vendor.dm
index 0b96b859c4ac..875087efbff0 100644
--- a/code/game/objects/items/devices/portable_vendor.dm
+++ b/code/game/objects/items/devices/portable_vendor.dm
@@ -270,4 +270,7 @@
list("MISC", 0, null, null, null),
list("Hollow Cane", 15, /obj/item/weapon/pole/fancy_cane/this_is_a_knife, "white", "A hollow cane that can store any commonplace sharp weaponry. Said weapon not included."),
+
+ list("AMMO", 0, null, null, null),
+ list("ES-4 stun magazine", 10, /obj/item/ammo_magazine/pistol/es4, "white", "Holds 19 rounds of specialized Conductive 9mm."),
)
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/predator.dm b/code/game/objects/items/stacks/predator.dm
index e500932b08f6..42874b907e02 100644
--- a/code/game/objects/items/stacks/predator.dm
+++ b/code/game/objects/items/stacks/predator.dm
@@ -51,6 +51,8 @@
SPAN_NOTICE("You start hanging [victim] up by the rope..."))
if(!do_after(user, 3 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, victim))
return
+ if(victim.anchored)
+ return // Just in case weed_food took them during this time
user.visible_message(SPAN_WARNING("[user] hangs [victim] from the ceiling!"), SPAN_NOTICE("You finish hanging [victim]."))
user.stop_pulling()
victim.get_hung()
@@ -106,4 +108,5 @@
apply_transform(A)
pixel_x = 0
pixel_y = 0
+ Moved(loc, NONE, TRUE) // Trigger any movement signals
return COMPONENT_CANCEL_ATTACK
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 e36225177d91..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."
@@ -914,6 +918,16 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
max_fuel = 100
worn_accessible = TRUE
+/obj/item/storage/backpack/marine/engineerpack/welder_chestrig
+ name = "\improper Technician Welder Chestrig"
+ desc = "A specialized Chestrig worn by technicians and engineers. It carries one medium fuel tank for quick welder refueling and use."
+ icon_state = "welder_chestrig"
+ item_state = "welder_chestrig"
+ max_storage_space = 12
+ has_gamemode_skin = FALSE
+ max_fuel = 100
+ worn_accessible = TRUE
+
// Pyrotechnician Spec backpack fuel tank
/obj/item/storage/backpack/marine/engineerpack/flamethrower
name = "\improper USCM Pyrotechnician G6-2 fueltank"
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 290460da758f..d12e5b2808a1 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."
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/lockbox.dm b/code/game/objects/items/storage/lockbox.dm
index aa9d91921fae..30be2f6bc2e2 100644
--- a/code/game/objects/items/storage/lockbox.dm
+++ b/code/game/objects/items/storage/lockbox.dm
@@ -54,11 +54,9 @@
req_access = list(ACCESS_WY_CORPORATE)
/obj/item/storage/lockbox/loyalty/fill_preset_inventory()
- new /obj/item/ammo_magazine/pistol/mod88(src)
- new /obj/item/ammo_magazine/pistol/mod88(src)
- new /obj/item/ammo_magazine/pistol/mod88/rubber(src)
- new /obj/item/ammo_magazine/pistol/mod88/rubber(src)
-
+ new /obj/item/ammo_magazine/pistol/es4(src)
+ new /obj/item/ammo_magazine/pistol/es4(src)
+ new /obj/item/ammo_magazine/pistol/es4(src)
/obj/item/storage/lockbox/cluster
name = "lockbox of cluster flashbangs"
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/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/barricade/deployable.dm b/code/game/objects/structures/barricade/deployable.dm
index 7ed2eefd75fb..77aa6b7e6816 100644
--- a/code/game/objects/structures/barricade/deployable.dm
+++ b/code/game/objects/structures/barricade/deployable.dm
@@ -23,56 +23,38 @@
. = ..()
. += SPAN_INFO("Drag its sprite onto yourself to undeploy.")
-/obj/structure/barricade/deployable/attackby(obj/item/W, mob/user)
+/obj/structure/barricade/deployable/attackby(obj/item/item, mob/user)
- if(iswelder(W))
- if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH))
+ if(iswelder(item))
+ if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH))
to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
return
if(user.action_busy)
return
- var/obj/item/tool/weldingtool/WT = W
+ var/obj/item/tool/weldingtool/welder = item
if(health == maxhealth)
to_chat(user, SPAN_WARNING("[src] doesn't need repairs."))
return
- weld_cade(WT, user)
+ weld_cade(welder, user)
return
- else if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH))
+ else if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR))
if(user.action_busy)
return
- if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
- to_chat(user, SPAN_WARNING("You do not know where the loosening bolts are on [src]..."))
- return
- else
- if(build_state == BARRICADE_BSTATE_UNSECURED)
- to_chat(user, SPAN_NOTICE("You tighten the bolts on [src]."))
- playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1)
- build_state = BARRICADE_BSTATE_SECURED
- else
- to_chat(user, SPAN_NOTICE("You loosen the bolts on [src]."))
- playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1)
- build_state = BARRICADE_BSTATE_UNSECURED
-
- else if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR))
- if(build_state != BARRICADE_BSTATE_UNSECURED)
- return
- if(user.action_busy)
- return
- if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
+ if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
to_chat(user, SPAN_WARNING("You do not know how to collapse [src] using a crowbar..."))
return
else
user.visible_message(SPAN_NOTICE("[user] starts collapsing [src]."), \
SPAN_NOTICE("You begin collapsing [src]..."))
- playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1)
- if(do_after(user, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, src))
+ playsound(loc, 'sound/items/Crowbar.ogg', 25, 1)
+ if(do_after(user, 1.5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src))
collapse(usr)
else
to_chat(user, SPAN_WARNING("You stop collapsing [src]."))
- if(try_nailgun_usage(W, user))
+ if(try_nailgun_usage(item, user))
return
. = ..()
@@ -87,20 +69,20 @@
if(over_object == usr && Adjacent(usr))
usr.visible_message(SPAN_NOTICE("[usr] starts collapsing [src]."),
SPAN_NOTICE("You begin collapsing [src]."))
- playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1)
+ playsound(loc, 'sound/items/Crowbar.ogg', 25, 1)
if(do_after(usr, 3 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src))
collapse(usr)
else
to_chat(usr, SPAN_WARNING("You stop collapsing [src]."))
/obj/structure/barricade/deployable/proc/collapse(mob/living/carbon/human/user)
- var/obj/item/stack/folding_barricade/FB = new source_type(loc)
- FB.health = health
- FB.maxhealth = maxhealth
+ var/obj/item/stack/folding_barricade/folding = new source_type(loc)
+ folding.stack_health = list(health)
+ folding.maxhealth = maxhealth
if(istype(user))
user.visible_message(SPAN_NOTICE("[user] collapses [src]."),
SPAN_NOTICE("You collapse [src]."))
- user.put_in_active_hand(FB)
+ user.put_in_active_hand(folding)
qdel(src)
/obj/structure/barricade/deployable/initialize_pass_flags(datum/pass_flags_container/PF)
@@ -133,6 +115,14 @@
)
icon = 'icons/obj/items/marine-items.dmi'
+ var/list/stack_health = list()
+
+/obj/item/stack/folding_barricade/Initialize(mapload, init_amount)
+ . = ..()
+ for(var/counter in 1 to amount)
+ stack_health += initial(health)
+
+
/obj/item/stack/folding_barricade/update_icon()
. = ..()
icon_state = "folding-[amount]"
@@ -153,16 +143,16 @@
var/obj/structure/blocker/anti_cade/AC = locate(/obj/structure/blocker/anti_cade) in OT // for M2C HMG, look at smartgun_mount.dm
if(!OT.allow_construction)
- to_chat(usr, SPAN_WARNING("[src.singular_name] must be constructed on a proper surface!"))
+ to_chat(usr, SPAN_WARNING("[singular_name] must be constructed on a proper surface!"))
return
if(AC)
- to_chat(usr, SPAN_WARNING("[src.singular_name] cannot be built here!"))
+ to_chat(usr, SPAN_WARNING("[singular_name] cannot be built here!"))
return
- user.visible_message(SPAN_NOTICE("[user] begins deploying [src.singular_name]."),
- SPAN_NOTICE("You begin deploying [src.singular_name]."))
+ user.visible_message(SPAN_NOTICE("[user] begins deploying [singular_name]."),
+ SPAN_NOTICE("You begin deploying [singular_name]."))
- playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1)
+ playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
if(!do_after(user, 1 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
to_chat(user, SPAN_WARNING("You were interrupted."))
@@ -173,12 +163,12 @@
to_chat(user, SPAN_WARNING("There is already \a [B] in this direction!"))
return
- user.visible_message(SPAN_NOTICE("[user] has finished deploying [src.singular_name]."),
- SPAN_NOTICE("You finish deploying [src.singular_name]."))
+ user.visible_message(SPAN_NOTICE("[user] has finished deploying [singular_name]."),
+ SPAN_NOTICE("You finish deploying [singular_name]."))
var/obj/structure/barricade/deployable/cade = new(user.loc)
cade.setDir(user.dir)
- cade.health = health
+ cade.health = pop(stack_health)
cade.maxhealth = maxhealth
cade.source_type = singular_type
cade.update_damage_state()
@@ -186,76 +176,90 @@
use(1)
-/obj/item/stack/folding_barricade/attackby(obj/item/W, mob/user)
- if(istype(W, /obj/item/stack/folding_barricade))
- var/obj/item/stack/folding_barricade/F = W
-
- if(health != maxhealth || F.health != F.maxhealth)
- to_chat(user, "You cannot stack damaged [src.singular_name]\s.")
+/obj/item/stack/folding_barricade/attackby(obj/item/item, mob/user)
+ if(istype(item, /obj/item/stack/folding_barricade))
+ var/obj/item/stack/folding_barricade/folding = item
+ if(!ismob(loc)) //gather from ground
+ if(amount >= max_amount)
+ to_chat(user, "You cannot stack more [folding.singular_name]\s.")
+ return
+ var/to_transfer = min(folding.max_amount - folding.amount, amount)
+ for(var/counter in 1 to to_transfer)
+ folding.stack_health += pop(stack_health)
+ use(to_transfer)
+ folding.add(to_transfer)
+ to_chat(user, SPAN_INFO("You transfer [to_transfer] between the stacks."))
return
-
- if(!ismob(src.loc))
- return ..()
-
if(amount >= max_amount)
- to_chat(user, "You cannot stack more [src.singular_name]\s.")
+ to_chat(user, "You cannot stack more [singular_name]\s.")
return
- var/to_transfer = min(max_amount - amount, F.amount)
- F.use(to_transfer)
+ var/to_transfer = min(max_amount - amount, folding.amount)
+ for(var/counter in 1 to to_transfer)
+ stack_health += pop(folding.stack_health)
+ folding.use(to_transfer)
add(to_transfer)
to_chat(user, SPAN_INFO("You transfer [to_transfer] between the stacks."))
return
- else if(iswelder(W))
- if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH))
+ else if(iswelder(item))
+ if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH))
to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
return
- if(src != user.get_inactive_hand())
- to_chat(user, SPAN_WARNING("You need to hold [src.singular_name] in hand or deploy to repair it."))
- return
if(user.action_busy)
return
- var/obj/item/tool/weldingtool/WT = W
- if(health == maxhealth)
- to_chat(user, SPAN_WARNING("[src.singular_name] doesn't need repairs."))
+ var/need_repairs = 0
+ for(var/counter in 1 to length(stack_health))
+ if(stack_health[counter] < maxhealth)
+ need_repairs++
+
+ if(!need_repairs)
+ to_chat(user, SPAN_WARNING("[singular_name] doesn't need repairs."))
return
- if(!(WT.remove_fuel(2, user)))
+ var/obj/item/tool/weldingtool/welder = item
+ if(!(welder.remove_fuel(2, user)))
return
user.visible_message(SPAN_NOTICE("[user] begins repairing damage to [src]."),
SPAN_NOTICE("You begin repairing the damage to [src]."))
- playsound(src.loc, 'sound/items/Welder2.ogg', 25, TRUE)
+ playsound(loc, 'sound/items/Welder2.ogg', 25, TRUE)
- var/welding_time = skillcheck(user, SKILL_CONSTRUCTION, 2) ? 5 SECONDS : 10 SECONDS
- if(!do_after(user, welding_time, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, src))
- return
+ var/welding_time = (skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED) ? 5 SECONDS : 10 SECONDS) * need_repairs
+
+ if(src != user.get_inactive_hand())
+ if(!do_after(user, welding_time, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, src))
+ return
+ else
+ if(!do_after(user, welding_time, (INTERRUPT_ALL & (~INTERRUPT_MOVED)), BUSY_ICON_FRIENDLY, src, INTERRUPT_DIFF_LOC)) //you can move while repairing if you have cade in hand
+ return
user.visible_message(SPAN_NOTICE("[user] repairs some damage on [src]."),
SPAN_NOTICE("You repair [src]."))
user.count_niche_stat(STATISTICS_NICHE_REPAIR_CADES)
- health += 200
- if(health > maxhealth)
- health = maxhealth
+ for(var/counter in 1 to length(stack_health))
+ stack_health[counter] += 200
+ if(stack_health[counter] > maxhealth)
+ stack_health[counter] = maxhealth
- playsound(src.loc, 'sound/items/Welder2.ogg', 25, TRUE)
+ playsound(loc, 'sound/items/Welder2.ogg', 25, TRUE)
return
. = ..()
/obj/item/stack/folding_barricade/attack_hand(mob/user)
- var/mob/living/carbon/human/H = user
- if(!(amount > 1 && H.back == src))
+ var/mob/living/carbon/human/human = user
+ if(!(amount > 1 && (human.back == src || human.get_inactive_hand() == src)))
return ..()
- var/obj/item/stack/F = new singular_type(user, 1)
- transfer_fingerprints_to(F)
- user.put_in_hands(F)
- src.add_fingerprint(user)
- F.add_fingerprint(user)
+ var/obj/item/stack/folding_barricade/folding = new singular_type(user, 1)
+ transfer_fingerprints_to(folding)
+ folding.stack_health = list(pop(stack_health))
+ user.put_in_hands(folding)
+ add_fingerprint(user)
+ folding.add_fingerprint(user)
use(1)
/obj/item/stack/folding_barricade/MouseDrop(obj/over_object as obj)
@@ -277,7 +281,7 @@
/obj/item/stack/folding_barricade/get_examine_text(mob/user)
. = ..()
- if(health < maxhealth)
+ if(round(min(stack_health)/maxhealth * 100) <= 75)
. += SPAN_WARNING("It appears to be damaged.")
/obj/item/stack/folding_barricade/three
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..fbd476e2bfe5 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
@@ -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 c71f9b227668..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.
@@ -1152,3 +1285,91 @@
icon = 'icons/obj/structures/props/almayer_props.dmi'
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/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/game/verbs/records.dm b/code/game/verbs/records.dm
index 56a440e3558c..f09de72da2e6 100644
--- a/code/game/verbs/records.dm
+++ b/code/game/verbs/records.dm
@@ -53,7 +53,7 @@
if(NOTE_YAUTJA)
color = "#114e11"
- dat += "[N.text] by [admin_ckey] ([N.admin_rank]) on [N.date] "
+ dat += "[N.text] by [admin_ckey] ([N.admin_rank]) on [N.date] [NOTE_ROUND_ID(N)] "
dat += "
"
dat += " "
@@ -168,7 +168,7 @@
continue
var/admin_ckey = N.admin_ckey
- dat += "[N.text] by [admin_ckey] ([N.admin_rank]) on [N.date] "
+ dat += "[N.text] by [admin_ckey] ([N.admin_rank]) on [N.date] [NOTE_ROUND_ID(N)] "
///Can remove notes from anyone other than yourself, unless you're the host. So long as you have deletion access anyway.
if((can_del && target != get_player_from_key(key)) || ishost(usr))
dat += "Remove"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 5f24f71c8a50..2c749df71bb7 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -89,7 +89,7 @@
if(N.is_ban)
var/time_d = N.ban_time ? "Banned for [N.ban_time] minutes | " : ""
color = "#880000" //Removed confidential check because we can't make confidential bans
- dat += "[time_d][N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] "
+ dat += "[time_d][N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] "
else
if(N.is_confidential)
color = "#AA0055"
@@ -102,7 +102,7 @@
else if(N.note_category == NOTE_YAUTJA)
color = "#114e11"
- dat += "[N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] "
+ dat += "[N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] "
if(admin_ckey == usr.ckey || admin_ckey == "Adminbot" || ishost(usr))
dat += "Remove"
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 5a98faa6ddaa..6dc08c63e5de 100644
--- a/code/modules/admin/tabs/admin_tab.dm
+++ b/code/modules/admin/tabs/admin_tab.dm
@@ -169,12 +169,12 @@
if(N.is_ban)
var/ban_text = N.ban_time ? "Banned for [N.ban_time] | " : ""
color = "#880000"
- dat += "[ban_text][N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] "
+ dat += "[ban_text][N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] "
else
if(N.is_confidential)
color = "#AA0055"
- dat += "[N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] "
+ dat += "[N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] "
dat += "
"
dat += " "
@@ -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..20004e0367fb 100644
--- a/code/modules/clothing/suits/marine_armor.dm
+++ b/code/modules/clothing/suits/marine_armor.dm
@@ -271,7 +271,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 +347,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 +362,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 +1516,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/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm
index 47380ca2c84a..58b8d448a92f 100644
--- a/code/modules/cm_marines/Donator_Items.dm
+++ b/code/modules/cm_marines/Donator_Items.dm
@@ -55,6 +55,8 @@
//DON'T GRAB STUFF BETWEEN THIS LINE
flags_inventory = ALLOWREBREATH
flags_inv_hide = HIDEEARS|HIDEEYES|HIDEFACE
+ flags_cold_protection = BODY_FLAG_HEAD
+ min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
//AND THIS LINE
//END MASK TEMPLATE
diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm
index ff4d8397be26..8538af7ca90e 100644
--- a/code/modules/cm_marines/equipment/guncases.dm
+++ b/code/modules/cm_marines/equipment/guncases.dm
@@ -58,13 +58,15 @@
/obj/item/storage/box/guncase/lmg
name = "\improper M41AE2 heavy pulse rifle case"
desc = "A gun case containing the M41AE2 heavy pulse rifle. You can get additional ammunition at requisitions."
- storage_slots = 3
+ storage_slots = 5
can_hold = list(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/lmg)
/obj/item/storage/box/guncase/lmg/fill_preset_inventory()
new /obj/item/weapon/gun/rifle/lmg(src)
new /obj/item/ammo_magazine/rifle/lmg(src)
new /obj/item/ammo_magazine/rifle/lmg/holo_target(src)
+ new /obj/item/attachable/flashlight
+ new /obj/item/attachable/bipod
//------------
/obj/item/storage/box/guncase/m41aMK1
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..305badf6fceb 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)
diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm
index d5f009912b6a..96a32d414d1d 100644
--- a/code/modules/cm_preds/yaut_weapons.dm
+++ b/code/modules/cm_preds/yaut_weapons.dm
@@ -889,7 +889,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
@@ -902,8 +902,9 @@
var/charge_time = 0
var/last_regen = 0
flags_gun_features = GUN_UNUSUAL_DESIGN
- flags_item = ITEM_PREDATOR
+ flags_item = ITEM_PREDATOR|TWOHANDED
has_unique_action = FALSE
+ flags_item = ITEM_PREDATOR|TWOHANDED
/obj/item/weapon/gun/energy/yautja/plasmarifle/Initialize(mapload, spawn_empty)
. = ..()
@@ -955,12 +956,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/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 75d661da503f..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
@@ -261,6 +260,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/device/demo_scanner(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human), WEAR_L_HAND)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, (new_human), WEAR_R_HAND)
/datum/equipment_preset/uscm_ship/maint/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
@@ -307,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
@@ -317,7 +317,6 @@
ACCESS_MARINE_RO,
ACCESS_MARINE_COMMAND,
ACCESS_MARINE_DATABASE,
- ACCESS_MARINE_SENIOR,
ACCESS_MARINE_ALPHA,
ACCESS_MARINE_BRAVO,
ACCESS_MARINE_CHARLIE,
@@ -326,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)
@@ -615,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/law/laws/optional.dm b/code/modules/law/laws/optional.dm
index b553d5530a12..942f824aae56 100644
--- a/code/modules/law/laws/optional.dm
+++ b/code/modules/law/laws/optional.dm
@@ -2,8 +2,8 @@
severity = OPTIONAL_CRIME
/datum/law/optional_law/minor_unruly
- name = "Minor Disordely Conduct in Confinement"
- desc = "To cause disruption in a minor manner while in Brig and under arrest. Disruption is considered breaking Minor Law. This can be added on to any charge."
+ name = "Minor Disorderly Conduct in Confinement"
+ desc = "To cause disruption in a minor manner while in the Brig and under arrest. Disruption is considered breaking a Minor Law. This can be added on to any charge."
brig_time = 7.5
/datum/law/optional_law/aiding
name = "Aiding and Abetting"
@@ -17,6 +17,6 @@
brig_time = 10
/datum/law/optional_law/major_unruly
- name = "Major Disordely Conduct in Confinement"
- desc = "To cause disruption in a major manner while in Brig and under arrest. Disruption is considered breaking Major Law. This can be added on to any charge."
+ name = "Major Disorderly Conduct in Confinement"
+ desc = "To cause disruption in a major manner while in the Brig and under arrest. Disruption is considered breaking a Major Law. This can be added on to any charge."
brig_time = 15
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/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index ffa3bd1b1977..a4eb3b99a13a 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -238,6 +238,10 @@
else
hud_used.l_hand_hud_object.icon_state = "hand_inactive"
hud_used.r_hand_hud_object.icon_state = "hand_active"
+ if(l_hand)
+ l_hand.hands_swapped(src)
+ if(r_hand)
+ r_hand.hands_swapped(src)
return
/mob/living/carbon/proc/activate_hand(selhand) //0 or "r" or "right" for right hand; 1 or "l" or "left" for left hand.
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index d64e5d1bfde0..fded3d5e3f77 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -41,7 +41,7 @@
handle_chemicals_in_body(delta_time)
//Organs and blood
- handle_organs()
+ handle_organs(delta_time)
handle_blood()
//Random events (vomiting etc)
diff --git a/code/modules/mob/living/carbon/human/life/handle_organs.dm b/code/modules/mob/living/carbon/human/life/handle_organs.dm
index 8d0a0dbc3e15..2c978f2295ed 100644
--- a/code/modules/mob/living/carbon/human/life/handle_organs.dm
+++ b/code/modules/mob/living/carbon/human/life/handle_organs.dm
@@ -1,11 +1,11 @@
// Takes care of organ & limb related updates, such as broken and missing limbs
-/mob/living/carbon/human/proc/handle_organs()
+/mob/living/carbon/human/proc/handle_organs(delta_time)
last_dam = getBruteLoss() + getFireLoss() + getToxLoss()
// Processing internal organs is pretty cheap, do that first.
for(var/datum/internal_organ/I as anything in internal_organs)
- I.process()
+ I.process(delta_time)
for(var/obj/limb/E as anything in limbs_to_process)
if(!E)
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 b599e9b5567a..4ce266f70596 100644
--- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm
@@ -147,59 +147,92 @@
affected_mob.take_limb_damage(1)
if(5)
become_larva()
- if(6)
+ if(7) // Stage 6 is while we are trying to find a candidate in become_larva
larva_autoburst_countdown--
if(!larva_autoburst_countdown)
var/mob/living/carbon/xenomorph/larva/larva_embryo = locate() in affected_mob
if(larva_embryo)
larva_embryo.chest_burst(affected_mob)
-//We look for a candidate. If found, we spawn the candidate as a larva
-//Order of priority is bursted individual (if xeno is enabled), then random candidate, and then it's up for grabs and spawns braindead
+///We look for a candidate. If found, we spawn the candidate as a larva
+///Order of priority is bursted individual (if xeno is enabled), then player hugger, then random candidate, and then it's up for grabs and spawns braindead
/obj/item/alien_embryo/proc/become_larva()
// We do not allow chest bursts on the Centcomm Z-level, to prevent
// stranded players from admin experiments and other issues
if(!affected_mob || is_admin_level(affected_mob.z))
return
- var/datum/hive_status/hive = GLOB.hive_datum[hivenumber]
+ stage = 6 // Increase the stage value to prevent this proc getting repeated
+ var/datum/hive_status/hive = GLOB.hive_datum[hivenumber]
var/mob/picked
+ var/mob/dead/observer/hugger = null
+ var/is_nested = istype(affected_mob.buckled, /obj/structure/bed/nest)
+
// If the bursted person themselves has Xeno enabled, they get the honor of first dibs on the new larva.
- if((!isyautja(affected_mob) || (isyautja(affected_mob) && prob(20))) && istype(affected_mob.buckled, /obj/structure/bed/nest))
+ if((!isyautja(affected_mob) || (isyautja(affected_mob) && prob(20))) && is_nested)
if(affected_mob.first_xeno || (affected_mob.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(affected_mob, JOB_XENOMORPH)))
picked = affected_mob
else if(affected_mob.mind?.ghost_mob && affected_mob.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(affected_mob, JOB_XENOMORPH))
picked = affected_mob.mind.ghost_mob // This currently doesn't look possible
else if(affected_mob.persistent_ckey)
for(var/mob/dead/observer/cur_obs as anything in GLOB.observer_list)
+ if(!cur_obs)
+ continue
if(cur_obs.ckey != affected_mob.persistent_ckey)
continue
- if(cur_obs?.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(cur_obs, JOB_XENOMORPH))
+ if(cur_obs.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(cur_obs, JOB_XENOMORPH))
picked = cur_obs
break
if(!picked)
// Get a candidate from observers
var/list/candidates = get_alien_candidates(hive)
- if(candidates && candidates.len)
+ if(candidates && length(candidates))
// If they were facehugged by a player thats still in queue, they get second dibs on the new larva.
if(hugger_ckey)
for(var/mob/dead/observer/cur_obs as anything in candidates)
if(cur_obs.ckey == hugger_ckey)
- picked = cur_obs
- candidates -= cur_obs
- message_alien_candidates(candidates, dequeued = 0)
- for(var/obj/item/alien_embryo/embryo as anything in GLOB.player_embryo_list)
- if(embryo.hugger_ckey == cur_obs.ckey && embryo != src)
- // Skipping src just in case an admin wants to quickly check before this thing fully deletes
- // If this nulls out any embryo, wow
- embryo.hugger_ckey = null
+ hugger = cur_obs
+ if(!is_nested)
+ cur_obs.ManualFollow(affected_mob)
+ if(cur_obs.client.prefs?.toggles_flashing & FLASH_POOLSPAWN)
+ window_flash(cur_obs.client)
+ if(is_nested || tgui_alert(cur_obs, "An unnested host you hugged is about to burst! Do you want to control the new larva?", "Larva maturation", list("Yes", "No"), 10 SECONDS) == "Yes")
+ picked = cur_obs
+ candidates -= cur_obs
+ message_alien_candidates(candidates, dequeued = 0)
+ for(var/obj/item/alien_embryo/embryo as anything in GLOB.player_embryo_list)
+ if(!embryo)
+ continue
+ if(embryo.hugger_ckey == cur_obs.ckey && embryo != src)
+ // Skipping src just in case an admin wants to quickly check before this thing fully deletes
+ // If this nulls out any embryo, wow
+ embryo.hugger_ckey = null
break
+ // Get a candidate from the front of the queue
if(!picked)
- picked = candidates[1]
- message_alien_candidates(candidates, dequeued = 1)
+ if(is_nested)
+ picked = candidates[1]
+ message_alien_candidates(candidates, dequeued = 1)
+ else
+ // Make up to 5 attempts from the queue for an unnested host
+ // At 10s per candidate, for 6 candidates (facehugger is the +1) this means we may have delayed an unnested autoburst up to 60 seconds
+ for(var/i in 1 to min(5, length(candidates)))
+ var/mob/dead/observer/cur_candidate = candidates[i]
+ if(!cur_candidate?.client) // Make sure they are still a valid candidate since tgui_alerts may have delayed us to this point
+ continue
+ if(cur_candidate == hugger)
+ continue // They were already asked
+ cur_candidate.ManualFollow(affected_mob)
+ if(cur_candidate.client.prefs?.toggles_flashing & FLASH_POOLSPAWN)
+ window_flash(cur_candidate.client)
+ if(tgui_alert(cur_candidate, "An unnested host is about to burst! Do you want to control the new larva?", "Larva maturation", list("Yes", "No"), 10 SECONDS) == "Yes")
+ picked = cur_candidate
+ candidates -= cur_candidate
+ message_alien_candidates(candidates, dequeued = 0)
+ break
// Spawn the larva
var/mob/living/carbon/xenomorph/larva/new_xeno
@@ -227,6 +260,8 @@
if(new_xeno.client)
new_xeno.client.change_view(world_view_size)
+ if(new_xeno.client.prefs?.toggles_flashing & FLASH_POOLSPAWN)
+ window_flash(new_xeno.client)
SSround_recording.recorder.track_player(new_xeno)
@@ -247,7 +282,7 @@
to_chat(observer, SPAN_DEADSAY("A [new_xeno.hive.prefix]Larva is about to chestburst out of [affected_mob]! [OBSERVER_JMP(observer, affected_mob)]"))
to_chat(src, SPAN_DEADSAY("A [new_xeno.hive.prefix]Larva is about to chestburst out of [affected_mob]!"))
- stage = 6
+ stage = 7 // Begin the autoburst countdown
/mob/living/carbon/xenomorph/larva/proc/cause_unbearable_pain(mob/living/carbon/victim)
if(loc != victim)
@@ -302,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))
@@ -324,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/abilities/facehugger/facehugger_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
index 9f5de1c631cd..91bda707ec45 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
@@ -12,7 +12,7 @@
knockdown = TRUE
knockdown_duration = 0.5
windup = TRUE
- windup_duration = 10
+ windup_duration = FACEHUGGER_WINDUP_DURATION
freeze_self = TRUE
freeze_time = 5
freeze_play_sound = FALSE
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/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
index 79a5f986ea10..ac03389994c9 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
@@ -133,7 +133,7 @@
to_chat(src, SPAN_WARNING("You can't infect \the [human]..."))
return
visible_message(SPAN_WARNING("\The [src] starts climbing onto \the [human]'s face..."), SPAN_XENONOTICE("You start climbing onto \the [human]'s face..."))
- if(!do_after(src, 6 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, human, INTERRUPT_MOVED, BUSY_ICON_HOSTILE))
+ if(!do_after(src, FACEHUGGER_WINDUP_DURATION, INTERRUPT_ALL, BUSY_ICON_HOSTILE, human, INTERRUPT_MOVED, BUSY_ICON_HOSTILE))
return
if(!human.lying)
to_chat(src, SPAN_WARNING("You can't reach \the [human], they need to be lying down."))
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 bb58d2cf2a03..512c26f8c360 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(
@@ -353,6 +354,8 @@
/// How many lesser drones the hive can support
var/lesser_drone_limit = 0
+ /// Slots available for lesser drones will never go below this number
+ var/lesser_drone_minimum = 3
var/datum/tacmap/xeno/tacmap
var/minimap_type = MINIMAP_FLAG_XENO
@@ -368,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()
@@ -881,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)
@@ -934,6 +946,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)
@@ -1020,6 +1050,10 @@
//This is to prevent people from joining as Forsaken Huggers on the pred ship
to_chat(user, SPAN_WARNING("The hive has fallen, you can't join it!"))
return FALSE
+ for(var/mob_name in banished_ckeys)
+ if(banished_ckeys[mob_name] == user.ckey)
+ to_chat(user, SPAN_WARNING("You are banished from the [name], you may not rejoin unless the Queen re-admits you or dies."))
+ return FALSE
update_hugger_limit()
@@ -1048,7 +1082,7 @@
hugger.timeofdeath = user.timeofdeath // Keep old death time
/datum/hive_status/proc/update_lesser_drone_limit()
- lesser_drone_limit = Ceiling(totalXenos.len / 3)
+ lesser_drone_limit = lesser_drone_minimum + Ceiling(length(totalXenos) / 3)
/datum/hive_status/proc/can_spawn_as_lesser_drone(mob/dead/observer/user)
if(!GLOB.hive_datum || ! GLOB.hive_datum[hivenumber])
@@ -1082,11 +1116,11 @@
if(islesserdrone(mob))
current_lesser_drone_count++
- if(lesser_drone_limit <= current_lesser_drone_count)
- to_chat(user, SPAN_WARNING("[GLOB.hive_datum[hivenumber]] cannot support more lesser drones! Limit: [current_lesser_drone_count]/[lesser_drone_limit]"))
+ if(tgui_alert(user, "Are you sure you want to become a lesser drone?", "Confirmation", list("Yes", "No")) != "Yes")
return FALSE
- if(tgui_alert(user, "Are you sure you want to become a lesser drone?", "Confirmation", list("Yes", "No")) != "Yes")
+ if(lesser_drone_limit <= current_lesser_drone_count)
+ to_chat(user, SPAN_WARNING("[GLOB.hive_datum[hivenumber]] cannot support more lesser drones! Limit: [current_lesser_drone_count]/[lesser_drone_limit]"))
return FALSE
if(!user.client)
@@ -1098,6 +1132,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/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm
index 1038f2a86e8a..2178e2d53f5c 100644
--- a/code/modules/organs/organ_internal.dm
+++ b/code/modules/organs/organ_internal.dm
@@ -247,6 +247,21 @@
robotic_type = /obj/item/organ/brain/prosthetic
vital = 1
+/datum/internal_organ/brain/process(delta_time)
+ ..()
+
+ if(organ_status >= ORGAN_BRUISED && prob(5 * delta_time))
+ var/dir_choice = pick(list(NORTH, SOUTH, EAST, WEST))
+ owner.drop_held_items()
+ owner.Move(get_step(get_turf(owner), dir_choice))
+ to_chat(owner, SPAN_DANGER("Your mind wanders and goes blank for a moment..."))
+
+ if(organ_status >= ORGAN_BROKEN && prob(5 * delta_time))
+ owner.apply_effect(1, PARALYZE)
+ if(owner.jitteriness < 100)
+ owner.make_jittery(50)
+ to_chat(owner, SPAN_DANGER("Your body seizes up!"))
+
/datum/internal_organ/brain/prosthetic //used by synthetic species
robotic = ORGAN_ROBOT
removed_type = /obj/item/organ/brain/prosthetic
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\]", "