diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index 3abd79708f7a..de7eb672e87b 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -23,6 +23,8 @@
#define T0C 273.15 // 0degC
#define T20C 293.15 // 20degC
+#define T90C 363.15 // 90degC
+#define T120C 393.15 // 120degC
#define TCMB 2.7 // -270.3degC
#define ICE_COLONY_TEMPERATURE 223 //-50degC
#define SOROKYNE_TEMPERATURE 223 // Same as Ice for now
diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm
index 032a1891a808..dc5e70fcd5ec 100644
--- a/code/__DEFINES/dcs/signals/signals_global.dm
+++ b/code/__DEFINES/dcs/signals/signals_global.dm
@@ -60,8 +60,11 @@
#define COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING "!groundside_forsaken_handling"
/// From
-#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "yautja_armory_opened"
+#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "!yautja_armory_opened"
/// From /proc/biohazard_lockdown()
-#define COMSIG_GLOB_RESEARCH_LOCKDOWN "research_lockdown_closed"
-#define COMSIG_GLOB_RESEARCH_LIFT "research_lockdown_opened"
+#define COMSIG_GLOB_RESEARCH_LOCKDOWN "!research_lockdown_closed"
+#define COMSIG_GLOB_RESEARCH_LIFT "!research_lockdown_opened"
+
+/// From /obj/structure/machinery/power/fusion_engine/proc/set_overloading() : (set_overloading)
+#define COMSIG_GLOB_GENERATOR_SET_OVERLOADING "!generator_set_overloading"
diff --git a/code/__DEFINES/hijack.dm b/code/__DEFINES/hijack.dm
new file mode 100644
index 000000000000..85d4c227ae70
--- /dev/null
+++ b/code/__DEFINES/hijack.dm
@@ -0,0 +1,13 @@
+#define EVACUATION_TYPE_NONE 0
+#define EVACUATION_TYPE_ADDITIVE 1
+#define EVACUATION_TYPE_MULTIPLICATIVE 2
+
+#define HIJACK_ANNOUNCE "ARES Emergency Procedures"
+#define XENO_HIJACK_ANNOUNCE "You sense something unusual..."
+
+#define EVACUATION_STATUS_NOT_INITIATED 0
+#define EVACUATION_STATUS_INITIATED 1
+
+#define HIJACK_OBJECTIVES_NOT_STARTED 0
+#define HIJACK_OBJECTIVES_STARTED 1
+#define HIJACK_OBJECTIVES_COMPLETE 2
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 158c59aff327..301ca0409655 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -109,36 +109,23 @@
// Subsystems shutdown in the reverse of the order they initialize in
// The numbers just define the ordering, they are meaningless otherwise.
-#define SS_INIT_TICKER_SPAWN 999
#define SS_INIT_INPUT 85
-#define SS_INIT_FAIL_TO_TOPIC 84
#define SS_INIT_TOPIC 83
#define SS_INIT_LOBBYART 82
-#define SS_INIT_RUST 30
#define SS_INIT_INFLUXDRIVER 28
-#define SS_INIT_SUPPLY_SHUTTLE 25
#define SS_INIT_GARBAGE 24
#define SS_INIT_EVENTS 23.5
-#define SS_INIT_JOB 23
+#define SS_INIT_HIJACK 22.6
#define SS_INIT_REDIS 22.5
#define SS_INIT_REAGENTS 22.1
#define SS_INIT_MAPPING 22
#define SS_INIT_NIGHTMARE 21.5
#define SS_INIT_TIMETRACK 21.1
#define SS_INIT_HUMANS 21
-#define SS_INIT_MAP 20
-#define SS_INIT_COMPONENT 19.5
#define SS_INIT_POWER 19
-#define SS_INIT_OBJECT 18
-#define SS_INIT_PIPENET 17.5
-#define SS_INIT_XENOARCH 17
-#define SS_INIT_MORE_INIT 16
-#define SS_INIT_AIR 15
-#define SS_INIT_TELEPORTER 13
#define SS_INIT_INFLUXMCSTATS 12
#define SS_INIT_INFLUXSTATS 11
#define SS_INIT_LIGHTING 10
-#define SS_INIT_DEFCON 9
#define SS_INIT_LAW 6
#define SS_INIT_FZ_TRANSITIONS 5
#define SS_INIT_PROJECTILES 4.1
@@ -152,12 +139,9 @@
#define SS_INIT_RADIO 2
#define SS_INIT_TIMER 100
#define SS_INIT_UNSPECIFIED 0
-#define SS_INIT_EMERGENCY_SHUTTLE -19
#define SS_INIT_ASSETS -20
#define SS_INIT_TICKER -21
#define SS_INIT_VOTE -23
-#define SS_INIT_FINISH -24
-#define SS_INIT_ADMIN -26
#define SS_INIT_DATABASE -27
#define SS_INIT_ENTITYMANAGER -28
#define SS_INIT_PLAYTIME -29
@@ -176,7 +160,6 @@
#define SS_PRIORITY_SOUND 250
#define SS_PRIORITY_TICKER 200
#define SS_PRIORITY_NIGHTMARE 180
-#define SS_PRIORITY_MAPVIEW 170
#define SS_PRIORITY_QUADTREE 160
#define SS_PRIORITY_CHAT 155
#define SS_PRIORITY_STATPANEL 154
@@ -194,20 +177,17 @@
#define SS_PRIORITY_VOTE 110
#define SS_PRIORITY_FAST_OBJECTS 105
#define SS_PRIORITY_OBJECTS 104
-#define SS_PRIORITY_FACEHUGGERS 100
#define SS_PRIORITY_DECORATOR 99
+#define SS_PRIORITY_HIJACK 97
#define SS_PRIORITY_POWER 95
#define SS_PRIORITY_EFFECTS 92
#define SS_PRIORITY_MACHINERY 90
#define SS_PRIORITY_FZ_TRANSITIONS 88
-#define SS_PRIORITY_PIPENET 85
#define SS_PRIORITY_ROUND_RECORDING 83
#define SS_PRIORITY_SHUTTLE 80
-#define SS_PRIORITY_TELEPORTER 75
#define SS_PRIORITY_EVENT 65
#define SS_PRIORITY_DISEASE 60
-#define SS_PRIORITY_FAST_MACHINERY 55
-#define SS_PRIORITY_MIDI 40
+#define SS_PRIORITY_DEFENSES 55
#define SS_PRIORITY_ENTITY 37
#define SS_PRIORITY_DEFCON 35
#define SS_PRIORITY_ACID_PILLAR 34
@@ -226,7 +206,6 @@
#define SS_PRIORITY_INFLUXSTATS 8
#define SS_PRIORITY_PLAYTIME 5
#define SS_PRIORITY_PERFLOGGING 4
-#define SS_PRIORITY_CORPSESPAWNER 3
#define SS_PRIORITY_GARBAGE 2
#define SS_PRIORITY_INACTIVITY 1
#define SS_PRIORITY_ADMIN 0
diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm
index d468d6044196..0cc106ec9cf2 100644
--- a/code/__DEFINES/tgs.dm
+++ b/code/__DEFINES/tgs.dm
@@ -1,6 +1,6 @@
// tgstation-server DMAPI
-#define TGS_DMAPI_VERSION "6.6.1"
+#define TGS_DMAPI_VERSION "6.6.2"
// All functions and datums outside this document are subject to change with any version and should not be relied on.
diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm
index 137095327a2c..5d3fca1a2032 100644
--- a/code/__DEFINES/urls.dm
+++ b/code/__DEFINES/urls.dm
@@ -1,3 +1,7 @@
+// placeholder strings to be replaced
+#define WIKI_PLACEHOLDER "%WIKIURL%"
+#define LAW_PLACEHOLDER "%LAWURL%"
+
// ------ MISC WIKI LINKS ------ //
#define URL_WIKI_LAW "Marine_Law"
#define URL_WIKI_XENO_QUICKSTART "Xeno_Quickstart_Guide"
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 9a6ee4362088..38c02e776735 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -21,16 +21,16 @@
#define between(low, middle, high) (max(min(middle, high), low))
//Offuscate x for coord system
-#define obfuscate_x(x) (x + obfs_x)
+#define obfuscate_x(x) (x + GLOB.obfs_x)
//Offuscate y for coord system
-#define obfuscate_y(y) (y + obfs_y)
+#define obfuscate_y(y) (y + GLOB.obfs_y)
//Deoffuscate x for coord system
-#define deobfuscate_x(x) (x - obfs_x)
+#define deobfuscate_x(x) (x - GLOB.obfs_x)
//Deoffuscate y for coord system
-#define deobfuscate_y(y) (y - obfs_y)
+#define deobfuscate_y(y) (y - GLOB.obfs_y)
#define can_xeno_build(T) (!T.density && !(locate(/obj/structure/fence) in T) && !(locate(/obj/structure/tunnel) in T) && (locate(/obj/effect/alien/weeds) in T))
diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm
index 36058a44fc37..1e1e9cefd5db 100644
--- a/code/_globalvars/global_lists.dm
+++ b/code/_globalvars/global_lists.dm
@@ -1,6 +1,3 @@
-
-var/list/unansweredAhelps = list() //This feels inefficient, but I can't think of a better way. Stores the message indexed by CID
-
GLOBAL_LIST_EMPTY(PressFaxes)
GLOBAL_LIST_EMPTY(WYFaxes) //Departmental faxes
GLOBAL_LIST_EMPTY(USCMFaxes)
diff --git a/code/_globalvars/lists/object_lists.dm b/code/_globalvars/lists/object_lists.dm
index 3a417625538b..3db9bd28cbfe 100644
--- a/code/_globalvars/lists/object_lists.dm
+++ b/code/_globalvars/lists/object_lists.dm
@@ -31,3 +31,6 @@ GLOBAL_LIST_EMPTY_TYPED(all_multi_vehicles, /obj/vehicle/multitile)
GLOBAL_LIST_EMPTY_TYPED(lifeboat_almayer_docks, /obj/docking_port/stationary/lifeboat_dock)
GLOBAL_LIST_EMPTY_TYPED(lifeboat_doors, /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor)
+
+GLOBAL_LIST_EMPTY_TYPED(teleporters, /datum/teleporter)
+GLOBAL_LIST_EMPTY(teleporters_by_id)
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index 646b8ec2c854..44f4b2c4010f 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -30,3 +30,10 @@ GLOBAL_VAR_INIT(time_offset, setup_offset())
/// The last count of possible candidates in the xeno larva queue (updated via get_alien_candidates)
GLOBAL_VAR(xeno_queue_candidate_count)
+
+//Coordinate obsfucator
+//Used by the rangefinders and linked systems to prevent coords collection/prefiring
+/// A number between -500 and 500.
+GLOBAL_VAR(obfs_x)
+/// A number between -500 and 500.
+GLOBAL_VAR(obfs_y)
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index e8b010669c0e..147f57fcb1aa 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -20,7 +20,8 @@
var/policy
var/static/regex/ic_filter_regex
- var/list/fail_to_topic_whitelisted_ips
+
+ var/is_loaded = FALSE
/datum/controller/configuration/proc/admin_reload()
if(IsAdminAdvancedProcCall())
@@ -53,7 +54,8 @@
loadmaplist(CONFIG_GROUND_MAPS_FILE, GROUND_MAP)
loadmaplist(CONFIG_SHIP_MAPS_FILE, SHIP_MAP)
LoadChatFilter()
- LoadTopicRateWhitelist()
+
+ is_loaded = TRUE
if(Master)
Master.OnConfigLoad()
@@ -333,18 +335,3 @@
/datum/controller/configuration/proc/DelayedMessageAdmins(text)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(message_admins), text), 0)
-/datum/controller/configuration/proc/LoadTopicRateWhitelist()
- LAZYINITLIST(fail_to_topic_whitelisted_ips)
- if(!fexists("[directory]/topic_rate_limit_whitelist.txt"))
- log_config("Error 404: topic_rate_limit_whitelist.txt not found!")
- return
-
- log_config("Loading config file topic_rate_limit_whitelist.txt...")
-
- for(var/line in file2list("[directory]/topic_rate_limit_whitelist.txt"))
- if(!line)
- continue
- if(findtextEx(line, "#", 1, 2))
- continue
-
- fail_to_topic_whitelisted_ips[line] = 1
diff --git a/code/controllers/subsystem/admin.dm b/code/controllers/subsystem/admin.dm
deleted file mode 100644
index 8aab64b04881..000000000000
--- a/code/controllers/subsystem/admin.dm
+++ /dev/null
@@ -1,40 +0,0 @@
-SUBSYSTEM_DEF(admin)
- name = "Admin"
- wait = 5 MINUTES
- flags = SS_NO_INIT | SS_KEEP_TIMING
- runlevels = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY
- var/list/currentrun = list()
- var/times_repeated = 0
-
-/datum/controller/subsystem/admin/stat_entry(msg)
- msg = "P:[unansweredAhelps.len]"
- return ..()
-
-/datum/controller/subsystem/admin/fire(resumed = FALSE)
- if (!resumed)
- currentrun = unansweredAhelps.Copy()
-
- if(!currentrun.len)
- times_repeated = 0
- return
-
- var/msg = "Unheard Ahelps (Repeated [times_repeated] times):"
-
- while (currentrun.len)
- var/ahelp_msg = currentrun[currentrun.len]
- currentrun.len--
-
- if (!ahelp_msg)
- continue
-
- msg += unansweredAhelps[ahelp_msg] + "\n"
-
- if (MC_TICK_CHECK)
- return
-
- for(var/client/C in GLOB.admins)
- if(C && C.admin_holder && (C.admin_holder.rights & R_MOD))
- if(C.prefs.toggles_sound & SOUND_ADMINHELP)
- sound_to(C, 'sound/effects/adminhelp_new.ogg')
- to_chat(C, msg)
- times_repeated++
diff --git a/code/controllers/subsystem/disease.dm b/code/controllers/subsystem/disease.dm
index 25200cce11ed..b98187ca252c 100644
--- a/code/controllers/subsystem/disease.dm
+++ b/code/controllers/subsystem/disease.dm
@@ -1,22 +1,19 @@
-var/list/active_diseases = list()
-
-
SUBSYSTEM_DEF(disease)
name = "Disease"
wait = 2 SECONDS
flags = SS_NO_INIT | SS_KEEP_TIMING
priority = SS_PRIORITY_DISEASE
- var/list/currentrun = list()
+ var/list/datum/disease/all_diseases = list()
+ var/list/datum/disease/currentrun = list()
/datum/controller/subsystem/disease/stat_entry(msg)
- msg = "P:[active_diseases.len]"
+ msg = "P:[all_diseases.len]"
return ..()
-
/datum/controller/subsystem/disease/fire(resumed = FALSE)
if (!resumed)
- currentrun = active_diseases.Copy()
+ currentrun = all_diseases.Copy()
while (currentrun.len)
var/datum/disease/D = currentrun[currentrun.len]
diff --git a/code/controllers/subsystem/fail_to_topic.dm b/code/controllers/subsystem/fail_to_topic.dm
deleted file mode 100644
index 45674683a443..000000000000
--- a/code/controllers/subsystem/fail_to_topic.dm
+++ /dev/null
@@ -1,81 +0,0 @@
-SUBSYSTEM_DEF(fail_to_topic)
- name = "Fail to Topic"
- init_order = SS_INIT_FAIL_TO_TOPIC
- flags = SS_BACKGROUND
- runlevels = ALL
-
- var/list/rate_limiting = list()
- var/list/fail_counts = list()
- var/list/active_bans = list()
- var/list/currentrun = list()
-
- var/rate_limit
- var/max_fails
- var/enabled = FALSE
-
-/datum/controller/subsystem/fail_to_topic/Initialize(timeofday)
- rate_limit = ((CONFIG_GET(number/topic_rate_limit)) SECONDS)
- max_fails = CONFIG_GET(number/topic_max_fails)
- enabled = CONFIG_GET(flag/topic_enabled)
-
- if (world.system_type == UNIX && enabled)
- enabled = FALSE
- WARNING("fail_to_topic subsystem disabled. UNIX is not supported.")
- return SS_INIT_NO_NEED
-
- if (!enabled)
- can_fire = FALSE
- return SS_INIT_NO_NEED
-
- return SS_INIT_SUCCESS
-
-/datum/controller/subsystem/fail_to_topic/fire(resumed = FALSE)
- if(!resumed)
- currentrun = rate_limiting.Copy()
- //cache for sanic speed (lists are references anyways)
- var/list/current_run = currentrun
-
- while(current_run.len)
- var/ip = current_run[current_run.len]
- var/last_attempt = current_run[ip]
- current_run.len--
-
- // last_attempt list housekeeping
- if(world.time - last_attempt > rate_limit)
- rate_limiting -= ip
- fail_counts -= ip
-
- if(MC_TICK_CHECK)
- return
-
-/datum/controller/subsystem/fail_to_topic/proc/IsRateLimited(ip)
- if(!enabled)
- return FALSE
-
- var/last_attempt = rate_limiting[ip]
-
- if (config.fail_to_topic_whitelisted_ips[ip])
- return FALSE
-
- if (active_bans[ip])
- return TRUE
-
- rate_limiting[ip] = world.time
-
- if (isnull(last_attempt))
- return FALSE
-
- if (world.time - last_attempt > rate_limit)
- fail_counts -= ip
- return FALSE
- else
- var/failures = fail_counts[ip]
-
- if (isnull(failures))
- fail_counts[ip] = 1
- return TRUE
- else if (failures > max_fails)
- return TRUE
- else
- fail_counts[ip] = failures + 1
- return TRUE
diff --git a/code/controllers/subsystem/fast_machinery.dm b/code/controllers/subsystem/fast_machinery.dm
deleted file mode 100644
index 8211b3b5e310..000000000000
--- a/code/controllers/subsystem/fast_machinery.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-var/list/fast_machines = list()
-
-
-SUBSYSTEM_DEF(fast_machinery)
- name = "Fast Machinery"
- wait = 0.7 SECONDS
- priority = SS_PRIORITY_FAST_MACHINERY
- flags = SS_NO_INIT
- var/list/currentrun = list()
-
-/datum/controller/subsystem/fast_machinery/stat_entry(msg)
- msg = "FP:[fast_machines.len]"
- return ..()
-
-/datum/controller/subsystem/fast_machinery/fire(resumed = FALSE)
- if(!resumed)
- currentrun = fast_machines.Copy()
- while(currentrun.len)
- var/obj/structure/machinery/M = currentrun[currentrun.len]
- currentrun.len--
-
- if(QDELETED(M))
- continue
-
- M.process()
- if(MC_TICK_CHECK)
- return
diff --git a/code/controllers/subsystem/game_decorator.dm b/code/controllers/subsystem/game_decorator.dm
new file mode 100644
index 000000000000..cfee0406f84a
--- /dev/null
+++ b/code/controllers/subsystem/game_decorator.dm
@@ -0,0 +1,35 @@
+// Essentially the same as decorators but that apply to the whole game state instead of individual atoms
+SUBSYSTEM_DEF(game_decorator)
+ name = "Game Decorator"
+ init_order = SS_INIT_DECORATOR
+ flags = SS_NO_FIRE
+
+/datum/controller/subsystem/game_decorator/Initialize()
+ . = ..()
+ for(var/decorator_type in subtypesof(/datum/game_decorator))
+ var/datum/game_decorator/decorator = new decorator_type()
+ if(!decorator.is_active_decor())
+ continue
+ if(!decorator.defer_decoration)
+ decorator.decorate()
+ CHECK_TICK
+
+ return SS_INIT_SUCCESS
+
+/datum/game_decorator
+ var/defer_decoration = TRUE //! So map decoration is done post-setup after nightmare and spawners
+
+/datum/game_decorator/New()
+ if(defer_decoration)
+ RegisterSignal(SSdcs, COMSIG_GLOB_MODE_POSTSETUP, PROC_REF(defered_decoration))
+
+/datum/game_decorator/proc/is_active_decor()
+ return FALSE
+
+/datum/game_decorator/proc/defered_decoration(dcs)
+ SIGNAL_HANDLER
+ decorate()
+
+/datum/game_decorator/proc/decorate()
+ set waitfor = FALSE
+ return
diff --git a/code/controllers/subsystem/hijack.dm b/code/controllers/subsystem/hijack.dm
new file mode 100644
index 000000000000..55b5aa75caf8
--- /dev/null
+++ b/code/controllers/subsystem/hijack.dm
@@ -0,0 +1,429 @@
+SUBSYSTEM_DEF(hijack)
+ name = "Hijack"
+ wait = 2 SECONDS
+ flags = SS_KEEP_TIMING
+ priority = SS_PRIORITY_HIJACK
+ init_order = SS_INIT_HIJACK
+
+ ///Required progress to evacuate safely via lifeboats
+ var/required_progress = 100
+
+ ///Current progress towards evacuating safely via lifeboats
+ var/current_progress = 0
+
+ /// How much progress is required to early launch
+ var/early_launch_required_progress = 25
+
+ ///The estimated time left to get to the safe evacuation point
+ var/estimated_time_left = 0
+
+ ///Areas that are marked as having progress, assoc list that is progress_area = boolean, the boolean indicating if it was progressing or not on the last fire()
+ var/list/area/progress_areas = list()
+
+ ///The areas that need cycled through currently
+ var/list/area/current_run = list()
+
+ ///The progress of the current run that needs to be added at the end of the current run
+ var/current_run_progress_additive = 0
+
+ ///Holds what the current_run_progress_additive should be multiplied by at the end of the current run
+ var/current_run_progress_multiplicative = 1
+
+ ///Holds the progress change from last run
+ var/last_run_progress_change = 0
+
+ ///Holds the next % point progress should be announced, increments on itself
+ var/announce_checkpoint = 25
+
+ ///What stage of evacuation we are currently on
+ var/evac_status = EVACUATION_STATUS_NOT_INITIATED
+
+ ///What stage of hijack are we currently on
+ var/hijack_status = HIJACK_OBJECTIVES_NOT_STARTED
+
+ ///Whether or not evacuation has been disabled by admins
+ var/evac_admin_denied = FALSE
+
+ /// If TRUE, self destruct has been unlocked and is possible with a hold of reactor
+ var/sd_unlocked = FALSE
+
+ /// Admin var to manually prevent self destruct from occurring
+ var/admin_sd_blocked = FALSE
+
+ /// Maximum amount of fusion generators that can be overloaded at once for a time benefit
+ var/maximum_overload_generators = 18
+
+ /// How many generators are currently overloaded
+ var/overloaded_generators = 0
+
+ /// How long the manual self destruct will take on the high end
+ var/sd_max_time = 15 MINUTES
+
+ /// How long the manual self destruct will take on the low end
+ var/sd_min_time = 5 MINUTES
+
+ /// How much time left until SD detonates
+ var/sd_time_remaining = 0
+
+ /// Roughly what % of the SD countdown remains
+ var/percent_completion_remaining = 100
+
+ /// If the engine room has been heated, occurs at 33% SD completion
+ var/engine_room_heated = FALSE
+
+ /// If the engine room has been superheated, occurs at 66% SD completion
+ var/engine_room_superheated = FALSE
+
+ /// If the self destruct has/is detonating
+ var/sd_detonated = FALSE
+
+ /// If a generator has ever been overloaded in the past this round
+ var/generator_ever_overloaded = FALSE
+
+ /// If ARES has announced the 50% point yet for SD
+ var/ares_sd_announced = FALSE
+
+/datum/controller/subsystem/hijack/Initialize(timeofday)
+ RegisterSignal(SSdcs, COMSIG_GLOB_GENERATOR_SET_OVERLOADING, PROC_REF(on_generator_overload))
+ return SS_INIT_SUCCESS
+
+/datum/controller/subsystem/hijack/stat_entry(msg)
+ if(!SSticker?.mode?.is_in_endgame)
+ msg = " Not Hijack"
+ return ..()
+
+ if(current_progress >= required_progress)
+ msg = " Complete"
+ return ..()
+
+ msg = " Progress: [current_progress]% | Last run: [last_run_progress_change]"
+ return ..()
+
+/datum/controller/subsystem/hijack/fire(resumed = FALSE)
+ if(!SSticker?.mode?.is_in_endgame)
+ return
+
+ if(hijack_status < HIJACK_OBJECTIVES_STARTED)
+ hijack_status = HIJACK_OBJECTIVES_STARTED
+
+ if(current_progress >= required_progress)
+ if(hijack_status < HIJACK_OBJECTIVES_COMPLETE)
+ hijack_status = HIJACK_OBJECTIVES_COMPLETE
+
+ if(sd_unlocked && overloaded_generators)
+ sd_time_remaining -= wait
+ if(!engine_room_heated && (sd_time_remaining <= (max((1 - round(overloaded_generators / maximum_overload_generators, 0.01)) * sd_max_time, sd_min_time) * 0.66)))
+ heat_engine_room()
+
+ if(!ares_sd_announced && (sd_time_remaining <= (max((1 - round(overloaded_generators / maximum_overload_generators, 0.01)) * sd_max_time, sd_min_time) * 0.5)))
+ announce_sd_halfway()
+
+ if(!engine_room_superheated && (sd_time_remaining <= (max((1 - round(overloaded_generators / maximum_overload_generators, 0.01)) * sd_max_time, sd_min_time) * 0.33)))
+ superheat_engine_room()
+
+ if((sd_time_remaining <= 0) && !sd_detonated)
+ detonate_sd()
+
+ return
+
+ if(!resumed)
+ current_run = progress_areas.Copy()
+
+ for(var/area/almayer/cycled_area as anything in current_run)
+ current_run -= cycled_area
+
+ if(progress_areas[cycled_area] != cycled_area.power_equip)
+ progress_areas[cycled_area] = !progress_areas[cycled_area]
+ announce_area_power_change(cycled_area)
+
+ if(progress_areas[cycled_area])
+ switch(cycled_area.hijack_evacuation_type)
+ if(EVACUATION_TYPE_ADDITIVE)
+ current_run_progress_additive += cycled_area.hijack_evacuation_weight
+ if(EVACUATION_TYPE_MULTIPLICATIVE)
+ current_run_progress_multiplicative *= cycled_area.hijack_evacuation_weight
+
+ if (MC_TICK_CHECK)
+ return
+
+ last_run_progress_change = current_run_progress_additive * current_run_progress_multiplicative
+ current_progress += last_run_progress_change
+
+ if(last_run_progress_change)
+ estimated_time_left = ((required_progress - current_progress) / last_run_progress_change) * wait
+ else
+ estimated_time_left = INFINITY
+
+ if(current_progress >= announce_checkpoint)
+ announce_progress()
+ announce_checkpoint += initial(announce_checkpoint)
+
+ current_run_progress_additive = 0
+ current_run_progress_multiplicative = 1
+
+///Called when the xeno dropship crashes into the Almayer and announces the current status of various objectives to marines
+/datum/controller/subsystem/hijack/proc/announce_status_on_crash()
+ var/message = ""
+
+ for(var/area/cycled_area as anything in progress_areas)
+ message += "[cycled_area] - [cycled_area.power_equip ? "Online" : "Offline"]\n"
+ progress_areas[cycled_area] = cycled_area.power_equip
+
+ message += "\nDue to low orbit, extra fuel is required for non-surface evacuations.\nMaintain fueling functionality for optimal evacuation conditions."
+
+ marine_announcement(message, HIJACK_ANNOUNCE)
+
+///Called when an area power status is changed to announce that it has been changed
+/datum/controller/subsystem/hijack/proc/announce_area_power_change(area/changed_area)
+ var/message = "[changed_area] - [changed_area.power_equip ? "Online" : "Offline"]"
+
+ marine_announcement(message, HIJACK_ANNOUNCE)
+
+///Called to announce to xenos the state of evacuation progression
+/datum/controller/subsystem/hijack/proc/announce_progress()
+ var/announce = announce_checkpoint / initial(announce_checkpoint)
+
+ var/marine_warning_areas = ""
+ var/xeno_warning_areas = ""
+
+ for(var/area/cycled_area as anything in progress_areas)
+ if(cycled_area.power_equip)
+ xeno_warning_areas += "[cycled_area], "
+ continue
+ marine_warning_areas += "[cycled_area], "
+
+ if(xeno_warning_areas)
+ xeno_warning_areas = copytext(xeno_warning_areas, 1, -2)
+
+ if(marine_warning_areas)
+ marine_warning_areas = copytext(marine_warning_areas, 1, -2)
+
+ var/datum/hive_status/hive
+ for(var/hivenumber in GLOB.hive_datum)
+ hive = GLOB.hive_datum[hivenumber]
+ if(!length(hive.totalXenos))
+ continue
+
+ switch(announce)
+ if(1)
+ xeno_announcement(SPAN_XENOANNOUNCE("The talls are a quarter of the way towards their goals. Disable the following areas: [xeno_warning_areas]"), hive.hivenumber, XENO_HIJACK_ANNOUNCE)
+ if(2)
+ xeno_announcement(SPAN_XENOANNOUNCE("The talls are half way towards their goals. Disable the following areas: [xeno_warning_areas]"), hive.hivenumber, XENO_HIJACK_ANNOUNCE)
+ if(3)
+ xeno_announcement(SPAN_XENOANNOUNCE("The talls are three quarters of the way towards their goals. Disable the following areas: [xeno_warning_areas]"), hive.hivenumber, XENO_HIJACK_ANNOUNCE)
+ if(4)
+ xeno_announcement(SPAN_XENOANNOUNCE("The talls have completed their goals!"), hive.hivenumber, XENO_HIJACK_ANNOUNCE)
+
+ switch(announce)
+ if(1)
+ marine_announcement("Emergency fuel replenishment at 25 percent. Lifeboat emergency early launch now available.[marine_warning_areas ? "\nTo increase speed restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
+ if(2)
+ marine_announcement("Emergency fuel replenishment at 50 percent.[marine_warning_areas ? "\nTo increase speed restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
+ if(3)
+ marine_announcement("Emergency fuel replenishment at 75 percent.[marine_warning_areas ? "\nTo increase speed restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
+ if(4)
+ marine_announcement("Emergency fuel replenishment at 100 percent. Safe utilization of lifeboats now possible.", HIJACK_ANNOUNCE)
+ if(!admin_sd_blocked)
+ addtimer(CALLBACK(src, PROC_REF(unlock_self_destruct)), 8 SECONDS)
+
+/// Passes the ETA for status panels
+/datum/controller/subsystem/hijack/proc/get_evac_eta()
+ switch(hijack_status)
+ if(HIJACK_OBJECTIVES_STARTED)
+ if(estimated_time_left == INFINITY)
+ return "Never"
+ return "[duration2text_sec(estimated_time_left)]"
+
+ if(HIJACK_OBJECTIVES_COMPLETE)
+ return "Complete"
+
+/datum/controller/subsystem/hijack/proc/get_sd_eta()
+ if(!sd_time_remaining)
+ return "Complete"
+
+ if(overloaded_generators <= 0)
+ return "Never"
+
+ return "[duration2text_sec(sd_time_remaining)]"
+
+//~~~~~~~~~~~~~~~~~~~~~~~~ EVAC STUFF ~~~~~~~~~~~~~~~~~~~~~~~~//
+
+/// Initiates evacuation by announcing and then prepping all lifepods/lifeboats
+/datum/controller/subsystem/hijack/proc/initiate_evacuation()
+ if(evac_status == EVACUATION_STATUS_NOT_INITIATED && !(evac_admin_denied & FLAGS_EVACUATION_DENY))
+ evac_status = EVACUATION_STATUS_INITIATED
+ ai_announcement("Attention. Emergency. All personnel must evacuate immediately.", 'sound/AI/evacuate.ogg')
+
+ for(var/obj/structure/machinery/status_display/cycled_status_display in machines)
+ if(is_mainship_level(cycled_status_display.z))
+ cycled_status_display.set_picture("evac")
+ for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile)
+ shuttle.prepare_evac()
+ activate_lifeboats()
+ return TRUE
+
+/// Cancels evacuation, tells lifepods/lifeboats and status_displays
+/datum/controller/subsystem/hijack/proc/cancel_evacuation()
+ if(evac_status == EVACUATION_STATUS_INITIATED)
+ evac_status = EVACUATION_STATUS_NOT_INITIATED
+ deactivate_lifeboats()
+ ai_announcement("Evacuation has been cancelled.", 'sound/AI/evacuate_cancelled.ogg')
+
+ for(var/obj/structure/machinery/status_display/cycled_status_display in machines)
+ if(is_mainship_level(cycled_status_display.z))
+ cycled_status_display.set_sec_level_picture()
+
+ for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile)
+ shuttle.cancel_evac()
+ return TRUE
+
+/// Opens the lifeboat doors and gets them ready to launch
+/datum/controller/subsystem/hijack/proc/activate_lifeboats()
+ for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks)
+ var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked()
+ if(lifeboat && lifeboat.available)
+ lifeboat.status = LIFEBOAT_ACTIVE
+ lifeboat_dock.open_dock()
+
+/// Turns off ability to manually take off lifeboats
+/datum/controller/subsystem/hijack/proc/deactivate_lifeboats()
+ for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks)
+ var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked()
+ if(lifeboat && lifeboat.available)
+ lifeboat.status = LIFEBOAT_INACTIVE
+
+
+/// Once refueling is done, marines can optionally hold SD for a time for a stalemate instead of a xeno minor
+/datum/controller/subsystem/hijack/proc/unlock_self_destruct()
+ sd_time_remaining = sd_max_time
+ sd_unlocked = TRUE
+ marine_announcement("Fuel reserves full. Manual detonation of fuel reserves by overloading the on-board fusion reactors now possible.", HIJACK_ANNOUNCE)
+
+/datum/controller/subsystem/hijack/proc/on_generator_overload(obj/structure/machinery/power/fusion_engine/source, new_overloading)
+ SIGNAL_HANDLER
+
+ if(!generator_ever_overloaded)
+ generator_ever_overloaded = TRUE
+ var/datum/hive_status/hive
+ for(var/hivenumber in GLOB.hive_datum)
+ hive = GLOB.hive_datum[hivenumber]
+ if(!length(hive.totalXenos))
+ continue
+
+ xeno_announcement(SPAN_XENOANNOUNCE("The talls may be attempting to take their ship down with them in Engineering, stop them!"), hive.hivenumber, XENO_HIJACK_ANNOUNCE)
+
+ adjust_generator_overload_count(new_overloading ? 1 : -1)
+
+/datum/controller/subsystem/hijack/proc/adjust_generator_overload_count(amount = 1)
+ var/generator_overload_percent = round(overloaded_generators / maximum_overload_generators, 0.01)
+ var/old_required_time = sd_min_time + ((1 - generator_overload_percent) * (sd_max_time - sd_min_time))
+ percent_completion_remaining = sd_time_remaining / old_required_time
+ overloaded_generators = clamp(overloaded_generators + amount, 0, maximum_overload_generators)
+ generator_overload_percent = round(overloaded_generators / maximum_overload_generators, 0.01)
+ var/new_required_time = sd_min_time + ((1 - generator_overload_percent) * (sd_max_time - sd_min_time))
+ sd_time_remaining = percent_completion_remaining * new_required_time
+
+/datum/controller/subsystem/hijack/proc/heat_engine_room()
+ engine_room_heated = TRUE
+ var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/engine_core]
+ engine_room.firealert()
+ engine_room.temperature = T90C
+ for(var/mob/current_mob as anything in GLOB.mob_list)
+ var/area/mob_area = get_area(current_mob)
+ if(istype(mob_area, /area/almayer/engineering/engine_core))
+ to_chat(current_mob, SPAN_BOLDWARNING("You feel the heat of the room increase as the fusion engines whirr louder."))
+
+/datum/controller/subsystem/hijack/proc/superheat_engine_room()
+ engine_room_superheated = TRUE
+ var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/engine_core]
+ engine_room.firealert()
+ engine_room.temperature = T120C //slowly deals burn at this temp
+ for(var/mob/current_mob as anything in GLOB.mob_list)
+ var/area/mob_area = get_area(current_mob)
+ if(istype(mob_area, /area/almayer/engineering/engine_core))
+ to_chat(current_mob, SPAN_BOLDWARNING("The room feels incredibly hot, you can't take much more of this!"))
+
+/datum/controller/subsystem/hijack/proc/announce_sd_halfway()
+ ares_sd_announced = TRUE
+ marine_announcement("ALERT: Fusion reactor meltdown has reached fifty percent.", HIJACK_ANNOUNCE)
+
+/datum/controller/subsystem/hijack/proc/detonate_sd()
+ set waitfor = FALSE
+ sd_detonated = TRUE
+ var/creak_picked = pick('sound/effects/creak1.ogg', 'sound/effects/creak2.ogg', 'sound/effects/creak3.ogg')
+ for(var/mob/current_mob as anything in GLOB.mob_list)
+ var/turf/current_turf = get_turf(current_mob)
+ if(!current_mob?.loc || !current_mob.client || !current_turf || !is_mainship_level(current_turf.z))
+ continue
+
+ to_chat(current_mob, SPAN_BOLDWARNING("The ship's deck worryingly creaks underneath you."))
+ playsound_client(current_mob.client, creak_picked, vol = 50)
+
+ sleep(7 SECONDS)
+ shakeship(2, 10, TRUE)
+
+ marine_announcement("ALERT: Fusion reactors dangerously overloaded. Runaway meltdown in reactor core imminent.", HIJACK_ANNOUNCE)
+ sleep(5 SECONDS)
+
+ var/sound_picked = pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg')
+ for(var/client/player as anything in GLOB.clients)
+ playsound_client(player, sound_picked, 90)
+
+ var/list/alive_mobs = list() //Everyone who will be destroyed on the zlevel(s).
+ var/list/dead_mobs = list() //Everyone who only needs to see the cinematic.
+ for(var/mob/current_mob as anything in GLOB.mob_list) //This only does something cool for the people about to die, but should prove pretty interesting.
+ var/turf/current_turf = get_turf(current_mob)
+ if(!current_mob?.loc || !current_turf)
+ continue
+
+ if(current_mob.stat == DEAD)
+ dead_mobs |= current_mob
+ continue
+
+ if(is_mainship_level(current_turf.z))
+ alive_mobs |= current_mob
+ shake_camera(current_mob, 110, 4)
+
+
+ sleep(10 SECONDS)
+ /*Hardcoded for now, since this was never really used for anything else.
+ Would ideally use a better system for showing cutscenes.*/
+ var/atom/movable/screen/cinematic/explosion/explosive_cinematic = new()
+
+ for(var/mob/current_mob as anything in (alive_mobs + dead_mobs))
+ if(current_mob?.loc && current_mob.client)
+ current_mob.client.add_to_screen(explosive_cinematic) //They may have disconnected in the mean time.
+
+ sleep(1.5 SECONDS) //Extra 1.5 seconds to look at the ship.
+ flick("intro_nuke", explosive_cinematic)
+
+ sleep(3.5 SECONDS)
+ for(var/mob/current_mob as anything in alive_mobs)
+ var/turf/current_mob_turf = get_turf(current_mob)
+ if(!current_mob?.loc || !current_mob_turf) //Who knows, maybe they escaped, or don't exist anymore.
+ continue
+
+ if(is_mainship_level(current_mob_turf.z))
+ if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge))
+ continue
+
+ current_mob.death(create_cause_data("nuclear explosion"))
+ else
+ current_mob.client.remove_from_screen(explosive_cinematic) //those who managed to escape the z level at last second shouldn't have their view obstructed.
+
+ flick("ship_destroyed", explosive_cinematic)
+ explosive_cinematic.icon_state = "summary_destroyed"
+
+ for(var/client/player as anything in GLOB.clients)
+ playsound_client(player, 'sound/effects/explosionfar.ogg', 90)
+
+
+ sleep(0.5 SECONDS)
+ if(SSticker.mode)
+ SSticker.mode.check_win()
+
+ if(!SSticker.mode) //Just a safety, just in case a mode isn't running, somehow.
+ to_world(SPAN_ROUNDBODY("Resetting in 30 seconds!"))
+ sleep(30 SECONDS)
+ log_game("Rebooting due to nuclear detonation.")
+ world.Reboot()
diff --git a/code/controllers/subsystem/htmlui.dm b/code/controllers/subsystem/htmlui.dm
deleted file mode 100644
index 5dc885abc625..000000000000
--- a/code/controllers/subsystem/htmlui.dm
+++ /dev/null
@@ -1,57 +0,0 @@
-// What in the name of god is this?
-// You'd think it'd be some form of process for the HTML interface module.
-// But it isn't?
-// It's some form of proc queue but ???
-// Does anything even *use* this?
-
-SUBSYSTEM_DEF(html_ui)
- name = "HTMLUI"
- wait = 1.7 SECONDS
- flags = SS_NO_INIT
- runlevels = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY
- var/list/update = list()
-
-/datum/controller/subsystem/html_ui/fire(resumed = FALSE)
- if (update.len)
- var/list/L = list()
- var/key
-
- for (var/datum/procqueue_item/item in update)
- key = "[item.ref]_[item.procname]"
-
- if (item.args)
- key += "("
- var/first = 1
- for (var/a in item.args)
- if (!first)
- key += ","
- key += "[a]"
- first = 0
- key += ")"
-
- if (!(key in L))
- if (item.args)
- call(item.ref, item.procname)(arglist(item.args))
- else
- call(item.ref, item.procname)()
-
- L.Add(key)
-
- update.Cut()
-
-
-/datum/controller/subsystem/html_ui/proc/queue(ref, procname, ...)
- var/datum/procqueue_item/item = new
- item.ref = ref
- item.procname = procname
-
- if (args.len > 2)
- item.args = args.Copy(3)
-
- update.Insert(1, item)
-
-
-/datum/procqueue_item
- var/ref
- var/procname
- var/list/args
diff --git a/code/controllers/subsystem/interior.dm b/code/controllers/subsystem/interior.dm
index 389e95fe6022..8fb7ffbfeee7 100644
--- a/code/controllers/subsystem/interior.dm
+++ b/code/controllers/subsystem/interior.dm
@@ -42,7 +42,7 @@ SUBSYSTEM_DEF(interior)
continue
if(x >= bounds[1].x && x <= bounds[2].x && y >= bounds[1].y && y <= bounds[2].y)
return current_interior
- return FALSE
+ return
/// Checks if an atom is in an interior
/datum/controller/subsystem/interior/proc/in_interior(loc)
@@ -51,7 +51,7 @@ SUBSYSTEM_DEF(interior)
if(!isturf(loc))
loc = get_turf(loc)
- var/datum/turf_reservation/interior/reservation = SSmapping.used_turfs[loc]
+ var/datum/weakref/reservation = SSmapping.used_turfs[loc]
if(!istype(reservation))
return FALSE
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 6f0f060305b2..913e5dcd50d3 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -6,10 +6,13 @@ SUBSYSTEM_DEF(mapping)
var/list/datum/map_config/configs
var/list/datum/map_config/next_map_configs
+ ///Name of all maps
var/list/map_templates = list()
-
+ ///Name of all shuttles
var/list/shuttle_templates = list()
var/list/all_shuttle_templates = list()
+ ///map_id of all tents
+ var/list/tent_type_templates = list()
var/list/areas_in_z = list()
@@ -201,6 +204,7 @@ SUBSYSTEM_DEF(mapping)
map_templates[T.name] = T
preloadShuttleTemplates()
+ preload_tent_templates()
/proc/generateMapList(filename)
. = list()
@@ -242,6 +246,11 @@ SUBSYSTEM_DEF(mapping)
all_shuttle_templates[item] = S
map_templates[S.shuttle_id] = S
+/datum/controller/subsystem/mapping/proc/preload_tent_templates()
+ for(var/template in subtypesof(/datum/map_template/tent))
+ var/datum/map_template/tent/new_tent = new template()
+ tent_type_templates[new_tent.map_id] = new_tent
+
/datum/controller/subsystem/mapping/proc/RequestBlockReservation(width, height, z, type = /datum/turf_reservation, turf_type_override)
UNTIL(initialized && !clearing_reserved_turfs)
var/datum/turf_reservation/reserve = new type
diff --git a/code/controllers/subsystem/midi.dm b/code/controllers/subsystem/midi.dm
deleted file mode 100644
index 158d67cf25ac..000000000000
--- a/code/controllers/subsystem/midi.dm
+++ /dev/null
@@ -1,45 +0,0 @@
-/datum/midi_record
- var/target
- var/midi
-
-SUBSYSTEM_DEF(midi)
- name = "Midi"
- wait = 2 SECONDS
- flags = SS_NO_INIT|SS_BACKGROUND
- runlevels = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY
- priority = SS_PRIORITY_MIDI
-
- var/list/datum/midi_record/prepped_midis = list()
-
- var/list/datum/midi_record/currentrun = list()
-
-
-/datum/controller/subsystem/midi/stat_entry(msg)
- msg = "MR:[prepped_midis.len]"
- return ..()
-
-
-/datum/controller/subsystem/midi/fire(resumed = FALSE)
- if (!resumed)
- currentrun = prepped_midis
- prepped_midis = list()
-
- while (currentrun.len)
- var/datum/midi_record/E = currentrun[currentrun.len]
- currentrun.len--
-
- if (!E)
- continue
-
- E.target << E.midi
-
- if (MC_TICK_CHECK)
- return
-
-/datum/controller/subsystem/midi/proc/queue(target, midi)
- if(!prepped_midis)
- prepped_midis = list()
- var/datum/midi_record/MR = new()
- MR.target = target
- MR.midi = midi
- prepped_midis.Add(MR)
diff --git a/code/controllers/subsystem/processing/defprocess.dm b/code/controllers/subsystem/processing/defprocess.dm
new file mode 100644
index 000000000000..3701a0617a7a
--- /dev/null
+++ b/code/controllers/subsystem/processing/defprocess.dm
@@ -0,0 +1,5 @@
+PROCESSING_SUBSYSTEM_DEF(defprocess)
+ name = "Defenses Processing"
+ priority = SS_PRIORITY_DEFENSES
+ flags = SS_NO_INIT
+ wait = 0.7 SECONDS
diff --git a/code/controllers/subsystem/smoke_system.dm b/code/controllers/subsystem/smoke_system.dm
deleted file mode 100644
index 2010687fcba2..000000000000
--- a/code/controllers/subsystem/smoke_system.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-var/list/active_smoke_effects = list()
-
-
-SUBSYSTEM_DEF(smoke_effects)
- name = "Smoke Effects"
- wait = 1 SECONDS
- flags = SS_NO_INIT | SS_KEEP_TIMING
- priority = SS_PRIORITY_OBJECTS
-
- var/list/currentrun = list()
-
-/datum/controller/subsystem/smoke_effects/stat_entry(msg)
- msg = "P:[active_smoke_effects.len]"
- return ..()
-
-
-/datum/controller/subsystem/smoke_effects/fire(resumed = FALSE)
- if(!resumed)
- currentrun = active_smoke_effects.Copy()
-
- while(currentrun.len)
- var/obj/effect/particle_effect/smoke/E = currentrun[currentrun.len]
- currentrun.len--
-
- if(!E || QDELETED(E))
- continue
-
- E.process()
-
- if(MC_TICK_CHECK)
- return
diff --git a/code/controllers/subsystem/sound.dm b/code/controllers/subsystem/sound.dm
index 1935294394e7..4fdfd7935349 100644
--- a/code/controllers/subsystem/sound.dm
+++ b/code/controllers/subsystem/sound.dm
@@ -41,5 +41,5 @@ SUBSYSTEM_DEF(sound)
if(VI?.ready)
var/list/bounds = VI.get_middle_coords()
if(bounds.len >= 2)
- hearers |= SSquadtree.players_in_range(RECT(bounds[1], bounds[2], VI.map_template.height, VI.map_template.width), bounds[3])
+ hearers |= SSquadtree.players_in_range(RECT(bounds[1], bounds[2], VI.map_template.width, VI.map_template.height), bounds[3])
template_queue[template] = hearers
diff --git a/code/controllers/subsystem/stamina.dm b/code/controllers/subsystem/stamina.dm
deleted file mode 100644
index 84d5b4038cd0..000000000000
--- a/code/controllers/subsystem/stamina.dm
+++ /dev/null
@@ -1,25 +0,0 @@
-var/global/list/active_staminas = list()
-
-SUBSYSTEM_DEF(stamina)
- name = "Stamina"
- wait = 2 SECONDS
- priority = SS_PRIORITY_STAMINA
- flags = SS_NO_INIT
- var/list/currentrun = list()
-
-
-/datum/controller/subsystem/stamina/fire(resumed = FALSE)
- if (!resumed)
- currentrun = active_staminas.Copy()
-
- while (currentrun.len)
- var/datum/stamina/S = currentrun[currentrun.len]
- currentrun.len--
-
- if (!S || QDELETED(S))
- continue
-
- S.process()
-
- if (MC_TICK_CHECK)
- return
diff --git a/code/controllers/subsystem/stats_collector.dm b/code/controllers/subsystem/stats_collector.dm
deleted file mode 100644
index de66e3b2c6b1..000000000000
--- a/code/controllers/subsystem/stats_collector.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-/// Collects simple round statistics periodically
-SUBSYSTEM_DEF(stats_collector)
- name = "Round Stats"
- wait = 30 SECONDS
- priority = SS_PRIORITY_PAGER_STATUS
- runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
- flags = SS_KEEP_TIMING | SS_NO_INIT
-
- var/stat_ticks = 0
- var/players_counter = 0
-
-/datum/controller/subsystem/stats_collector/fire(resumed = FALSE)
- players_counter += length(GLOB.clients)
- stat_ticks++
-
-/datum/controller/subsystem/stats_collector/proc/get_avg_players()
- return players_counter / stat_ticks
diff --git a/code/controllers/subsystem/teleporter.dm b/code/controllers/subsystem/teleporter.dm
deleted file mode 100644
index b753bdb0d519..000000000000
--- a/code/controllers/subsystem/teleporter.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-// Master teleporter controller.
-SUBSYSTEM_DEF(teleporter)
- name = "Teleporter"
- wait = 5 SECONDS
- init_order = SS_INIT_TELEPORTER
- priority = SS_PRIORITY_TELEPORTER
- flags = SS_NO_FIRE|SS_NO_INIT
-
- var/list/teleporters_by_id = list() // Associative list of teleporters by ID, master list of teleporters to process
- var/list/teleporters = list() // Process list (identical contents to teleporters_by_id)
diff --git a/code/controllers/subsystem/xenocon.dm b/code/controllers/subsystem/xenocon.dm
deleted file mode 100644
index d16e59bd9813..000000000000
--- a/code/controllers/subsystem/xenocon.dm
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBSYSTEM_DEF(xenocon)
- name = "XENOCON"
- wait = 5 SECONDS
- priority = SS_PRIORITY_INACTIVITY
- flags = SS_NO_INIT
- var/rewarded = FALSE
-
-/datum/controller/subsystem/xenocon/fire(resumed = FALSE)
- if(rewarded)
- return
-
- var/datum/hive_status/hive
- for(var/hivenumber in GLOB.hive_datum)
- hive = GLOB.hive_datum[hivenumber]
- if(hive.xenocon_points >= XENOCON_THRESHOLD)
- var/datum/emergency_call/em_call = new /datum/emergency_call/xenos/platoon()
- em_call.activate()
- rewarded = TRUE
diff --git a/code/datums/disease.dm b/code/datums/disease.dm
index 92986b668b47..d2f466ebeb39 100644
--- a/code/datums/disease.dm
+++ b/code/datums/disease.dm
@@ -131,7 +131,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
/datum/disease/process()
if(!holder)
- active_diseases -= src
+ SSdisease.all_diseases -= src
return
if(prob(65))
spread(holder)
@@ -176,7 +176,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
/datum/disease/New(process=TRUE)//process = 1 - adding the object to global list. List is processed by master controller.
cure_list = list(cure_id) // to add more cures, add more vars to this list in the actual disease's New()
if(process) // Viruses in list are considered active.
- active_diseases += src
+ SSdisease.all_diseases += src
initial_spread = spread
/datum/disease/proc/IsSame(datum/disease/D)
@@ -191,5 +191,5 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
/datum/disease/Destroy()
affected_mob = null
holder = null
- active_diseases -= src
+ SSdisease.all_diseases -= src
. = ..()
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 6440c9734374..ad4703ba65fe 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -391,7 +391,7 @@ var/list/advance_cures = list(
D.AssignName(new_name)
D.Refresh()
- for(var/datum/disease/advance/AD in active_diseases)
+ for(var/datum/disease/advance/AD in SSdisease.all_diseases)
AD.Refresh()
for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list.Copy()))
@@ -409,7 +409,7 @@ var/list/advance_cures = list(
/*
/mob/verb/test()
- for(var/datum/disease/D in active_diseases)
+ for(var/datum/disease/D in SSdisease.all_diseases)
to_chat(src, "[D.name] - [D.holder]")
*/
diff --git a/code/datums/stamina/_stamina.dm b/code/datums/stamina/_stamina.dm
index 36705e3be300..e233aaa81676 100644
--- a/code/datums/stamina/_stamina.dm
+++ b/code/datums/stamina/_stamina.dm
@@ -37,13 +37,11 @@
current_stamina = Clamp(current_stamina - amount, 0, max_stamina)
if(current_stamina < max_stamina)
- if(!(src in active_staminas))
- active_staminas.Add(src)
-
+ START_PROCESSING(SSobj, src)
if(amount > 0)
apply_rest_period(STAMINA_REST_PERIOD)
else
- active_staminas.Remove(src)
+ STOP_PROCESSING(SSobj, src)
update_stamina_level()
diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm
index 6ced81a22b15..742ae7a1addb 100644
--- a/code/game/area/almayer.dm
+++ b/code/game/area/almayer.dm
@@ -13,6 +13,21 @@
ambience_exterior = AMBIENCE_ALMAYER
ceiling_muffle = FALSE
+ ///Whether this area is used for hijack evacuation progress
+ var/hijack_evacuation_area = FALSE
+
+ ///The weight this area gives towards hijack evacuation progress
+ var/hijack_evacuation_weight = 0
+
+ ///Whether this area is additive or multiplicative towards evacuation progress
+ var/hijack_evacuation_type = EVACUATION_TYPE_NONE
+
+/area/almayer/Initialize(mapload, ...)
+ . = ..()
+
+ if(hijack_evacuation_area)
+ SShijack.progress_areas[src] = power_equip
+
/area/shuttle/almayer/elevator_maintenance/upperdeck
name = "\improper Maintenance Elevator"
icon_state = "shuttle"
@@ -160,6 +175,9 @@
fake_zlevel = 2 // lowerdeck
soundscape_playlist = SCAPE_PL_ENG
soundscape_interval = 15
+ hijack_evacuation_area = TRUE
+ hijack_evacuation_weight = 0.2
+ hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE
/area/almayer/engineering/starboard_atmos
name = "\improper Atmospherics Starboard"
@@ -183,6 +201,9 @@
name = "\improper Astronavigational Deck"
icon_state = "astronavigation"
fake_zlevel = 2 // lowerdeck
+ hijack_evacuation_area = TRUE
+ hijack_evacuation_weight = 1.1
+ hijack_evacuation_type = EVACUATION_TYPE_MULTIPLICATIVE
/area/almayer/shipboard/panic
name = "\improper Hangar Panic Room"
@@ -712,6 +733,9 @@
icon_state = "lifeboat_pump"
requires_power = 1
fake_zlevel = 1
+ hijack_evacuation_area = TRUE
+ hijack_evacuation_weight = 0.1
+ hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE
/area/almayer/lifeboat_pumps/north1
name = "North West Lifeboat Fuel Pump"
diff --git a/code/game/gamemodes/cm_self_destruct.dm b/code/game/gamemodes/cm_self_destruct.dm
deleted file mode 100644
index 07c9c43a4768..000000000000
--- a/code/game/gamemodes/cm_self_destruct.dm
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
-TODO
-Look into animation screen not showing on self-destruct and other weirdness
-Intergrate distress into this controller.
-Finish nanoui conversion for comm console.
-Make sure people who get nuked and wake up from SSD don't live.
-Add flashing lights to evac. //DEFERRED TO BETTER LIGHTING
-Finish the game mode announcement thing.
-Fix escape doors to work properly.
-*/
-
-/*
-How this works:
-
-First: All of the linking is done automatically on world start, so nothing needs to be done on that end other than making
-sure that objects are actually placed in the game world. If not, the game will error and let you know about it. But you
-don't need to modify variables or worry about area placement. It's all done for you.
-The rods, for example, configure the time per activation based on their number. Shuttles link their own machines via area.
-Nothing in this controller is linked to game mode, so it's stand alone, more or less, but it's best used during a game mode.
-Admins have a lot of tools in their disposal via the check antagonist panel, and devs can access the VV of this controller
-through that panel.
-
-Second: The communication console handles most of the IC triggers for activating these functions, the rest is handled elsewhere.
-Check communications.dm for that. shuttle_controller.dm handles the set up for the escape pods. escape_pods.dm handles most of the
-functions of the escape pods themselves. This file would likely need to be broken down into individual parts at some point in the
-future.
-
-Evacuation takes place when sufficient alert level is reaised and a distress beacon was launched. All of the evac pods come online
-and open their doors to allow entry inside. Characters may then get inside of the cryo units to before the shuttles automatically launch.
-If wanted, a nearby controller object may launch each individual shuttle early. Only three people may ride on a shuttle to escape,
-otherwise the launch will fail and the shuttle will become inoperable.
-Any launched shuttles are taken out of the game. If the evacuation is canceled, any persons inside of the cryo tubes will be ejected.
-They may temporarily open the door to exit if they are stuck inside after evac is canceled.
-
-When the self-destruct is enabled, the console comes online. This usually happens during an evacuation. Once the console is
-interacted with, it fires up the self-destruct sequence. Several rods rise and must be interacted with in order to arm the system.
-Once that happens, the console must be interacted with again to trigger the self-destruct. The self-destruct may also be
-canceled from the console.
-
-The self-destruct may also happen if a nuke is detonated on the ship's zlevel; if it is detonated elsewhere, the ship will not blow up.
-Regardless of where it's detonated, or how, a successful detonation will end the round or automatically restart the game.
-
-All of the necessary difines are stored under mode.dm in defines.
-*/
-
-var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initited elsewhere so that the world has a chance to load in.
-
-/datum/authority/branch/evacuation
- var/name = "Evacuation Authority"
- var/evac_time //Time the evacuation was initiated.
- var/evac_status = EVACUATION_STATUS_STANDING_BY //What it's doing now? It can be standing by, getting ready to launch, or finished.
-
- var/obj/structure/machinery/self_destruct/console/dest_master //The main console that does the brunt of the work.
- var/dest_rods[] //Slave devices to make the explosion work.
- var/dest_cooldown //How long it takes between rods, determined by the amount of total rods present.
- var/dest_index = 1 //What rod the thing is currently on.
- var/dest_status = NUKE_EXPLOSION_INACTIVE
- var/dest_started_at = 0
-
- var/flags_scuttle = NO_FLAGS
-
-/datum/authority/branch/evacuation/New()
- ..()
- dest_master = locate()
- if(!dest_master)
- log_debug("ERROR CODE SD1: could not find master self-destruct console")
- to_world(SPAN_DEBUG("ERROR CODE SD1: could not find master self-destruct console"))
- return FALSE
- dest_rods = new
- for(var/obj/structure/machinery/self_destruct/rod/I in dest_master.loc.loc) dest_rods += I
- if(!dest_rods.len)
- log_debug("ERROR CODE SD2: could not find any self-destruct rods")
- to_world(SPAN_DEBUG("ERROR CODE SD2: could not find any self-destruct rods"))
- QDEL_NULL(dest_master)
- return FALSE
- dest_cooldown = SELF_DESTRUCT_ROD_STARTUP_TIME / dest_rods.len
- dest_master.desc = "The main operating panel for a self-destruct system. It requires very little user input, but the final safety mechanism is manually unlocked.\nAfter the initial start-up sequence, [dest_rods.len] control rods must be armed, followed by manually flipping the detonation switch."
-
-/**
- * This proc returns the ship's z level list (or whatever specified),
- * when an evac/self-destruct happens.
- */
-/datum/authority/branch/evacuation/proc/get_affected_zlevels()
- //Nuke is not in progress, end the round on ship only.
- if(dest_status < NUKE_EXPLOSION_IN_PROGRESS && SSticker?.mode.is_in_endgame)
- . = SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP))
- return
-
-//=========================================================================================
-//=========================================================================================
-//=====================================EVACUATION==========================================
-//=========================================================================================
-//=========================================================================================
-
-
-/datum/authority/branch/evacuation/proc/initiate_evacuation(force=0) //Begins the evacuation procedure.
- if(force || (evac_status == EVACUATION_STATUS_STANDING_BY && !(flags_scuttle & FLAGS_EVACUATION_DENY)))
- evac_time = world.time
- evac_status = EVACUATION_STATUS_INITIATING
- ai_announcement("Attention. Emergency. All personnel must evacuate immediately. You have [round(EVACUATION_ESTIMATE_DEPARTURE/60,1)] minute\s until departure.", 'sound/AI/evacuate.ogg')
- xeno_message_all("A wave of adrenaline ripples through the hive. The fleshy creatures are trying to escape!")
-
- for(var/obj/structure/machinery/status_display/SD in machines)
- if(is_mainship_level(SD.z))
- SD.set_picture("evac")
- for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile)
- shuttle.prepare_evac()
- activate_lifeboats()
- process_evacuation()
- return TRUE
-
-/datum/authority/branch/evacuation/proc/cancel_evacuation() //Cancels the evac procedure. Useful if admins do not want the marines leaving.
- if(evac_status == EVACUATION_STATUS_INITIATING)
- evac_time = null
- evac_status = EVACUATION_STATUS_STANDING_BY
- deactivate_lifeboats()
- ai_announcement("Evacuation has been cancelled.", 'sound/AI/evacuate_cancelled.ogg')
-
- if(get_security_level() == "red")
- for(var/obj/structure/machinery/status_display/SD in machines)
- if(is_mainship_level(SD.z))
- SD.set_picture("redalert")
-
- for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile)
- shuttle.cancel_evac()
- return TRUE
-
-/datum/authority/branch/evacuation/proc/begin_launch() //Launches the pods.
- if(evac_status == EVACUATION_STATUS_INITIATING)
- evac_status = EVACUATION_STATUS_IN_PROGRESS //Cannot cancel at this point. All shuttles are off.
- spawn() //One of the few times spawn() is appropriate. No need for a new proc.
- ai_announcement("WARNING: Evacuation order confirmed. Launching escape pods.", 'sound/AI/evacuation_confirmed.ogg')
- addtimer(CALLBACK(src, PROC_REF(launch_lifeboats)), 10 SECONDS) // giving some time to board lifeboats
-
- for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile)
- shuttle.evac_launch()
- sleep(50)
-
- sleep(300) //Sleep 30 more seconds to make sure everyone had a chance to leave.
- var/lifesigns = 0
- // lifesigns += P.passengers
- var/obj/docking_port/mobile/crashable/lifeboat/lifeboat1 = SSshuttle.getShuttle(MOBILE_SHUTTLE_LIFEBOAT_PORT)
- lifeboat1.check_for_survivors()
- lifesigns += lifeboat1.survivors
- var/obj/docking_port/mobile/crashable/lifeboat/lifeboat2 = SSshuttle.getShuttle(MOBILE_SHUTTLE_LIFEBOAT_STARBOARD)
- lifeboat2.check_for_survivors()
- lifesigns += lifeboat2.survivors
- ai_announcement("ATTENTION: Evacuation complete. Outbound lifesigns detected: [lifesigns ? lifesigns : "none"].", 'sound/AI/evacuation_complete.ogg')
- evac_status = EVACUATION_STATUS_COMPLETE
- return TRUE
-
-/datum/authority/branch/evacuation/proc/process_evacuation() //Process the timer.
- set background = 1
-
- spawn while(evac_status == EVACUATION_STATUS_INITIATING) //If it's not departing, no need to process.
- if(world.time >= evac_time + EVACUATION_AUTOMATIC_DEPARTURE) begin_launch()
- sleep(10) //One second.
-
-/datum/authority/branch/evacuation/proc/get_status_panel_eta()
- switch(evac_status)
- if(EVACUATION_STATUS_INITIATING)
- var/eta = EVACUATION_ESTIMATE_DEPARTURE
- . = "[(eta / 60) % 60]:[add_zero(num2text(eta % 60), 2)]"
- if(EVACUATION_STATUS_IN_PROGRESS) . = "NOW"
-
-// LIFEBOATS CORNER
-/datum/authority/branch/evacuation/proc/activate_lifeboats()
- for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks)
- var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked()
- if(lifeboat && lifeboat.available)
- lifeboat.status = LIFEBOAT_ACTIVE
- lifeboat_dock.open_dock()
-
-
-/datum/authority/branch/evacuation/proc/deactivate_lifeboats()
- for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks)
- var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked()
- if(lifeboat && lifeboat.available)
- lifeboat.status = LIFEBOAT_INACTIVE
-
-/datum/authority/branch/evacuation/proc/launch_lifeboats()
- for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks)
- var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked()
- if(lifeboat && lifeboat.available)
- lifeboat.evac_launch()
-
-//=========================================================================================
-//=========================================================================================
-//=====================================SELF DETRUCT========================================
-//=========================================================================================
-//=========================================================================================
-
-/datum/authority/branch/evacuation/proc/enable_self_destruct(force=0)
- if(force || (dest_status == NUKE_EXPLOSION_INACTIVE && !(flags_scuttle & FLAGS_SELF_DESTRUCT_DENY)))
- dest_status = NUKE_EXPLOSION_ACTIVE
- dest_master.lock_or_unlock()
- dest_started_at = world.time
- set_security_level(SEC_LEVEL_DELTA) //also activate Delta alert, to open the SD shutters.
- spawn(0)
- for(var/obj/structure/machinery/door/poddoor/shutters/almayer/D in machines)
- if(D.id == "sd_lockdown")
- D.open()
- return TRUE
-
-//Override is for admins bypassing normal player restrictions.
-/datum/authority/branch/evacuation/proc/cancel_self_destruct(override)
- if(dest_status == NUKE_EXPLOSION_ACTIVE)
- var/obj/structure/machinery/self_destruct/rod/I
- var/i
- for(i in EvacuationAuthority.dest_rods)
- I = i
- if(I.active_state == SELF_DESTRUCT_MACHINE_ARMED && !override)
- dest_master.state(SPAN_WARNING("WARNING: Unable to cancel detonation. Please disarm all control rods."))
- return FALSE
-
- dest_status = NUKE_EXPLOSION_INACTIVE
- dest_master.in_progress = 1
- dest_started_at = 0
- for(i in dest_rods)
- I = i
- if(I.active_state == SELF_DESTRUCT_MACHINE_ACTIVE || (I.active_state == SELF_DESTRUCT_MACHINE_ARMED && override)) I.lock_or_unlock(1)
- dest_master.lock_or_unlock(1)
- dest_index = 1
- ai_announcement("The emergency destruct system has been deactivated.", 'sound/AI/selfdestruct_deactivated.ogg')
- if(evac_status == EVACUATION_STATUS_STANDING_BY) //the evac has also been cancelled or was never started.
- set_security_level(SEC_LEVEL_RED, TRUE) //both SD and evac are inactive, lowering the security level.
- return TRUE
-
-/datum/authority/branch/evacuation/proc/initiate_self_destruct(override)
- if(dest_status < NUKE_EXPLOSION_IN_PROGRESS)
- var/obj/structure/machinery/self_destruct/rod/I
- var/i
- for(i in dest_rods)
- I = i
- if(I.active_state != SELF_DESTRUCT_MACHINE_ARMED && !override)
- dest_master.state(SPAN_WARNING("WARNING: Unable to trigger detonation. Please arm all control rods."))
- return FALSE
- dest_master.in_progress = !dest_master.in_progress
- for(i in EvacuationAuthority.dest_rods)
- I = i
- I.in_progress = 1
- ai_announcement("DANGER. DANGER. Self-destruct system activated. DANGER. DANGER. Self-destruct in progress. DANGER. DANGER.")
- trigger_self_destruct(,,override)
- return TRUE
-
-/datum/authority/branch/evacuation/proc/trigger_self_destruct(list/z_levels = SSmapping.levels_by_trait(ZTRAIT_MARINE_MAIN_SHIP), origin = dest_master, override = FALSE, end_type = NUKE_EXPLOSION_FINISHED, play_anim = TRUE, end_round = TRUE)
- set waitfor = 0
- if(dest_status < NUKE_EXPLOSION_IN_PROGRESS) //One more check for good measure, in case it's triggered through a bomb instead of the destruct mechanism/admin panel.
- dest_status = NUKE_EXPLOSION_IN_PROGRESS
- playsound(origin, 'sound/machines/Alarm.ogg', 75, 0, 30)
- world << pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg')
-
- var/ship_status = 1
- for(var/i in z_levels)
- if(is_mainship_level(i))
- ship_status = 0 //Destroyed.
- break
-
- var/list/alive_mobs = list() //Everyone who will be destroyed on the zlevel(s).
- var/list/dead_mobs = list() //Everyone who only needs to see the cinematic.
- for(var/mob/current_mob as anything in GLOB.mob_list) //This only does something cool for the people about to die, but should prove pretty interesting.
- var/turf/current_turf = get_turf(current_mob)
- if(!current_mob || !current_mob.loc || !current_turf)
- continue //In case something changes when we sleep().
- if(current_mob.stat == DEAD)
- dead_mobs |= current_mob
- continue
- if(current_turf.z in z_levels)
- alive_mobs |= current_mob
- shake_camera(current_mob, 110, 4)
-
-
- sleep(100)
- /*Hardcoded for now, since this was never really used for anything else.
- Would ideally use a better system for showing cutscenes.*/
- var/atom/movable/screen/cinematic/explosion/C = new
-
- if(play_anim)
- for(var/mob/current_mob as anything in alive_mobs + dead_mobs)
- if(current_mob && current_mob.loc && current_mob.client)
- current_mob.client.add_to_screen(C) //They may have disconnected in the mean time.
-
- sleep(15) //Extra 1.5 seconds to look at the ship.
- flick(override ? "intro_override" : "intro_nuke", C)
- sleep(35)
- for(var/mob/current_mob in alive_mobs)
- if(current_mob && current_mob.loc) //Who knows, maybe they escaped, or don't exist anymore.
- var/turf/current_mob_turf = get_turf(current_mob)
- if(!current_mob_turf)
- continue
- if(current_mob_turf.z in z_levels)
- if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge))
- continue
- current_mob.death(create_cause_data("nuclear explosion"))
- else
- if(play_anim)
- current_mob.client.remove_from_screen(C) //those who managed to escape the z level at last second shouldn't have their view obstructed.
- if(play_anim)
- flick(ship_status ? "ship_spared" : "ship_destroyed", C)
- C.icon_state = ship_status ? "summary_spared" : "summary_destroyed"
- world << sound('sound/effects/explosionfar.ogg')
-
- if(end_round)
- dest_status = end_type
-
- sleep(5)
- if(SSticker.mode)
- SSticker.mode.check_win()
-
- if(!SSticker.mode) //Just a safety, just in case a mode isn't running, somehow.
- to_world(SPAN_ROUNDBODY("Resetting in 30 seconds!"))
- sleep(300)
- log_game("Rebooting due to nuclear detonation.")
- world.Reboot()
- return TRUE
-
-/datum/authority/branch/evacuation/proc/process_self_destruct()
- set background = 1
-
- spawn while(dest_master && dest_master.loc && dest_master.active_state == SELF_DESTRUCT_MACHINE_ARMED && dest_status == NUKE_EXPLOSION_ACTIVE && dest_index <= dest_rods.len)
- var/obj/structure/machinery/self_destruct/rod/I = dest_rods[dest_index]
- if(world.time >= dest_cooldown + I.activate_time)
- I.lock_or_unlock() //Unlock it.
- if(++dest_index <= dest_rods.len)
- I = dest_rods[dest_index]//Start the next sequence.
- I.activate_time = world.time
- sleep(10) //Checks every second. Could integrate into another controller for better tracking.
-
-//Generic parent base for the self_destruct items.
-/obj/structure/machinery/self_destruct
- icon = 'icons/obj/structures/machinery/self_destruct.dmi'
- icon_state = "console_1"
- var/base_icon_state = "console"
- use_power = USE_POWER_NONE //Runs unpowered, may need to change later.
- density = FALSE
- anchored = TRUE //So it doesn't go anywhere.
- unslashable = TRUE
- unacidable = TRUE //Cannot C4 it either.
- mouse_opacity = FALSE //No need to click or interact with this initially.
- var/in_progress = 0 //Cannot interact with while it's doing something, like an animation.
- var/active_state = SELF_DESTRUCT_MACHINE_INACTIVE //What step of the process it's on.
-
-/obj/structure/machinery/self_destruct/Initialize(mapload, ...)
- . = ..()
- icon_state = "[base_icon_state]_1"
-
-/obj/structure/machinery/self_destruct/Destroy()
- . = ..()
- machines -= src
- operator = null
-
-/obj/structure/machinery/self_destruct/ex_act(severity)
- return FALSE
-
-/obj/structure/machinery/self_destruct/attack_hand()
- if(..() || in_progress)
- return FALSE //This check is backward, ugh.
- return TRUE
-
-//Add sounds.
-/obj/structure/machinery/self_destruct/proc/lock_or_unlock(lock)
- set waitfor = 0
- in_progress = 1
- flick("[base_icon_state]" + (lock? "_5" : "_2"),src)
- sleep(9)
- mouse_opacity = !mouse_opacity
- icon_state = "[base_icon_state]" + (lock? "_1" : "_3")
- in_progress = 0
- active_state = active_state > SELF_DESTRUCT_MACHINE_INACTIVE ? SELF_DESTRUCT_MACHINE_INACTIVE : SELF_DESTRUCT_MACHINE_ACTIVE
-
-/obj/structure/machinery/self_destruct/console
- name = "self-destruct control panel"
- icon_state = "console_1"
- base_icon_state = "console"
- req_one_access = list(ACCESS_MARINE_CO, ACCESS_MARINE_SENIOR)
-
-/obj/structure/machinery/self_destruct/console/Destroy()
- . = ..()
- EvacuationAuthority.dest_master = null
- EvacuationAuthority.dest_rods = null
-
-/obj/structure/machinery/self_destruct/console/lock_or_unlock(lock)
- playsound(src, 'sound/machines/hydraulics_1.ogg', 25, 1)
- ..()
-
-//TODO: Add sounds.
-/obj/structure/machinery/self_destruct/console/attack_hand(mob/user)
- if(inoperable())
- return
-
- tgui_interact(user)
-
-/obj/structure/machinery/self_destruct/console/tgui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "SelfDestructConsole", name)
- ui.open()
-
-/obj/structure/machinery/sleep_console/ui_status(mob/user, datum/ui_state/state)
- . = ..()
- if(inoperable())
- return UI_CLOSE
-
-
-/obj/structure/machinery/self_destruct/console/ui_data(mob/user)
- var/list/data = list()
-
- data["dest_status"] = active_state
-
- return data
-
-/obj/structure/machinery/self_destruct/console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
- . = ..()
- if(.)
- return
-
- switch(action)
- if("dest_start")
- to_chat(usr, SPAN_NOTICE("You press a few keys on the panel."))
- to_chat(usr, SPAN_NOTICE("The system must be booting up the self-destruct sequence now."))
- playsound(src.loc, 'sound/items/rped.ogg', 25, TRUE)
- sleep(2 SECONDS)
- ai_announcement("Danger. The emergency destruct system is now activated. The ship will detonate in T-minus 20 minutes. Automatic detonation is unavailable. Manual detonation is required.", 'sound/AI/selfdestruct.ogg')
- active_state = SELF_DESTRUCT_MACHINE_ARMED //Arm it here so the process can execute it later.
- var/obj/structure/machinery/self_destruct/rod/I = EvacuationAuthority.dest_rods[EvacuationAuthority.dest_index]
- I.activate_time = world.time
- EvacuationAuthority.process_self_destruct()
- . = TRUE
-
- if("dest_trigger")
- EvacuationAuthority.initiate_self_destruct()
- . = TRUE
-
- if("dest_cancel")
- if(!allowed(usr))
- to_chat(usr, SPAN_WARNING("You don't have the necessary clearance to cancel the emergency destruct system!"))
- return
- EvacuationAuthority.cancel_self_destruct()
- . = TRUE
-
-/obj/structure/machinery/self_destruct/rod
- name = "self-destruct control rod"
- desc = "It is part of a complicated self-destruct sequence, but relatively simple to operate. Twist to arm or disarm."
- icon_state = "rod_1"
- base_icon_state = "rod"
- layer = BELOW_OBJ_LAYER
- var/activate_time
-
-/obj/structure/machinery/self_destruct/rod/Destroy()
- . = ..()
- if(EvacuationAuthority && EvacuationAuthority.dest_rods)
- EvacuationAuthority.dest_rods -= src
-
-/obj/structure/machinery/self_destruct/rod/lock_or_unlock(lock)
- playsound(src, 'sound/machines/hydraulics_2.ogg', 25, 1)
- ..()
- if(lock)
- activate_time = null
- density = FALSE
- layer = initial(layer)
- else
- density = TRUE
- layer = ABOVE_OBJ_LAYER
-
-/obj/structure/machinery/self_destruct/rod/attack_hand(mob/user)
- if(..())
- switch(active_state)
- if(SELF_DESTRUCT_MACHINE_ACTIVE)
- to_chat(user, SPAN_NOTICE("You twist and release the control rod, arming it."))
- playsound(src, 'sound/machines/switch.ogg', 25, 1)
- icon_state = "rod_4"
- active_state = SELF_DESTRUCT_MACHINE_ARMED
- if(SELF_DESTRUCT_MACHINE_ARMED)
- to_chat(user, SPAN_NOTICE("You twist and release the control rod, disarming it."))
- playsound(src, 'sound/machines/switch.ogg', 25, 1)
- icon_state = "rod_3"
- active_state = SELF_DESTRUCT_MACHINE_ACTIVE
- else to_chat(user, SPAN_WARNING("The control rod is not ready."))
diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm
index df04873ac140..7b1c695ade2b 100644
--- a/code/game/gamemodes/colonialmarines/colonialmarines.dm
+++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm
@@ -297,29 +297,25 @@
if(SSticker.current_state != GAME_STATE_PLAYING)
return
- var/living_player_list[] = count_humans_and_xenos(EvacuationAuthority.get_affected_zlevels())
+ var/living_player_list[] = count_humans_and_xenos(get_affected_zlevels())
var/num_humans = living_player_list[1]
var/num_xenos = living_player_list[2]
if(force_end_at && world.time > force_end_at)
round_finished = MODE_INFESTATION_X_MINOR
- if(EvacuationAuthority.dest_status == NUKE_EXPLOSION_FINISHED)
- round_finished = MODE_GENERIC_DRAW_NUKE //Nuke went off, ending the round.
- if(EvacuationAuthority.dest_status == NUKE_EXPLOSION_GROUND_FINISHED)
- round_finished = MODE_INFESTATION_M_MINOR //Nuke went off, ending the round.
- if(EvacuationAuthority.dest_status < NUKE_EXPLOSION_IN_PROGRESS) //If the nuke ISN'T in progress. We do not want to end the round before it detonates.
- if(!num_humans && num_xenos) //No humans remain alive.
- round_finished = MODE_INFESTATION_X_MAJOR //Evacuation did not take place. Everyone died.
- else if(num_humans && !num_xenos)
- if(SSticker.mode && SSticker.mode.is_in_endgame)
- round_finished = MODE_INFESTATION_X_MINOR //Evacuation successfully took place.
- else
- SSticker.roundend_check_paused = TRUE
- round_finished = MODE_INFESTATION_M_MAJOR //Humans destroyed the xenomorphs.
- ares_conclude()
- addtimer(VARSET_CALLBACK(SSticker, roundend_check_paused, FALSE), MARINE_MAJOR_ROUND_END_DELAY)
- else if(!num_humans && !num_xenos)
- round_finished = MODE_INFESTATION_DRAW_DEATH //Both were somehow destroyed.
+
+ if(!num_humans && num_xenos) //No humans remain alive.
+ round_finished = MODE_INFESTATION_X_MAJOR //Evacuation did not take place. Everyone died.
+ else if(num_humans && !num_xenos)
+ if(SSticker.mode && SSticker.mode.is_in_endgame)
+ round_finished = MODE_INFESTATION_X_MINOR //Evacuation successfully took place.
+ else
+ SSticker.roundend_check_paused = TRUE
+ round_finished = MODE_INFESTATION_M_MAJOR //Humans destroyed the xenomorphs.
+ ares_conclude()
+ addtimer(VARSET_CALLBACK(SSticker, roundend_check_paused, FALSE), MARINE_MAJOR_ROUND_END_DELAY)
+ else if(!num_humans && !num_xenos)
+ round_finished = MODE_INFESTATION_DRAW_DEATH //Both were somehow destroyed.
/datum/game_mode/colonialmarines/check_queen_status(hivenumber)
set waitfor = 0
@@ -367,7 +363,7 @@
round_statistics.current_map.total_marine_victories++
round_statistics.current_map.total_marine_majors++
if(MODE_INFESTATION_X_MINOR)
- var/list/living_player_list = count_humans_and_xenos(EvacuationAuthority.get_affected_zlevels())
+ var/list/living_player_list = count_humans_and_xenos(get_affected_zlevels())
if(living_player_list[1] && !living_player_list[2]) // If Xeno Minor but Xenos are dead and Humans are alive, see which faction is the last standing
var/headcount = count_per_faction()
var/living = headcount["total_headcount"]
diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
index 6669dc058ee7..9b3ef1df4c15 100644
--- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
+++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
@@ -152,9 +152,6 @@
spawn(0)
//Deleting Almayer, for performance!
SSitem_cleanup.delete_almayer()
- if(SSxenocon)
- //Don't need XENOCON
- SSxenocon.wait = 30 MINUTES
//PROCCESS
diff --git a/code/game/gamemodes/colonialmarines/xenovsxeno.dm b/code/game/gamemodes/colonialmarines/xenovsxeno.dm
index 5623295f1915..a19c3e3582c1 100644
--- a/code/game/gamemodes/colonialmarines/xenovsxeno.dm
+++ b/code/game/gamemodes/colonialmarines/xenovsxeno.dm
@@ -79,9 +79,6 @@
spawn(0)
//Deleting Almayer, for performance!
SSitem_cleanup.delete_almayer()
- if(SSxenocon)
- //Don't need XENOCON
- SSxenocon.wait = 30 MINUTES
////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/game/gamemodes/extended/infection.dm b/code/game/gamemodes/extended/infection.dm
index 04e0545361aa..a6b909022aef 100644
--- a/code/game/gamemodes/extended/infection.dm
+++ b/code/game/gamemodes/extended/infection.dm
@@ -95,7 +95,7 @@
possible_survivors -= new_survivor //either we drafted a survivor, or we're skipping over someone, either or - remove them
/datum/game_mode/infection/check_win()
- var/living_player_list[] = count_humans_and_xenos(EvacuationAuthority.get_affected_zlevels())
+ var/list/living_player_list = count_humans_and_xenos(get_affected_zlevels())
var/num_humans = living_player_list[1]
var/zed = living_player_list[2]
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 5382d80f37a2..e467631c915e 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -111,6 +111,10 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki
log_game("Server IP: [world.internet_address]:[world.port]")
return TRUE
+/datum/game_mode/proc/get_affected_zlevels()
+ if(is_in_endgame)
+ . = SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP))
+ return
///process()
///Called by the gameticker
@@ -119,8 +123,7 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki
/datum/game_mode/proc/check_finished() //to be called by ticker
- if(EvacuationAuthority.dest_status == NUKE_EXPLOSION_FINISHED || EvacuationAuthority.dest_status == NUKE_EXPLOSION_GROUND_FINISHED )
- return TRUE
+ return
/datum/game_mode/proc/cleanup() //This is called when the round has ended but not the game, if any cleanup would be necessary in that case.
return
diff --git a/code/game/jobs/job/civilians/other/liaison.dm b/code/game/jobs/job/civilians/other/liaison.dm
index 7f73376a05dd..cbbb87124957 100644
--- a/code/game/jobs/job/civilians/other/liaison.dm
+++ b/code/game/jobs/job/civilians/other/liaison.dm
@@ -6,7 +6,7 @@
selection_class = "job_cl"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/liaison
- entry_message_body = "As a representative of Weyland-Yutani Corporation, your job requires you to stay in character at all times. You are not required to follow military orders; however, you cannot give military orders. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal."
+ entry_message_body = "As a representative of Weyland-Yutani Corporation, your job requires you to stay in character at all times. You are not required to follow military orders; however, you cannot give military orders. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal."
var/mob/living/carbon/human/active_liaison
/datum/job/civilian/liaison/generate_entry_conditions(mob/living/liaison, whitelist_status)
diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm
index 4b1975015a95..97578eb1159d 100644
--- a/code/game/jobs/job/civilians/other/mess_seargent.dm
+++ b/code/game/jobs/job/civilians/other/mess_seargent.dm
@@ -6,7 +6,7 @@
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
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!"
+ 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!"
/obj/effect/landmark/start/chef
name = JOB_MESS_SERGEANT
diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm
index 5c82241c47de..23097e139eda 100644
--- a/code/game/jobs/job/civilians/other/survivors.dm
+++ b/code/game/jobs/job/civilians/other/survivors.dm
@@ -10,6 +10,8 @@
job_options = SURVIVOR_VARIANT_LIST
var/intro_text
var/story_text
+ /// Whether or not the survivor is an inherently hostile to marines.
+ var/hostile = FALSE
/datum/job/civilian/survivor/set_spawn_positions(count)
spawn_positions = Clamp((round(count * SURVIVOR_TO_TOTAL_SPAWN_RATIO)), 2, 8)
@@ -59,23 +61,32 @@
if(picked_spawner.story_text)
story_text = picked_spawner.story_text
+
+ if(picked_spawner.hostile)
+ hostile = TRUE
+
new /datum/cm_objective/move_mob/almayer/survivor(H)
-/datum/job/civilian/survivor/generate_entry_message(mob/living/carbon/human/H)
+/datum/job/civilian/survivor/generate_entry_message(mob/living/carbon/human/survivor)
if(intro_text)
for(var/line in intro_text)
- to_chat(H, line)
+ to_chat(survivor, line)
else
- to_chat(H, "You are a survivor!
")
- to_chat(H, SPAN_NOTICE(SSmapping.configs[GROUND_MAP].survivor_message))
- to_chat(H, SPAN_NOTICE("You are fully aware of the xenomorph threat and are able to use this knowledge as you see fit."))
- to_chat(H, SPAN_NOTICE("You are NOT aware of the marines or their intentions. "))
+ to_chat(survivor, "You are a survivor!
")
+ to_chat(survivor, SPAN_NOTICE(SSmapping.configs[GROUND_MAP].survivor_message))
+ to_chat(survivor, SPAN_NOTICE("You are fully aware of the xenomorph threat and are able to use this knowledge as you see fit."))
+ to_chat(survivor, SPAN_NOTICE("You are NOT aware of the marines or their intentions. "))
if(story_text)
- to_chat(H, story_text)
- H.mind.memory += story_text
+ to_chat(survivor, story_text)
+ survivor.mind.memory += story_text
+ else
+ tell_survivor_story(survivor)
+
+ if(hostile)
+ to_chat(survivor, SPAN_HIGHDANGER("You are HOSTILE to the USCM!"))
else
- tell_survivor_story(H)
+ to_chat(survivor, SPAN_XENOHIGHDANGER("You are NON-HOSTILE to the USCM!"))
/datum/job/civilian/survivor/proc/tell_survivor_story(mob/living/carbon/human/H)
var/list/survivor_story = list(
diff --git a/code/game/jobs/job/civilians/support/cmo.dm b/code/game/jobs/job/civilians/support/cmo.dm
index 8c4690ea2057..835f16f7d814 100644
--- a/code/game/jobs/job/civilians/support/cmo.dm
+++ b/code/game/jobs/job/civilians/support/cmo.dm
@@ -6,7 +6,7 @@
selection_class = "job_cmo"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/cmo
- entry_message_body = "You're a commissioned officer of the USCM. You have authority over everything related to Medbay and Research, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall."
+ entry_message_body = "You're a commissioned officer of the USCM. You have authority over everything related to Medbay and Research, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall."
AddTimelock(/datum/job/civilian/professor, list(
JOB_MEDIC_ROLES = 10 HOURS
diff --git a/code/game/jobs/job/civilians/support/nurse.dm b/code/game/jobs/job/civilians/support/nurse.dm
index 7a0cab16f559..8912011298dc 100644
--- a/code/game/jobs/job/civilians/support/nurse.dm
+++ b/code/game/jobs/job/civilians/support/nurse.dm
@@ -6,7 +6,7 @@
selection_class = "job_doctor"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/nurse
- entry_message_body = "You are tasked with keeping the Marines healthy and strong. You are also an expert when it comes to medication and treatment, and can do minor surgical procedures. Focus on assisting doctors and triaging wounded marines."
+ entry_message_body = "You are tasked with keeping the Marines healthy and strong. You are also an expert when it comes to medication and treatment, and can do minor surgical procedures. Focus on assisting doctors and triaging wounded marines."
/obj/effect/landmark/start/nurse
name = JOB_NURSE
diff --git a/code/game/jobs/job/civilians/support/researcher.dm b/code/game/jobs/job/civilians/support/researcher.dm
index 61245c8164ab..21163f27959d 100644
--- a/code/game/jobs/job/civilians/support/researcher.dm
+++ b/code/game/jobs/job/civilians/support/researcher.dm
@@ -10,7 +10,7 @@
selection_class = "job_researcher"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/researcher
- entry_message_body = "You're a commissioned officer of the USCM, though you are not in the ship's chain of command. You are tasked with researching and developing new medical treatments, helping your fellow doctors, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor."
+ entry_message_body = "You're a commissioned officer of the USCM, though you are not in the ship's chain of command. You are tasked with researching and developing new medical treatments, helping your fellow doctors, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor."
/datum/job/civilian/researcher/set_spawn_positions(count)
spawn_positions = rsc_slot_formula(count)
diff --git a/code/game/jobs/job/civilians/support/synthetic.dm b/code/game/jobs/job/civilians/support/synthetic.dm
index 3e02385bc96c..70060fb36a15 100644
--- a/code/game/jobs/job/civilians/support/synthetic.dm
+++ b/code/game/jobs/job/civilians/support/synthetic.dm
@@ -9,7 +9,7 @@
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN
flags_whitelist = WHITELIST_SYNTHETIC
gear_preset = /datum/equipment_preset/synth/uscm
- entry_message_body = "You are a Synthetic! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!"
+ entry_message_body = "You are a Synthetic! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!"
/datum/job/civilian/synthetic/New()
. = ..()
diff --git a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm
index e5155c949a32..5f6293000365 100644
--- a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm
+++ b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm
@@ -5,7 +5,7 @@
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."
+ 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,
diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm
index c8dfe2a8eb37..0770bcd60ffa 100644
--- a/code/game/jobs/job/command/auxiliary/crew_chief.dm
+++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm
@@ -7,7 +7,7 @@
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."
+ 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."
AddTimelock(/datum/job/command/crew_chief, list(
JOB_SQUAD_ROLES = 5 HOURS
diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm
index 8d83d49ed143..9905bc9d3747 100644
--- a/code/game/jobs/job/command/auxiliary/intel.dm
+++ b/code/game/jobs/job/command/auxiliary/intel.dm
@@ -8,7 +8,7 @@
supervisors = "the auxiliary support officer"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
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."
+ 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."
/datum/job/command/intel/set_spawn_positions(count)
spawn_positions = int_slot_formula(count)
diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm
index a75846f92919..1a7a7c21d5a0 100644
--- a/code/game/jobs/job/command/auxiliary/pilot.dm
+++ b/code/game/jobs/job/command/auxiliary/pilot.dm
@@ -7,7 +7,7 @@
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."
+ 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."
// Dropship Roles is both PO and DCC combined to not force people to backtrack
AddTimelock(/datum/job/command/pilot, list(
diff --git a/code/game/jobs/job/command/auxiliary/senior.dm b/code/game/jobs/job/command/auxiliary/senior.dm
index 5e9b7caf1f10..014db9569b2a 100644
--- a/code/game/jobs/job/command/auxiliary/senior.dm
+++ b/code/game/jobs/job/command/auxiliary/senior.dm
@@ -7,7 +7,7 @@
job_options = list("Gunnery Sergeant" = "GySGT", "Master Sergeant" = "MSgt", "First Sergeant" = "1Sgt", "Master Gunnery Sergeant" = "MGySgt", "Sergeant Major" = "SgtMaj")
/datum/job/command/senior/on_config_load()
- entry_message_body = "You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Standard Operating Procedure. Failure to do so may result in your Mentorship Removal. Your primary job is to teach others the game and its mechanics, and offer advice to all USCM Departments and Personnel on-board."
+ entry_message_body = "You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Standard Operating Procedure. Failure to do so may result in your Mentorship Removal. Your primary job is to teach others the game and its mechanics, and offer advice to all USCM Departments and Personnel on-board."
return ..()
/datum/job/command/senior/announce_entry_message(mob/living/carbon/human/H)
diff --git a/code/game/jobs/job/command/cic/captain.dm b/code/game/jobs/job/command/cic/captain.dm
index 98db585e1d07..72f861351912 100644
--- a/code/game/jobs/job/command/cic/captain.dm
+++ b/code/game/jobs/job/command/cic/captain.dm
@@ -16,7 +16,7 @@
)
/datum/job/command/commander/generate_entry_message()
- entry_message_body = "You are the Commanding Officer of the [MAIN_SHIP_NAME] as well as the operation. Your goal is to lead the Marines on their mission as well as protect and command the ship and her crew. Your job involves heavy roleplay and requires you to behave like a high-ranking officer and to stay in character at all times. As the Commanding Officer your only superior is High Command itself. You must abide by the Commanding Officer Code of Conduct. Failure to do so may result in punitive action against you. Godspeed."
+ entry_message_body = "You are the Commanding Officer of the [MAIN_SHIP_NAME] as well as the operation. Your goal is to lead the Marines on their mission as well as protect and command the ship and her crew. Your job involves heavy roleplay and requires you to behave like a high-ranking officer and to stay in character at all times. As the Commanding Officer your only superior is High Command itself. You must abide by the Commanding Officer Code of Conduct. Failure to do so may result in punitive action against you. Godspeed."
return ..()
/datum/job/command/commander/get_whitelist_status(list/roles_whitelist, client/player)
diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm
index fff51624aa4b..94769de2158f 100644
--- a/code/game/jobs/job/command/cic/staffofficer.dm
+++ b/code/game/jobs/job/command/cic/staffofficer.dm
@@ -6,7 +6,7 @@
scaled = FALSE
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/so
- entry_message_body = "Your job is to monitor the Marines, man the CIC, and listen to your superior officers. You are in charge of logistics and the overwatch system. You are also in line to take command after other eligible superior commissioned officers."
+ entry_message_body = "Your job is to monitor the Marines, man the CIC, and listen to your superior officers. You are in charge of logistics and the overwatch system. You are also in line to take command after other eligible superior commissioned officers."
/datum/job/command/bridge/set_spawn_positions(count)
spawn_positions = so_slot_formula(count)
diff --git a/code/game/jobs/job/command/police/chief_police.dm b/code/game/jobs/job/command/police/chief_police.dm
index b76943c4d0ac..63e6d8023f17 100644
--- a/code/game/jobs/job/command/police/chief_police.dm
+++ b/code/game/jobs/job/command/police/chief_police.dm
@@ -4,7 +4,7 @@
selection_class = "job_cmp"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/cmp
- entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. You lead the Military Police, ensure your officers maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!"
+ entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. You lead the Military Police, ensure your officers maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!"
AddTimelock(/datum/job/command/warrant, list(
JOB_POLICE_ROLES = 15 HOURS,
diff --git a/code/game/jobs/job/command/police/police.dm b/code/game/jobs/job/command/police/police.dm
index 7285c5b278b1..e05bc2e96256 100644
--- a/code/game/jobs/job/command/police/police.dm
+++ b/code/game/jobs/job/command/police/police.dm
@@ -8,7 +8,7 @@
selection_class = "job_mp"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/mp
- entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!"
+ entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!"
/datum/job/command/police/set_spawn_positions(count)
spawn_positions = mp_slot_formula(count)
diff --git a/code/game/jobs/job/command/police/warden.dm b/code/game/jobs/job/command/police/warden.dm
index 55cbea975401..d2775e197537 100644
--- a/code/game/jobs/job/command/police/warden.dm
+++ b/code/game/jobs/job/command/police/warden.dm
@@ -5,7 +5,7 @@
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
supervisors = "the Chief MP"
gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/warden
- entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the mainting security records and overwatching any prisoners in Brig."
+ entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the mainting security records and overwatching any prisoners in Brig."
AddTimelock(/datum/job/command/warden, list(
JOB_POLICE_ROLES = 10 HOURS
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 0d68d23e5524..48ad372e1f33 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -49,13 +49,16 @@
if(!disp_title)
disp_title = title
+ if(global.config.is_loaded)
+ on_config_load()
+
/datum/job/proc/on_config_load()
if(entry_message_body)
entry_message_body = replace_placeholders(entry_message_body)
/datum/job/proc/replace_placeholders(replacement_string)
- replacement_string = replacetextEx(replacement_string, "%WIKIURL%", generate_wiki_link())
- replacement_string = replacetextEx(replacement_string, "%LAWURL%", "[CONFIG_GET(string/wikiarticleurl)]/[URL_WIKI_LAW]")
+ replacement_string = replacetextEx(replacement_string, WIKI_PLACEHOLDER, generate_wiki_link())
+ replacement_string = replacetextEx(replacement_string, LAW_PLACEHOLDER, "[CONFIG_GET(string/wikiarticleurl)]/[URL_WIKI_LAW]")
return replacement_string
/datum/job/proc/generate_wiki_link()
diff --git a/code/game/jobs/job/logistics/cargo/cargo_tech.dm b/code/game/jobs/job/logistics/cargo/cargo_tech.dm
index 3b588022bd97..c4725289c3ff 100644
--- a/code/game/jobs/job/logistics/cargo/cargo_tech.dm
+++ b/code/game/jobs/job/logistics/cargo/cargo_tech.dm
@@ -8,7 +8,7 @@
selection_class = "job_ct"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/cargo
- entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Stay in your department when possible to ensure the marines have full access to the supplies they may require. Listen to the radio in case someone requests a supply drop via the overwatch system."
+ entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Stay in your department when possible to ensure the marines have full access to the supplies they may require. Listen to the radio in case someone requests a supply drop via the overwatch system."
/datum/job/logistics/cargo/set_spawn_positions(count)
spawn_positions = ct_slot_formula(count)
diff --git a/code/game/jobs/job/logistics/cargo/chief_req.dm b/code/game/jobs/job/logistics/cargo/chief_req.dm
index 76b7e98f2db8..5d5123e687ed 100644
--- a/code/game/jobs/job/logistics/cargo/chief_req.dm
+++ b/code/game/jobs/job/logistics/cargo/chief_req.dm
@@ -3,7 +3,7 @@
selection_class = "job_qm"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
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."
+ 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(
JOB_REQUISITION_ROLES = 10 HOURS,
diff --git a/code/game/jobs/job/logistics/engi/chief_engineer.dm b/code/game/jobs/job/logistics/engi/chief_engineer.dm
index 3a15c8632953..b6aa23f9c4a6 100644
--- a/code/game/jobs/job/logistics/engi/chief_engineer.dm
+++ b/code/game/jobs/job/logistics/engi/chief_engineer.dm
@@ -3,7 +3,7 @@
selection_class = "job_ce"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/chief_engineer
- entry_message_body = "Your job is to maintain your department and keep your technicians in check. You are responsible for engineering, power, ordnance, and the orbital cannon. Should the commanding and executive officer be unavailable, you are next in the chain of command."
+ entry_message_body = "Your job is to maintain your department and keep your technicians in check. You are responsible for engineering, power, ordnance, and the orbital cannon. Should the commanding and executive officer be unavailable, you are next in the chain of command."
AddTimelock(/datum/job/logistics/engineering, list(
JOB_ENGINEER_ROLES = 10 HOURS,
diff --git a/code/game/jobs/job/logistics/engi/maint_tech.dm b/code/game/jobs/job/logistics/engi/maint_tech.dm
index 8562408360d7..b13062127a12 100644
--- a/code/game/jobs/job/logistics/engi/maint_tech.dm
+++ b/code/game/jobs/job/logistics/engi/maint_tech.dm
@@ -6,7 +6,7 @@
selection_class = "job_ot"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/maint
- entry_message_body = "Your job is to maintain the integrity of the ship, including the orbital cannon. You remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors."
+ entry_message_body = "Your job is to maintain the integrity of the ship, including the orbital cannon. You remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors."
/obj/effect/landmark/start/maint
name = JOB_MAINT_TECH
diff --git a/code/game/jobs/job/logistics/engi/ordnance_tech.dm b/code/game/jobs/job/logistics/engi/ordnance_tech.dm
index bed0acf15887..43a8a7122a8f 100644
--- a/code/game/jobs/job/logistics/engi/ordnance_tech.dm
+++ b/code/game/jobs/job/logistics/engi/ordnance_tech.dm
@@ -9,7 +9,7 @@
selection_class = "job_ot"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/ordn
- entry_message_body = "Your job is to maintain the integrity of the USCM weapons, munitions and equipment, including the orbital cannon. You can use the workshop in the portside hangar to construct new armaments for the marines. However you remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors."
+ entry_message_body = "Your job is to maintain the integrity of the USCM weapons, munitions and equipment, including the orbital cannon. You can use the workshop in the portside hangar to construct new armaments for the marines. However you remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors."
/datum/job/logistics/otech/set_spawn_positions(count)
spawn_positions = ot_slot_formula(count)
diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm
index 00a6b91dcffd..1910248a61a2 100644
--- a/code/game/jobs/job/marine/squad/engineer.dm
+++ b/code/game/jobs/job/marine/squad/engineer.dm
@@ -5,7 +5,7 @@
allow_additional = 1
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/uscm/engineer
- entry_message_body = "You have the equipment and skill to build fortifications, reroute power lines, and bunker down. Your squaddies will look to you when it comes to construction in the field of battle."
+ entry_message_body = "You have the equipment and skill to build fortifications, reroute power lines, and bunker down. Your squaddies will look to you when it comes to construction in the field of battle."
/datum/job/marine/engineer/set_spawn_positions(count)
for(var/datum/squad/sq in RoleAuthority.squads)
diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm
index 960a80d5f659..be78438db3d6 100644
--- a/code/game/jobs/job/marine/squad/leader.dm
+++ b/code/game/jobs/job/marine/squad/leader.dm
@@ -5,7 +5,7 @@
supervisors = "the acting commanding officer"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/uscm/leader
- entry_message_body = "You are responsible for the men and women of your squad. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way."
+ entry_message_body = "You are responsible for the men and women of your squad. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way."
/datum/job/marine/leader/whiskey
title = JOB_WO_SQUAD_LEADER
diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm
index cdbd74acefde..3df0a3793ca5 100644
--- a/code/game/jobs/job/marine/squad/medic.dm
+++ b/code/game/jobs/job/marine/squad/medic.dm
@@ -5,7 +5,7 @@
allow_additional = 1
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/uscm/medic
- entry_message_body = "You tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters."
+ entry_message_body = "You tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters."
/datum/job/marine/medic/set_spawn_positions(count)
for(var/datum/squad/sq in RoleAuthority.squads)
diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm
index aacc562f921b..1a89abf5d3be 100644
--- a/code/game/jobs/job/marine/squad/smartgunner.dm
+++ b/code/game/jobs/job/marine/squad/smartgunner.dm
@@ -6,7 +6,7 @@
scaled = 1
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/uscm/sg
- entry_message_body = "You are the smartgunner. Your task is to provide heavy weapons support."
+ entry_message_body = "You are the smartgunner. Your task is to provide heavy weapons support."
/datum/job/marine/smartgunner/set_spawn_positions(count)
spawn_positions = sg_slot_formula(count)
diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm
index 42ee69ef2d5c..e69241cdc70b 100644
--- a/code/game/jobs/job/marine/squad/specialist.dm
+++ b/code/game/jobs/job/marine/squad/specialist.dm
@@ -6,7 +6,7 @@
scaled = 1
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/uscm/spec
- entry_message_body = "You are the very rare and valuable weapon expert, trained to use special equipment. You can serve a variety of roles, so choose carefully."
+ entry_message_body = "You are the very rare and valuable weapon expert, trained to use special equipment. You can serve a variety of roles, so choose carefully."
/datum/job/marine/specialist/set_spawn_positions(count)
spawn_positions = spec_slot_formula(count)
diff --git a/code/game/jobs/job/marine/squad/standard.dm b/code/game/jobs/job/marine/squad/standard.dm
index e2502576e5ea..2fcd8a3cdd28 100644
--- a/code/game/jobs/job/marine/squad/standard.dm
+++ b/code/game/jobs/job/marine/squad/standard.dm
@@ -6,7 +6,10 @@
spawn_positions = -1
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/uscm/pfc
- entry_message_body = "You are a rank-and-file Marine of the USCM, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the corps. Ooh-rah!"
+
+/datum/job/marine/standard/on_config_load()
+ entry_message_body = "You are a rank-and-file Marine of the USCM, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the corps. Ooh-rah!"
+ return ..()
/datum/job/marine/standard/set_spawn_positions(count)
spawn_positions = max((round(count * STANDARD_MARINE_TO_TOTAL_SPAWN_RATIO)), 8)
diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm
index ebebf360e830..2b0cff3ea3ed 100644
--- a/code/game/jobs/job/marine/squad/tl.dm
+++ b/code/game/jobs/job/marine/squad/tl.dm
@@ -5,7 +5,7 @@
allow_additional = 1
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/uscm/tl
- entry_message_body = "You are the Team Leader.Your task is to assist the squad leader in leading the squad as well as utilize ordnance such as orbital bombardments, CAS, and mortar as well as coordinating resupply with Requisitions and CIC. If the squad leader dies, you are expected to lead in their place."
+ entry_message_body = "You are the Team Leader.Your task is to assist the squad leader in leading the squad as well as utilize ordnance such as orbital bombardments, CAS, and mortar as well as coordinating resupply with Requisitions and CIC. If the squad leader dies, you are expected to lead in their place."
/datum/job/marine/tl/generate_entry_conditions(mob/living/carbon/human/spawning_human)
. = ..()
diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm
index 64755897bc8e..0e45d5ee171b 100644
--- a/code/game/machinery/ARES/ARES_interface.dm
+++ b/code/game/machinery/ARES/ARES_interface.dm
@@ -79,7 +79,7 @@
data["access_level"] = authentication
data["alert_level"] = security_level
- data["evac_status"] = EvacuationAuthority.evac_status
+ data["evac_status"] = SShijack.evac_status
data["worldtime"] = world.time
data["access_log"] = datacore.interface_access_list
@@ -397,12 +397,12 @@
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
- if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY)
+ if(SShijack.evac_admin_denied)
to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
- if(!EvacuationAuthority.initiate_evacuation())
+ if(!SShijack.initiate_evacuation())
to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index ee83c430c2db..8d4b27778c69 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -1,15 +1,3 @@
-/obj/structure/machinery/driver_button
- name = "mass driver button"
- icon = 'icons/obj/objects.dmi'
- icon_state = "launcherbtt"
- desc = "A remote control switch for a mass driver."
- var/id = null
- var/active = 0
- anchored = TRUE
- use_power = USE_POWER_IDLE
- idle_power_usage = 2
- active_power_usage = 4
-
/obj/structure/machinery/ignition_switch
name = "ignition switch"
icon = 'icons/obj/objects.dmi'
diff --git a/code/game/machinery/computer/almayer_control.dm b/code/game/machinery/computer/almayer_control.dm
index 145d0d278cb6..fb9f7a0375d9 100644
--- a/code/game/machinery/computer/almayer_control.dm
+++ b/code/game/machinery/computer/almayer_control.dm
@@ -81,9 +81,9 @@
data["worldtime"] = world.time
- data["evac_status"] = EvacuationAuthority.evac_status
- if(EvacuationAuthority.evac_status == EVACUATION_STATUS_INITIATING)
- data["evac_eta"] = EvacuationAuthority.get_status_panel_eta()
+ data["evac_status"] = SShijack.evac_status
+ if(SShijack.evac_status == EVACUATION_STATUS_INITIATED)
+ data["evac_eta"] = SShijack.get_evac_eta()
if(!messagetitle.len)
data["messages"] = null
@@ -120,11 +120,11 @@
to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
return FALSE
- if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY)
+ if(SShijack.evac_admin_denied)
to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
return FALSE
- if(!EvacuationAuthority.initiate_evacuation())
+ if(!SShijack.initiate_evacuation())
to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
return FALSE
@@ -134,12 +134,10 @@
. = TRUE
if("evacuation_cancel")
- if(!EvacuationAuthority.cancel_evacuation())
+ if(!SShijack.cancel_evacuation())
to_chat(usr, SPAN_WARNING("You are unable to cancel the evacuation right now!"))
return FALSE
- addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/machinery/computer/almayer_control, cancel_evac)), 4 SECONDS)
-
log_game("[key_name(usr)] has canceled the emergency evacuation.")
message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.")
log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.")
@@ -276,10 +274,3 @@
// end tgui interact \\
// end tgui \\
-
-/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/computer/communications.dm b/code/game/machinery/computer/communications.dm
index d4d45de8db4e..3332577683fe 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -138,11 +138,11 @@
to_chat(usr, SPAN_WARNING("The ship must be under delta alert in order to enact evacuation procedures."))
return FALSE
- if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY)
+ if(SShijack.evac_admin_denied)
to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
return FALSE
- if(!EvacuationAuthority.initiate_evacuation())
+ if(!SShijack.initiate_evacuation())
to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
return FALSE
@@ -155,17 +155,10 @@
if("evacuation_cancel")
if(state == STATE_EVACUATION_CANCEL)
- if(!EvacuationAuthority.cancel_evacuation())
+ if(!SShijack.cancel_evacuation())
to_chat(usr, SPAN_WARNING("You are unable to cancel the evacuation right now!"))
return FALSE
- 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.
-
log_game("[key_name(usr)] has canceled the emergency evacuation.")
message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.")
log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.")
@@ -327,8 +320,8 @@
user.set_interaction(src)
var/dat = "Communications Console"
- if(EvacuationAuthority.evac_status == EVACUATION_STATUS_INITIATING)
- dat += "Evacuation in Progress\n
\nETA: [EvacuationAuthority.get_status_panel_eta()]
"
+ if(SShijack.evac_status == EVACUATION_STATUS_INITIATED)
+ dat += "Evacuation in Progress\n
\nETA: [SShijack.get_evac_eta()]
"
switch(state)
if(STATE_DEFAULT)
if(authenticated)
@@ -351,9 +344,11 @@
dat += "
Award a medal"
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"
+ switch(SShijack.evac_status)
+ if(EVACUATION_STATUS_NOT_INITIATED)
+ dat += "
Initiate emergency evacuation"
+ if(EVACUATION_STATUS_INITIATED)
+ dat += "
Cancel emergency evacuation"
else
dat += "
LOG IN"
@@ -408,20 +403,8 @@
if(STATE_ALERT_LEVEL)
dat += "Current alert level: [get_security_level()]
"
- if(security_level == SEC_LEVEL_DELTA)
- if(EvacuationAuthority.dest_status >= NUKE_EXPLOSION_ACTIVE)
- dat += SET_CLASS("The self-destruct mechanism is active. [EvacuationAuthority.evac_status != EVACUATION_STATUS_INITIATING ? "You have to manually deactivate the self-destruct mechanism." : ""]", INTERFACE_RED)
- dat += "
"
- switch(EvacuationAuthority.evac_status)
- if(EVACUATION_STATUS_INITIATING)
- dat += SET_CLASS("Evacuation initiated. Evacuate or rescind evacuation orders.", INTERFACE_RED)
- if(EVACUATION_STATUS_IN_PROGRESS)
- dat += SET_CLASS("Evacuation in progress.", INTERFACE_RED)
- if(EVACUATION_STATUS_COMPLETE)
- dat += SET_CLASS("Evacuation complete.", INTERFACE_RED)
- else
- dat += "Blue
"
- dat += "Green"
+ dat += "Blue
"
+ dat += "Green"
if(STATE_CONFIRM_LEVEL)
dat += "Current alert level: [get_security_level()]
"
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index f6adaa8edd4e..7ec97874bb7f 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -1,158 +1,8 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-
-/obj/structure/machinery/computer/pod
- name = "Pod Launch Control"
- desc = "A control for launching pods. Some people prefer firing Mechas."
+// Legacy SS13 machinery turned into props
+/obj/structure/machinery/computer/pod/old
+ name = "DoorMex Control Computer"
+ desc = "A control for launching pods."
icon_state = "computer_generic"
density = TRUE
- circuit = /obj/item/circuitboard/computer/pod
- var/id = 1
- var/obj/structure/machinery/mass_driver/connected = null
- var/timing = 0
- var/time = 30
- var/title = "Mass Driver Controls"
+ circuit = /obj/item/circuitboard/computer/pod/old
processing = TRUE
-
-
-/obj/structure/machinery/computer/pod/New()
- ..()
- spawn( 5 )
- for(var/obj/structure/machinery/mass_driver/M in machines)
- if(M.id == id)
- connected = M
- return
- return
-
-
-/obj/structure/machinery/computer/pod/proc/alarm()
- if(inoperable())
- return
-
- if(!( connected ))
- to_chat(viewers(null, null), "Cannot locate mass driver connector. Cancelling firing sequence!")
- return
-
- for(var/obj/structure/machinery/door/poddoor/M in machines)
- if(M.id == id)
- M.open()
-
- sleep(20)
-
- for(var/obj/structure/machinery/mass_driver/M in machines)
- if(M.id == id)
- M.power = connected.power
- M.drive()
-
- sleep(50)
- for(var/obj/structure/machinery/door/poddoor/M in machines)
- if(M.id == id)
- M.close()
- return
- return
-
-/obj/structure/machinery/computer/pod/attack_remote(mob/user as mob)
- return attack_hand(user)
-
-/obj/structure/machinery/computer/pod/attack_hand(mob/user as mob)
- if(..())
- return
-
- var/dat = "[title]"
- user.set_interaction(src)
- if(connected)
- var/d2
- if(timing) //door controls do not need timers.
- d2 = "Stop Time Launch"
- else
- d2 = "Initiate Time Launch"
- var/second = time % 60
- var/minute = (time - second) / 60
- dat += "
\nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second] - - + +"
- var/temp = ""
- var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 )
- for(var/t in L)
- if(t == connected.power)
- temp += "[t] "
- else
- temp += "[t] "
- dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
"
- else
- dat += "
\nToggle Outer Door
"
- dat += "
Close"
- show_browser(user, dat, "computer", "size=400x500")
- add_fingerprint(usr)
- return
-
-
-/obj/structure/machinery/computer/pod/process()
- if(!..())
- return
- if(timing)
- if(time > 0)
- time = round(time) - 1
- else
- alarm()
- time = 0
- timing = 0
- updateDialog()
- return
-
-
-/obj/structure/machinery/computer/pod/Topic(href, href_list)
- if(..())
- return
- if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (isRemoteControlling(usr)))
- usr.set_interaction(src)
- if(href_list["power"])
- var/t = text2num(href_list["power"])
- t = min(max(0.25, t), 16)
- if(connected)
- connected.power = t
- if(href_list["alarm"])
- alarm()
- if(href_list["drive"])
- for(var/obj/structure/machinery/mass_driver/M in machines)
- if(M.id == id)
- M.power = connected.power
- M.drive()
-
- if(href_list["time"])
- timing = text2num(href_list["time"])
- if(href_list["tp"])
- var/tp = text2num(href_list["tp"])
- time += tp
- time = min(max(round(time), 0), 120)
- if(href_list["door"])
- for(var/obj/structure/machinery/door/poddoor/M in machines)
- if(M.id == id)
- if(M.density)
- M.open()
- else
- M.close()
- updateUsrDialog()
- return
-
-
-
-/obj/structure/machinery/computer/pod/old
- name = "DoorMex Control Computer"
- title = "Door Controls"
-
-/obj/structure/machinery/computer/pod/old/syndicate
- name = "ProComp Executive IIc"
- desc = "The Syndicate operate on a tight budget. Operates external airlocks."
- icon_state = "syndicomp"
- title = "External Airlock Controls"
- req_access = list(ACCESS_ILLEGAL_PIRATE)
-
-/obj/structure/machinery/computer/pod/old/syndicate/attack_hand(mob/user as mob)
- if(!allowed(user))
- to_chat(user, SPAN_DANGER("Access Denied"))
- return
- else
- ..()
-
-/obj/structure/machinery/computer/pod/old/swf
- name = "Magix System IV"
- icon_state = "wizard"
- desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 8be8609d6008..8b73588f1d0b 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -150,47 +150,6 @@
else
icon_state = initial(icon_state) + "0"
-/obj/structure/machinery/driver_button/attack_remote(mob/user as mob)
- return src.attack_hand(user)
-
-/obj/structure/machinery/driver_button/attackby(obj/item/W, mob/user as mob)
- return src.attack_hand(user)
-
-/obj/structure/machinery/driver_button/attack_hand(mob/user as mob)
-
- src.add_fingerprint(usr)
- if(inoperable())
- return
- if(active)
- return
- add_fingerprint(user)
-
- use_power(5)
-
- active = 1
- icon_state = "launcheract"
-
- for(var/obj/structure/machinery/door/poddoor/M in machines)
- if(M.id == src.id)
- INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/structure/machinery/door, open))
-
- sleep(20)
-
- for(var/obj/structure/machinery/mass_driver/M in machines)
- if(M.id == src.id)
- M.drive()
-
- sleep(50)
-
- for(var/obj/structure/machinery/door/poddoor/M in machines)
- if(M.id == src.id)
- INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/structure/machinery/door, close))
-
- icon_state = "launcherbtt"
- active = 0
-
- return
-
// Controls elevator railings
/obj/structure/machinery/door_control/railings
name = "railing controls"
diff --git a/code/game/machinery/fusion_engine.dm b/code/game/machinery/fusion_engine.dm
index 4158727e3745..8e3097ef52d1 100644
--- a/code/game/machinery/fusion_engine.dm
+++ b/code/game/machinery/fusion_engine.dm
@@ -15,6 +15,7 @@
unacidable = TRUE //NOPE.jpg
anchored = TRUE
density = TRUE
+ power_machine = TRUE
var/power_gen_percent = 0 //50,000W at full capacity
var/buildstate = 0 //What state of building it are we on, 0-3, 1 is "broken", the default
@@ -24,7 +25,8 @@
var/obj/item/fuelCell/fusion_cell = new //Starts with a fuel cell loaded in. Maybe replace with the plasma tanks in the future and have it consume plasma? Possibly remove this later if it's irrelevent...
var/fuel_rate = 0 //Rate at which fuel is used. Based mostly on how long the generator has been running.
- power_machine = TRUE
+ /// If the generator is overloaded. Only possible during hijack once fuel is at 100%.
+ var/overloaded = FALSE
/obj/structure/machinery/power/fusion_engine/Initialize(mapload, ...)
. = ..()
@@ -35,11 +37,25 @@
/obj/structure/machinery/power/fusion_engine/Destroy()
QDEL_NULL(fusion_cell)
- . = ..()
+ return ..()
+/obj/structure/machinery/power/fusion_engine/attack_alien(mob/living/carbon/xenomorph/xeno)
+ if(!overloaded)
+ to_chat(xeno, SPAN_WARNING("You see no reason to attack [src]."))
+ return XENO_NO_DELAY_ACTION
+
+ xeno.animation_attack_on(src)
+ playsound(src, 'sound/effects/metalhit.ogg', 25, 1)
+ xeno.visible_message(SPAN_DANGER("[xeno] [xeno.slashes_verb] [src], stopping its overload process!"), \
+ SPAN_DANGER("You [xeno.slash_verb] [src], stopping its overload process!"), null, 5, CHAT_TYPE_XENO_COMBAT)
+ set_overloading(FALSE)
+ return XENO_ATTACK_ACTION
/obj/structure/machinery/power/fusion_engine/power_change()
- return
+ . = ..()
+ if(overloaded)
+ set_overloading(FALSE)
+ visible_message("[icon2html(src, viewers(src))] [src]'s overload suddenly ceases as primary power is lost.")
/obj/structure/machinery/power/fusion_engine/process()
if(!is_on || buildstate || !anchored || !powernet || !fusion_cell) //Default logic checking
@@ -60,9 +76,18 @@
stop_processing()
return FALSE
- if(!check_failure())
+ if(overloaded && prob(1)) // up to 18 generators at 1% every 3.5 seconds means that every ~21 seconds or so, one generator will make noise assuming all are overloaded
+ switch(rand(1, 2))
+ if(1)
+ visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("[src] loudly hums.")]")
+ playsound(src, 'sound/machines/resource_node/node_idle.ogg', 60, TRUE)
+ if(2)
+ visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("[src] makes a worrying hiss.")]")
+ playsound(src, 'sound/machines/hiss.ogg', 60, TRUE)
- if(power_gen_percent < 100) power_gen_percent++
+ if(!check_failure())
+ if(power_gen_percent < 100)
+ power_gen_percent++
switch(power_gen_percent) //Flavor text!
if(10)
@@ -96,6 +121,10 @@
to_chat(user, SPAN_NOTICE("Use a wrench to repair it."))
return FALSE
if(is_on)
+ if(overloaded)
+ to_chat(user, SPAN_WARNING("You can't shut off [src] while it's overloaded!"))
+ return
+
visible_message("[icon2html(src, viewers(src))] [SPAN_WARNING("[src] beeps softly and the humming stops as [usr] shuts off the generator.")]")
is_on = 0
power_gen_percent = 0
@@ -208,11 +237,18 @@
if(buildstate)
to_chat(user, SPAN_WARNING("You must repair the generator before working with its fuel cell."))
return
+
+ if(overloaded)
+ to_chat(user, SPAN_WARNING("You must restore the safeties on the generator before working with its fuel cell."))
+ return
+
if(is_on)
to_chat(user, SPAN_WARNING("You must turn off the generator before working with its fuel cell."))
return
+
if(!fusion_cell)
to_chat(user, SPAN_WARNING("There is no cell to remove."))
+
else
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
user.visible_message(SPAN_WARNING("[user] fumbles around figuring out [src]'s fuel receptacle."),
@@ -232,23 +268,73 @@
fusion_cell = null
update_icon()
return TRUE
+
+ else if(HAS_TRAIT(O, TRAIT_TOOL_MULTITOOL))
+ if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
+ to_chat(user, SPAN_WARNING("You have no idea what to do with [src]."))
+ return
+
+ if(!overloaded)
+ if(!SShijack.sd_unlocked)
+ to_chat(user, SPAN_WARNING("You consider overloading [src]'s safeties, but you decide against it."))
+ return
+
+ if(inoperable())
+ to_chat(user, SPAN_WARNING("[src] needs to be working and have external power in order to overload it!"))
+ return
+
+ to_chat(user, SPAN_WARNING("You start overloading the safeties on [src]..."))
+ if(!do_after(user, 1.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+ return
+
+ if(inoperable())
+ return
+
+ to_chat(user, SPAN_WARNING("You finish overloading the safeties on [src]."))
+ set_overloading(TRUE)
+ log_game("[key_name(user)] has overloaded a generator.")
+
+ else
+ to_chat(user, SPAN_WARNING("You start restoring the safeties on [src]..."))
+ if(!do_after(user, 1.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+ return
+
+ if(inoperable())
+ return
+
+ to_chat(user, SPAN_WARNING("You finish restoring the safeties on [src]."))
+ log_game("[key_name(user)] has restored the safeties of a generator.")
+ set_overloading(FALSE)
+
+ return TRUE
+
else
return ..()
/obj/structure/machinery/power/fusion_engine/get_examine_text(mob/user)
. = ..()
- if(ishuman(user))
+ if(isxeno(user))
+ if(overloaded)
+ . += SPAN_INFO("You could attack this to stop the overload process.")
+
+ else if(ishuman(user))
if(buildstate)
. += SPAN_INFO("It's broken.")
switch(buildstate)
if(1)
- . += SPAN_INFO("Use a blowtorch, then wirecutters, then wrench to repair it.")
+ . += SPAN_INFO("Use a blowtorch, then wirecutters, then wrench to repair it.")
if(2)
- . += SPAN_INFO("Use a wirecutters, then wrench to repair it.")
+ . += SPAN_INFO("Use a wirecutters, then wrench to repair it.")
if(3)
- . += SPAN_INFO("Use a wrench to repair it.")
+ . += SPAN_INFO("Use a wrench to repair it.")
return FALSE
+ if(SShijack.sd_unlocked && skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
+ if(!overloaded)
+ . += SPAN_INFO("You could overload this with a multitool.")
+ else
+ . += SPAN_INFO("You could restore its safeties with a multitool.")
+
if(!is_on)
. += SPAN_INFO("It looks offline.")
else
@@ -274,18 +360,21 @@
switch(buildstate)
if(0)
if(fusion_cell)
- var/pstatus = is_on ? "on" : "off"
- switch(fusion_cell.get_fuel_percent())
- if(0 to 10)
- icon_state = "[pstatus]-10"
- if(10 to 25)
- icon_state = "[pstatus]-25"
- if(25 to 50)
- icon_state = "[pstatus]-50"
- if(50 to 75)
- icon_state = "[pstatus]-75"
- if(75 to INFINITY)
- icon_state = "[pstatus]-100"
+ if(overloaded)
+ icon_state = "overloaded"
+ else
+ var/pstatus = is_on ? "on" : "off"
+ switch(fusion_cell.get_fuel_percent())
+ if(0 to 10)
+ icon_state = "[pstatus]-10"
+ if(10 to 25)
+ icon_state = "[pstatus]-25"
+ if(25 to 50)
+ icon_state = "[pstatus]-50"
+ if(50 to 75)
+ icon_state = "[pstatus]-75"
+ if(75 to INFINITY)
+ icon_state = "[pstatus]-100"
else
icon_state = "off"
@@ -317,9 +406,13 @@
else
return 0
+/obj/structure/machinery/power/fusion_engine/proc/set_overloading(new_overloading)
+ if(overloaded == new_overloading)
+ return
-
-
+ overloaded = new_overloading
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GENERATOR_SET_OVERLOADING, overloaded)
+ update_icon()
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index f4ad7a63ba77..4ce295aa9965 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -105,7 +105,7 @@ Class Procs:
var/list/component_parts //list of all the parts used to build it, if made from certain kinds of frames.
var/manual = 0
layer = OBJ_LAYER
- var/machine_processing = 0 // whether the machine is busy and requires process() calls in scheduler.
+ var/machine_processing = 0 // whether the machine is busy and requires process() calls in scheduler. // Please replace this by DF_ISPROCESSING in another refactor --fira
throwpass = 1
projectile_coverage = PROJECTILE_COVERAGE_MEDIUM
var/power_machine = FALSE //Whether the machine should process on power, or normal processor
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
deleted file mode 100644
index 591cec1f5baa..000000000000
--- a/code/game/machinery/magnet.dm
+++ /dev/null
@@ -1,421 +0,0 @@
-// Magnetic attractor, creates variable magnetic fields and attraction.
-// Can also be used to emit electron/proton beams to create a center of magnetism on another tile
-
-// tl;dr: it's magnets lol
-// This was created for firing ranges, but I suppose this could have other applications - Doohl
-
-/obj/structure/machinery/magnetic_module
-
- icon = 'icons/obj/objects.dmi'
- icon_state = "floor_magnet-f"
- name = "Electromagnetic Generator"
- desc = "A device that uses station power to create points of magnetic energy."
- level = 1 // underfloor
- layer = UNDERFLOOR_OBJ_LAYER
- anchored = TRUE
- use_power = USE_POWER_IDLE
- idle_power_usage = 50
-
- var/freq = 1449 // radio frequency
- var/electricity_level = 1 // intensity of the magnetic pull
- var/magnetic_field = 1 // the range of magnetic attraction
- var/code = 0 // frequency code, they should be different unless you have a group of magnets working together or something
- var/turf/center // the center of magnetic attraction
- var/on = 0
- var/pulling = 0
-
- // x, y modifiers to the center turf; (0, 0) is centered on the magnet, whereas (1, -1) is one tile right, one tile down
- var/center_x = 0
- var/center_y = 0
- var/max_dist = 20 // absolute value of center_x,y cannot exceed this integer
-
-/obj/structure/machinery/magnetic_module/Initialize(mapload, ...)
- . = ..()
-
- var/turf/T = loc
- hide(T.intact_tile)
- center = T
-
- SSradio.add_object(src, freq, RADIO_MAGNETS)
-
- INVOKE_ASYNC(src, PROC_REF(magnetic_process))
-
-/obj/structure/machinery/magnetic_module/Destroy()
- center = null
- SSradio.remove_object(src, freq)
- . = ..()
-
-
- // update the invisibility and icon
-/obj/structure/machinery/magnetic_module/hide(intact)
- invisibility = intact ? 101 : 0
- updateicon()
-
- // update the icon_state
-/obj/structure/machinery/magnetic_module/proc/updateicon()
- var/state="floor_magnet"
- var/onstate=""
- if(!on)
- onstate="0"
-
- if(invisibility)
- icon_state = "[state][onstate]-f" // if invisible, set icon to faded version
- // in case of being revealed by T-scanner
- else
- icon_state = "[state][onstate]"
-
-/obj/structure/machinery/magnetic_module/receive_signal(datum/signal/signal)
-
- var/command = signal.data["command"]
- var/modifier = signal.data["modifier"]
- var/signal_code = signal.data["code"]
- if(command && (signal_code == code))
-
- Cmd(command, modifier)
-
-
-
-/obj/structure/machinery/magnetic_module/proc/Cmd(command, modifier)
-
- if(command)
- switch(command)
- if("set-electriclevel")
- if(modifier) electricity_level = modifier
- if("set-magneticfield")
- if(modifier) magnetic_field = modifier
-
- if("add-elec")
- electricity_level++
- if(electricity_level > 12)
- electricity_level = 12
- if("sub-elec")
- electricity_level--
- if(electricity_level <= 0)
- electricity_level = 1
- if("add-mag")
- magnetic_field++
- if(magnetic_field > 4)
- magnetic_field = 4
- if("sub-mag")
- magnetic_field--
- if(magnetic_field <= 0)
- magnetic_field = 1
-
- if("set-x")
- if(modifier) center_x = modifier
- if("set-y")
- if(modifier) center_y = modifier
-
- if("N") // NORTH
- center_y++
- if("S") // SOUTH
- center_y--
- if("E") // EAST
- center_x++
- if("W") // WEST
- center_x--
- if("C") // CENTER
- center_x = 0
- center_y = 0
- if("R") // RANDOM
- center_x = rand(-max_dist, max_dist)
- center_y = rand(-max_dist, max_dist)
-
- if("set-code")
- if(modifier) code = modifier
- if("toggle-power")
- on = !on
-
- if(on)
- INVOKE_ASYNC(src, PROC_REF(magnetic_process))
-
-
-/obj/structure/machinery/magnetic_module/process()
- if(stat & NOPOWER)
- on = 0
-
- // Sanity checks:
- if(electricity_level <= 0)
- electricity_level = 1
- if(magnetic_field <= 0)
- magnetic_field = 1
-
-
- // Limitations:
- if(abs(center_x) > max_dist)
- center_x = max_dist
- if(abs(center_y) > max_dist)
- center_y = max_dist
- if(magnetic_field > 4)
- magnetic_field = 4
- if(electricity_level > 12)
- electricity_level = 12
-
- // Update power usage:
- if(on)
- use_power = USE_POWER_ACTIVE
- active_power_usage = electricity_level*15
- else
- use_power = USE_POWER_NONE
-
-
- // Overload conditions:
- /* // Eeeehhh kinda stupid
- if(on)
- if(electricity_level > 11)
- if(prob(electricity_level))
- explosion(loc, 0, 1, 2, 3) // ooo dat shit EXPLODES son
- spawn(2)
- qdel(src)
- */
-
- updateicon()
-
-
-/obj/structure/machinery/magnetic_module/proc/magnetic_process() // proc that actually does the pulling
- if(pulling) return
- while(on)
-
- pulling = 1
- center = locate(x+center_x, y+center_y, z)
- if(center)
- for(var/obj/M in orange(magnetic_field, center))
- if(!M.anchored && (M.flags_atom & CONDUCT))
- step_towards(M, center)
-
- for(var/mob/living/silicon/S in orange(magnetic_field, center))
- if(isAI(S)) continue
- step_towards(S, center)
-
- use_power(electricity_level * 5)
- sleep(13 - electricity_level)
-
- pulling = 0
-
-/obj/structure/machinery/magnetic_controller
- name = "Magnetic Control Console"
- icon = 'icons/obj/structures/machinery/airlock_machines.dmi' // uses an airlock machine icon, THINK GREEN HELP THE ENVIRONMENT - RECYCLING!
- icon_state = "airlock_control_standby"
- density = TRUE
- anchored = TRUE
- use_power = USE_POWER_IDLE
- idle_power_usage = 45
- var/frequency = 1449
- var/code = 0
- var/list/magnets = list()
- var/title = "Magnetic Control Console"
- var/autolink = 0 // if set to 1, can't probe for other magnets!
-
- var/pathpos = 1 // position in the path
- var/path = "NULL" // text path of the magnet
- var/speed = 1 // lowest = 1, highest = 10
- var/list/rpath = list() // real path of the magnet, used in iterator
-
- var/moving = 0 // 1 if scheduled to loop
- var/looping = 0 // 1 if looping
-
- var/datum/radio_frequency/radio_connection
-
-/obj/structure/machinery/magnetic_controller/Initialize(mapload, ...)
- . = ..()
- if(autolink)
- for(var/obj/structure/machinery/magnetic_module/M in machines)
- if(M.freq == frequency && M.code == code)
- magnets.Add(M)
-
- SSradio.add_object(src, frequency, RADIO_MAGNETS)
-
- if(path) // check for default path
- filter_path() // renders rpath
-
-/obj/structure/machinery/magnetic_controller/Destroy()
- QDEL_NULL_LIST(magnets)
- SSradio.remove_object(src, frequency)
- . = ..()
-
-
-/obj/structure/machinery/magnetic_controller/process()
- if(magnets.len == 0 && autolink)
- for(var/obj/structure/machinery/magnetic_module/M in machines)
- if(M.freq == frequency && M.code == code)
- magnets.Add(M)
-
-/obj/structure/machinery/magnetic_controller/attack_remote(mob/user as mob)
- return src.attack_hand(user)
-
-/obj/structure/machinery/magnetic_controller/attack_hand(mob/user as mob)
- if(inoperable())
- return
- user.set_interaction(src)
- var/dat = "Magnetic Control Console
"
- if(!autolink)
- dat += {"
- Frequency: [frequency]
- Code: [code]
- Probe Generators
- "}
-
- if(magnets.len >= 1)
-
- dat += "Magnets confirmed:
"
- var/i = 0
- for(var/obj/structure/machinery/magnetic_module/M in magnets)
- i++
- dat += " < \[[i]\] ([M.on ? "On":"Off"])|Electricity level: - [M.electricity_level] +; Magnetic field: - [M.magnetic_field] +
"
-
- dat += "
Speed: - [speed] +
"
- dat += "Path: {[path]}
"
- dat += "Moving: [moving ? "Enabled":"Disabled"]"
-
-
- show_browser(user, dat, name, "magnet", "size=400x500")
-
-/obj/structure/machinery/magnetic_controller/Topic(href, href_list)
- . = ..()
- if(.)
- return
- if(inoperable())
- return
- usr.set_interaction(src)
- src.add_fingerprint(usr)
-
- if(href_list["radio-op"])
-
- // Prepare signal beforehand, because this is a radio operation
- var/datum/signal/signal = new
- signal.transmission_method = 1 // radio transmission
- signal.source = src
- signal.frequency = frequency
- signal.data["code"] = code
-
- // Apply any necessary commands
- switch(href_list["radio-op"])
- if("togglepower")
- signal.data["command"] = "toggle-power"
-
- if("minuselec")
- signal.data["command"] = "sub-elec"
- if("pluselec")
- signal.data["command"] = "add-elec"
-
- if("minusmag")
- signal.data["command"] = "sub-mag"
- if("plusmag")
- signal.data["command"] = "add-mag"
-
-
- // Broadcast the signal
-
- radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS)
-
- addtimer(CALLBACK(src, PROC_REF(updateUsrDialog)), 1)
-
- if(href_list["operation"])
- switch(href_list["operation"])
- if("plusspeed")
- speed ++
- if(speed > 10)
- speed = 10
- if("minusspeed")
- speed --
- if(speed <= 0)
- speed = 1
- if("setpath")
- var/newpath = copytext(sanitize(input(usr, "Please define a new path!",,path) as text|null),1,MAX_MESSAGE_LEN)
- if(newpath && newpath != "")
- moving = 0 // stop moving
- path = newpath
- pathpos = 1 // reset position
- filter_path() // renders rpath
-
- if("togglemoving")
- moving = !moving
- if(moving)
- INVOKE_ASYNC(src, PROC_REF(MagnetMove))
-
-
- updateUsrDialog()
-
-/obj/structure/machinery/magnetic_controller/proc/MagnetMove()
- if(looping) return
-
- while(moving && rpath.len >= 1)
-
- if(inoperable())
- break
-
- looping = 1
-
- // Prepare the radio signal
- var/datum/signal/signal = new
- signal.transmission_method = 1 // radio transmission
- signal.source = src
- signal.frequency = frequency
- signal.data["code"] = code
-
- if(pathpos > rpath.len) // if the position is greater than the length, we just loop through the list!
- pathpos = 1
-
- var/nextmove = uppertext(rpath[pathpos]) // makes it un-case-sensitive
-
- if(!(nextmove in list("N","S","E","W","C","R")))
- // N, S, E, W are directional
- // C is center
- // R is random (in magnetic field's bounds)
- qdel(signal)
- break // break the loop if the character located is invalid
-
- signal.data["command"] = nextmove
-
-
- pathpos++ // increase iterator
-
- // Broadcast the signal
- spawn()
- radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS)
-
- if(speed == 10)
- sleep(1)
- else
- sleep(12-speed)
-
- looping = 0
-
-
-/obj/structure/machinery/magnetic_controller/proc/filter_path()
- // Generates the rpath variable using the path string, think of this as "string2list"
- // Doesn't use params2list() because of the akward way it stacks entities
- rpath = list() // clear rpath
- var/maximum_character = min( 50, length(path) ) // chooses the maximum length of the iterator. 50 max length
-
- for(var/i=1, i<=maximum_character, i++) // iterates through all characters in path
-
- var/nextchar = copytext(path, i, i+1) // find next character
-
- if(!(nextchar in list(";", "&", "*", " "))) // if char is a separator, ignore
- rpath += copytext(path, i, i+1) // else, add to list
-
- // there doesn't HAVE to be separators but it makes paths syntatically visible
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index d1e2fecce20f..f1b0081e3a39 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -1,5 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-
+// Legacy SS13 machinery turned into a prop
/obj/structure/machinery/mass_driver
name = "mass driver"
desc = "Shoots things into space."
@@ -9,32 +8,3 @@
use_power = USE_POWER_IDLE
idle_power_usage = 2
active_power_usage = 50
-
- var/power = 1
- var/code = 1
- var/id = 1
- var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess.
-
-
-/obj/structure/machinery/mass_driver/proc/drive(amount)
- if(inoperable())
- return
- use_power(500)
- var/O_limit
- var/atom/target = get_edge_target_turf(src, dir)
- for(var/atom/movable/O in loc)
- if(!O.anchored)
- if(O_limit >= 20)
- for(var/mob/M in hearers(src, null))
- to_chat(M, SPAN_NOTICE(" The mass driver lets out a screech, it mustn't be able to handle any more items."))
- break
- use_power(500)
- INVOKE_ASYNC(O, TYPE_PROC_REF(/atom/movable, throw_atom), target, drive_range * power, 100/power)
- flick("mass_driver1", src)
- return
-
-/obj/structure/machinery/mass_driver/emp_act(severity)
- if(inoperable())
- return
- drive()
- ..(severity)
diff --git a/code/game/machinery/nuclearbomb.dm b/code/game/machinery/nuclearbomb.dm
index 743f53e4f03b..28ebbecc7552 100644
--- a/code/game/machinery/nuclearbomb.dm
+++ b/code/game/machinery/nuclearbomb.dm
@@ -394,7 +394,38 @@ var/bomb_set = FALSE
update_icon()
safety = TRUE
- EvacuationAuthority.trigger_self_destruct(list(z), src, FALSE, NUKE_EXPLOSION_GROUND_FINISHED, FALSE, end_round)
+ playsound(src, 'sound/machines/Alarm.ogg', 75, 0, 30)
+ world << pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg')
+
+ var/list/alive_mobs = list() //Everyone who will be destroyed on the zlevel(s).
+ var/list/dead_mobs = list() //Everyone who only needs to see the cinematic.
+ for(var/mob/current_mob as anything in GLOB.mob_list)
+ if(!current_mob?.loc)
+ continue
+ if(current_mob.stat == DEAD)
+ dead_mobs |= current_mob
+ continue
+ var/turf/current_turf = get_turf(current_mob)
+ if(z == current_turf.z)
+ alive_mobs |= current_mob
+ shake_camera(current_mob, 110, 4)
+
+ for(var/mob/current_mob in alive_mobs)
+ if(current_mob && current_mob.loc)
+ var/turf/current_mob_turf = get_turf(current_mob)
+ if(z == current_mob_turf.z)
+ if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge))
+ continue
+ current_mob.death(create_cause_data("nuclear explosion"))
+
+ for(var/mob/current_mob in (alive_mobs + dead_mobs))
+ if(current_mob && current_mob.loc)
+ var/turf/current_mob_turf = get_turf(current_mob)
+ if(z == current_mob_turf.z)
+ if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge))
+ continue
+ for(var/obj/item/alien_embryo/embryo in current_mob)
+ qdel(embryo)
sleep(100)
cell_explosion(loc, 500, 150, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data(initial(name)))
diff --git a/code/game/machinery/sentry_holder.dm b/code/game/machinery/sentry_holder.dm
index 61f87251282d..fe676e9103d2 100644
--- a/code/game/machinery/sentry_holder.dm
+++ b/code/game/machinery/sentry_holder.dm
@@ -10,13 +10,12 @@
idle_power_usage = 1000
power_channel = 1
use_power = USE_POWER_IDLE
- machine_processing = 1
var/deployment_cooldown
var/turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable // Path of the turret used
var/obj/structure/machinery/defenses/sentry/premade/deployable/deployed_turret
var/ox = 0
var/oy = 0
- var/ind = FALSE
+ var/require_red_alert = FALSE
/obj/structure/machinery/sentry_holder/Initialize()
. = ..()
@@ -36,34 +35,38 @@
. += "It's offline."
/obj/structure/machinery/sentry_holder/attack_hand(mob/user)
- if(deployed_turret)
- if(deployment_cooldown > world.time)
- to_chat(user, SPAN_WARNING("[src] is busy."))
- return //prevents spamming deployment/undeployment
- if(deployed_turret.loc == src) //not deployed
- if(stat & NOPOWER)
- to_chat(user, SPAN_WARNING("[src] is non-functional."))
- else
- to_chat(user, SPAN_NOTICE("You deploy [src]."))
- deploy_sentry()
- else
- to_chat(user, SPAN_NOTICE("You retract [src]."))
- undeploy_sentry()
- else
+ if(!deployed_turret)
to_chat(user, SPAN_WARNING("[src] is unresponsive."))
+ return
-/obj/structure/machinery/sentry_holder/process()
- if(stat & NOPOWER)
- if(deployed_turret)
- undeploy_sentry()
- ind = FALSE
- else
- icon_state = "sentry_system_destroyed"
- else
- update_use_power(USE_POWER_IDLE)
- if(!ind)
- deploy_sentry()
- ind = TRUE
+ if(deployment_cooldown > world.time)
+ to_chat(user, SPAN_WARNING("[src] is busy."))
+ return
+
+ if(deployed_turret.loc == src) //not deployed
+ if(stat & NOPOWER)
+ to_chat(user, SPAN_WARNING("[src] is non-functional."))
+ return
+
+ if(require_red_alert && (seclevel2num(get_security_level()) < SEC_LEVEL_RED))
+ to_chat(user, SPAN_WARNING("[src] can only be activated in emergencies."))
+ return
+
+ to_chat(user, SPAN_NOTICE("You deploy [src]."))
+ deploy_sentry()
+ return
+
+ to_chat(user, SPAN_NOTICE("You retract [src]."))
+ undeploy_sentry()
+ return
+
+/obj/structure/machinery/sentry_holder/update_use_power(new_use_power)
+ ..()
+
+ if(!(stat & NOPOWER))
+ return
+
+ undeploy_sentry()
/obj/structure/machinery/sentry_holder/proc/deploy_sentry()
if(!deployed_turret)
@@ -111,3 +114,6 @@
desc = "A box that deploys a sentry turret for protection of the residents in the area."
turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/colony
+/obj/structure/machinery/sentry_holder/almayer
+ turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/almayer
+ require_red_alert = TRUE
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 6c6d2bda8b07..c56f8da36150 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -78,7 +78,7 @@
return 1
if(STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME) //emergency shuttle timer
message1 = "EVAC"
- message2 = EvacuationAuthority.get_status_panel_eta()
+ message2 = SShijack.get_evac_eta()
if(message2)
if(length(message2) > CHARS_PER_LINE) message2 = "Error"
update_display(message1, message2)
@@ -163,6 +163,15 @@
if(maptext)
maptext = ""
+/obj/structure/machinery/status_display/proc/set_sec_level_picture()
+ switch(security_level)
+ if(SEC_LEVEL_GREEN)
+ set_picture("default")
+ if(SEC_LEVEL_BLUE)
+ set_picture("bluealert")
+ if(SEC_LEVEL_RED, SEC_LEVEL_DELTA)
+ set_picture("redalert")
+
/obj/structure/machinery/ai_status_display
icon = 'icons/obj/structures/machinery/status_display.dmi'
icon_state = "frame"
diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
index a61934324491..c109db25b3a9 100644
--- a/code/game/machinery/vending/vending_types.dm
+++ b/code/game/machinery/vending/vending_types.dm
@@ -411,6 +411,7 @@
/obj/item/device/camera = 5,
/obj/item/device/camera_film = 10,
/obj/item/notepad = 5,
+ /obj/item/device/toner = 5,
)
contraband = list(/obj/item/toy/sword = 2)
@@ -431,5 +432,6 @@
/obj/item/toy/deck = 20,
/obj/item/toy/deck/uno = 15,
/obj/item/device/camera = 30,
+ /obj/item/device/toner = 15,
)
product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
index 69399cfb1eb5..f6b99887bbbb 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
@@ -117,6 +117,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine/medic, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine, /obj/item/clothing/head/helmet/marine/medic), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+ list("Combat Sterile Gloves", 0, /obj/item/clothing/gloves/marine/medical, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY),
diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm
index 78aa01b5dacb..b80f53b14d2e 100644
--- a/code/game/objects/effects/effect_system/smoke.dm
+++ b/code/game/objects/effects/effect_system/smoke.dm
@@ -31,13 +31,13 @@
amount = oldamount - 1
cause_data = new_cause_data
time_to_live += rand(-1,1)
- active_smoke_effects += src
+ START_PROCESSING(SSeffects, src)
/obj/effect/particle_effect/smoke/Destroy()
. = ..()
if(opacity)
set_opacity(0)
- active_smoke_effects -= src
+ STOP_PROCESSING(SSeffects, src)
cause_data = null
/obj/effect/particle_effect/smoke/initialize_pass_flags(datum/pass_flags_container/PF)
diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm
index b22fbafd23e9..22d738e3c3bc 100644
--- a/code/game/objects/effects/landmarks/survivor_spawner.dm
+++ b/code/game/objects/effects/landmarks/survivor_spawner.dm
@@ -8,6 +8,8 @@
var/roundstart_damage_min = 0
var/roundstart_damage_max = 0
var/roundstart_damage_times = 1
+ /// Whether or not the spawner is for an inherently hostile survivor subtype.
+ var/hostile = FALSE
var/spawn_priority = LOWEST_SPAWN_PRIORITY
@@ -27,6 +29,7 @@
return TRUE
/obj/effect/landmark/survivor_spawner/lv624_crashed_clf
+ hostile = TRUE
equipment = /datum/equipment_preset/survivor/clf
synth_equipment = /datum/equipment_preset/clf/synth
intro_text = list("You are a survivor of a crash landing!
",\
@@ -40,6 +43,7 @@
spawn_priority = SPAWN_PRIORITY_HIGH
/obj/effect/landmark/survivor_spawner/lv624_crashed_clf_engineer
+ hostile = TRUE
equipment = /datum/equipment_preset/clf/engineer
synth_equipment = /datum/equipment_preset/clf/synth
intro_text = list("You are a survivor of a crash landing!
",\
@@ -53,6 +57,7 @@
spawn_priority = SPAWN_PRIORITY_VERY_HIGH
/obj/effect/landmark/survivor_spawner/lv624_crashed_clf_medic
+ hostile = TRUE
equipment = /datum/equipment_preset/clf/medic
synth_equipment = /datum/equipment_preset/clf/synth
intro_text = list("You are a survivor of a crash landing!
",\
diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm
index 7276e8a7f051..122136f6f2fa 100644
--- a/code/game/objects/items/circuitboards/computer.dm
+++ b/code/game/objects/items/circuitboards/computer.dm
@@ -96,9 +96,9 @@
/obj/item/circuitboard/computer/atmos_alert
name = "Circuit board (Atmospheric Alert)"
build_path = /obj/structure/machinery/computer/atmos_alert
-/obj/item/circuitboard/computer/pod
- name = "Circuit board (Massdriver control)"
- build_path = /obj/structure/machinery/computer/pod
+/obj/item/circuitboard/computer/pod/old
+ name = "Circuit board (DoorMex)"
+ build_path = /obj/structure/machinery/computer/pod/old
/obj/item/circuitboard/computer/robotics
name = "Circuit board (Robotics Control)"
build_path = /obj/structure/machinery/computer/robotics
@@ -117,15 +117,6 @@
/obj/item/circuitboard/computer/powermonitor
name = "Circuit board (Power Monitor)"
build_path = /obj/structure/machinery/power/monitor
-/obj/item/circuitboard/computer/olddoor
- name = "Circuit board (DoorMex)"
- build_path = /obj/structure/machinery/computer/pod/old
-/obj/item/circuitboard/computer/syndicatedoor
- name = "Circuit board (ProComp Executive)"
- build_path = /obj/structure/machinery/computer/pod/old/syndicate
-/obj/item/circuitboard/computer/swfdoor
- name = "Circuit board (Magix)"
- build_path = /obj/structure/machinery/computer/pod/old/swf
/obj/item/circuitboard/computer/prisoner
name = "Circuit board (Prisoner Management)"
build_path = /obj/structure/machinery/computer/prisoner
diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm
index f355b39c468a..6abd70980136 100644
--- a/code/game/objects/items/devices/cictablet.dm
+++ b/code/game/objects/items/devices/cictablet.dm
@@ -61,7 +61,7 @@
var/list/data = list()
data["alert_level"] = security_level
- data["evac_status"] = EvacuationAuthority.evac_status
+ data["evac_status"] = SShijack.evac_status
data["endtime"] = announcement_cooldown
data["distresstime"] = distress_cooldown
data["worldtime"] = world.time
@@ -135,11 +135,11 @@
to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
return FALSE
- if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY)
+ if(SShijack.evac_admin_denied)
to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
return FALSE
- if(!EvacuationAuthority.initiate_evacuation())
+ if(!SShijack.initiate_evacuation())
to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
return FALSE
diff --git a/code/game/objects/items/reagent_containers/reagent_container.dm b/code/game/objects/items/reagent_containers/reagent_container.dm
index e0561d5a7e3d..327f6ba1ce1c 100644
--- a/code/game/objects/items/reagent_containers/reagent_container.dm
+++ b/code/game/objects/items/reagent_containers/reagent_container.dm
@@ -67,12 +67,6 @@
if (N)
R.amount_per_transfer_from_this = N
-/obj/item/reagent_container/Initialize()
- . = ..()
- if (!possible_transfer_amounts)
- verbs -= /obj/item/reagent_container/verb/set_APTFT //which objects actually uses it?
- create_reagents(volume)
-
/obj/item/reagent_container/Destroy()
possible_transfer_amounts = null
return ..()
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index d85e615bc1c8..3912e2d64165 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -182,6 +182,11 @@ Also change the icon to reflect the amount of sheets, if possible.*/
to_chat(usr, SPAN_WARNING("The [R.title] cannot be built here!")) //might cause some friendly fire regarding other items like barbed wire, shouldn't be a problem?
return
+ var/obj/structure/tunnel/tunnel = locate(/obj/structure/tunnel) in usr.loc
+ if(tunnel)
+ to_chat(usr, SPAN_WARNING("The [R.title] cannot be constructed on a tunnel!"))
+ return
+
if((R.flags & RESULT_REQUIRES_SNOW) && !(istype(usr.loc, /turf/open/snow) || istype(usr.loc, /turf/open/auto_turf/snow)))
to_chat(usr, SPAN_WARNING("The [R.title] must be built on snow!"))
return
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index 1d37a542bad4..27026165fc31 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -249,9 +249,13 @@
if(!ishuman(user) || user.is_mob_incapacitated())
return FALSE
- var/obj/item/weapon/gun/flamer/M240T/F = user.get_active_hand()
- if(!istype(F))
- to_chat(usr, "You must be holding the M240-T incinerator unit to use [src]")
+ if(user.back != src)
+ to_chat(user, "The [src] must be equipped before you can switch types")
+ return
+
+ var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand()
+ if(!istype(flamer))
+ to_chat(user, "You must be holding the M240-T incinerator unit to use [src]")
return
if(!active_fuel)
@@ -267,14 +271,13 @@
else
active_fuel = fuelB
- for(var/X in actions)
- var/datum/action/A = X
- A.update_button_icon()
+ for(var/datum/action/action_added as anything in actions)
+ action_added.update_button_icon()
to_chat(user, "You switch the fuel tank to [active_fuel.caliber]")
playsound(src, 'sound/machines/click.ogg', 25, TRUE)
- F.current_mag = active_fuel
- F.update_icon()
+ flamer.current_mag = active_fuel
+ flamer.update_icon()
return TRUE
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index e719359ab439..6cd6a5cd0300 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -173,6 +173,14 @@
return do_reinforced_wall(W, user)
if(STATE_DISPLACED)
if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR))
+ var/turf/open/floor = loc
+ if(!floor.allow_construction)
+ to_chat(user, SPAN_WARNING("The girder must be secured on a proper surface!"))
+ return
+ var/obj/structure/tunnel/tunnel = locate(/obj/structure/tunnel) in loc
+ if(tunnel)
+ to_chat(user, SPAN_WARNING("The girder cannot be secured on a tunnel!"))
+ return
playsound(loc, 'sound/items/Crowbar.ogg', 25, 1)
to_chat(user, SPAN_NOTICE("Now securing the girder..."))
if(!do_after(user, 40 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index ec277929facb..adabf0c54141 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -570,7 +570,7 @@
/obj/structure/sign/ROsign
name = "\improper USCM Requisitions Office Guidelines"
- desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cyrosleep underwear is non-permissible.\n 3. The Requsitions Officer has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard."
+ desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cryosleep underwear is non-permissible.\n 3. The Quartermaster has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard."
icon_state = "roplaque"
/obj/structure/sign/prop1
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index a4781e1a6609..93eb45c3b79c 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -185,6 +185,7 @@
name = "cave"
icon = 'icons/turf/floors/bigred.dmi'
icon_state = "mars_cave_1"
+ is_groundmap_turf = TRUE
/turf/open/mars_cave/Initialize(mapload, ...)
@@ -283,6 +284,7 @@
name = "ground dirt"
icon = 'icons/turf/ground_map.dmi'
icon_state = "desert"
+ is_groundmap_turf = TRUE
/turf/open/gm/attackby(obj/item/I, mob/user)
@@ -646,6 +648,7 @@
baseturfs = /turf/open/gm/riverdeep
supports_surgery = FALSE
minimap_color = MINIMAP_WATER
+ is_groundmap_turf = FALSE // Not real ground
/turf/open/gm/riverdeep/Initialize(mapload, ...)
@@ -724,6 +727,7 @@
allow_construction = FALSE
var/bushes_spawn = 1
var/plants_spawn = 1
+ is_groundmap_turf = TRUE
name = "wet grass"
desc = "Thick, long, wet grass."
icon = 'icons/turf/floors/jungle.dmi'
diff --git a/code/game/world.dm b/code/game/world.dm
index fce40ca468ae..f5388ed6fd52 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -71,8 +71,6 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
RoleAuthority = new /datum/authority/branch/role()
to_world(SPAN_DANGER("\b Job setup complete"))
- if(!EvacuationAuthority) EvacuationAuthority = new
-
initiate_minimap_icons()
change_tick_lag(CONFIG_GET(number/ticklag))
@@ -91,8 +89,8 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
update_status()
//Scramble the coords obsfucator
- obfs_x = rand(-500, 500) //A number between -100 and 100
- obfs_y = rand(-500, 500) //A number between -100 and 100
+ GLOB.obfs_x = rand(-500, 500) //A number between -100 and 100
+ GLOB.obfs_y = rand(-500, 500) //A number between -100 and 100
spawn(3000) //so we aren't adding to the round-start lag
if(CONFIG_GET(flag/ToRban))
@@ -174,11 +172,6 @@ var/world_topic_spam_protect_time = world.timeofday
response["response"] = "Payload too large"
return json_encode(response)
- if(SSfail_to_topic?.IsRateLimited(addr))
- response["statuscode"] = 429
- response["response"] = "Rate limited"
- return json_encode(response)
-
var/logging = CONFIG_GET(flag/log_world_topic)
var/topic_decoded = rustg_url_decode(T)
if(!rustg_json_is_valid(topic_decoded))
diff --git a/code/global.dm b/code/global.dm
index bdde529a9af8..e329cbdd00d5 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -153,14 +153,6 @@ var/list/nato_phonetic_alphabet = list("Alpha", "Bravo", "Charlie", "Delta", "Ec
var/distress_cancel = 0
var/destroy_cancel = 0
-//Coordinate obsfucator
-//Used by the rangefinders and linked systems to prevent coords collection/prefiring
-
-/// A number between -500 and 500.
-var/global/obfs_x = 0
-/// A number between -500 and 500.
-var/global/obfs_y = 0
-
// Which lobby art is on display
// This is updated by the lobby art turf when it initializes
var/displayed_lobby_art = -1
diff --git a/code/modules/admin/player_panel/player_panel.dm b/code/modules/admin/player_panel/player_panel.dm
index 12686e683521..4b79c8c91569 100644
--- a/code/modules/admin/player_panel/player_panel.dm
+++ b/code/modules/admin/player_panel/player_panel.dm
@@ -389,15 +389,15 @@
dat += "Round Duration: [round(world.time / 36000)]:[add_zero(world.time / 600 % 60, 2)]:[world.time / 100 % 6][world.time / 100 % 10]
"
if(check_rights(R_DEBUG, 0))
- dat += "
VV Evacuation Controller
"
dat += "VV Shuttle Controller
"
if(check_rights(R_MOD, 0))
- dat += "Evacuation: "
- switch(EvacuationAuthority.evac_status)
- if(EVACUATION_STATUS_STANDING_BY) dat += "STANDING BY"
- if(EVACUATION_STATUS_INITIATING) dat += "IN PROGRESS: [EvacuationAuthority.get_status_panel_eta()]"
- if(EVACUATION_STATUS_COMPLETE) dat += "COMPLETE"
+ dat += "Evacuation Goals: "
+ switch(SShijack.evac_status)
+ if(EVACUATION_STATUS_NOT_INITIATED)
+ dat += "STANDING BY"
+ if(EVACUATION_STATUS_INITIATED)
+ dat += "IN PROGRESS"
dat += "
"
dat += "Initiate Evacuation
"
@@ -405,20 +405,6 @@
dat += "Toggle Evacuation Permission (does not affect evac in progress)
"
if(check_rights(R_ADMIN, 0)) dat += "Force Evacuation Now
"
- if(check_rights(R_ADMIN, 0))
- dat += "Self-Destruct: "
- switch(EvacuationAuthority.dest_status)
- if(NUKE_EXPLOSION_INACTIVE) dat += "INACTIVE"
- if(NUKE_EXPLOSION_ACTIVE) dat += "ACTIVE"
- if(NUKE_EXPLOSION_IN_PROGRESS) dat += "IN PROGRESS"
- if(NUKE_EXPLOSION_FINISHED, NUKE_EXPLOSION_GROUND_FINISHED) dat += "FINISHED"
- dat += "
"
-
- dat += "Unlock Self-Destruct control panel for humans
"
- dat += "Lock Self-Destruct control panel for humans
"
- dat += "Destruct the [MAIN_SHIP_NAME] NOW
"
- dat += "Toggle Self-Destruct Permission (does not affect evac in progress)
"
-
dat += "
[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]
"
dat += "