Merge remote-tracking branch 'upstream/master' into vehicle-autofire

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

code/__DEFINES/dcs/signals/signals_global.dm

@@ -60,8 +60,14 @@
 #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"
+
+/// From /client/proc/rename_platoon()
+#define COMSIG_GLOB_PLATOON_NAME_CHANGE "platoon_name_change"

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

code/__DEFINES/keybinding.dm

@@ -87,6 +87,7 @@
 #define COMSIG_KB_HUMAN_WEAPON_UNLOAD "keybinding_human_weapon_unload"
 #define COMSIG_KB_HUMAN_WEAPON_ATTACHMENT "keybinding_human_weapon_attachment"
 #define COMSIG_KB_HUMAN_WEAPON_ATTACHMENT_RAIL "keybinding_human_weapon_attachment_rail"
+#define COMSIG_KB_HUMAN_WEAPON_SHOTGUN_TUBE "keybinding_human_weapon_shotgun_tube"
 
 #define COMSIG_KB_HUMAN_WEAPON_TOGGLE_IFF "keybinding_human_weapon_toggle_iff"
 

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
@@ -177,7 +161,6 @@
 #define SS_PRIORITY_TICKER  200
 #define SS_PRIORITY_XENO_AI 185
 #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
@@ -196,20 +179,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
@@ -228,7 +208,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

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.
 

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)

code/_globalvars/lists/object_lists.dm

@@ -32,3 +32,6 @@ GLOBAL_LIST_EMPTY_TYPED(all_active_defenses, /obj/structure/machinery/defenses)
 
 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)

code/controllers/configuration/configuration.dm

@@ -20,7 +20,6 @@
 	var/policy
 
 	var/static/regex/ic_filter_regex
-	var/list/fail_to_topic_whitelisted_ips
 
 	var/is_loaded = FALSE
 
@@ -55,7 +54,6 @@
 	loadmaplist(CONFIG_GROUND_MAPS_FILE, GROUND_MAP)
 	loadmaplist(CONFIG_SHIP_MAPS_FILE, SHIP_MAP)
 	LoadChatFilter()
-	LoadTopicRateWhitelist()
 
 	is_loaded = TRUE
 
@@ -337,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

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]