Merge branch 'master' into tg-profiler

code/__DEFINES/dcs/signals/atom/signals_atom.dm

@@ -45,3 +45,9 @@
 
 ///When the transform or an atom is varedited through vv topic.
 #define COMSIG_ATOM_VV_MODIFY_TRANSFORM "atom_vv_modify_transform"
+
+/// Called when an atom has something mouse dropped on it, from /client/MouseDrop: (atom/dropped_on)
+#define COMSIG_ATOM_DROPPED_ON "atom_dropped_on"
+
+/// Called when an atom is mouse dropped on another atom, from /client/MouseDrop: (atom/dropped_onto)
+#define COMSIG_ATOM_DROP_ON "atom_drop_on"

code/__DEFINES/dcs/signals/atom/signals_item.dm

@@ -65,3 +65,6 @@
 
 /// from  /obj/item/weapon/gun/proc/load_into_chamber() : ()
 #define COMSIG_GUN_INTERRUPT_FIRE "gun_interrupt_fire"
+
+//Additional procs on items that will be triggered right after the human finishes spawns in
+#define COMSIG_POST_SPAWN_UPDATE "post_spawn_update"

code/__DEFINES/mobs.dm

@@ -417,3 +417,4 @@ var/list/default_xeno_onmob_icons = list(
 #define HANDLING_LIMBS list("l_arm","l_hand", "r_arm", "r_hand")
 #define EXTREMITY_LIMBS list("l_leg","l_foot","r_leg","r_foot","l_arm","l_hand","r_arm","r_hand")
 #define CORE_LIMBS list("chest","head","groin")
+

code/__DEFINES/shuttles.dm

@@ -100,10 +100,12 @@
 #define MOBILE_SHUTTLE_ID_ERT_BIG "ert_boarding_shuttle"
 
 #define MOBILE_TRIJENT_ELEVATOR "trijentshuttle2"
-#define STAT_TRIJENT_LZ1 "trigent_lz1"
-#define STAT_TRIJENT_LZ2 "trigent_lz2"
-#define STAT_TRIJENT_ENGI "trigent_engineering"
-#define STAT_TRIJENT_OMEGA "trigent_omega"
+#define STAT_TRIJENT_EMPTY "trijent_empty"
+#define STAT_TRIJENT_OCCUPIED "trijent_occupied"
+#define STAT_TRIJENT_LZ1 "trijent_lz1"
+#define STAT_TRIJENT_LZ2 "trijent_lz2"
+#define STAT_TRIJENT_ENGI "trijent_engineering"
+#define STAT_TRIJENT_OMEGA "trijent_omega"
 
 #define MOBILE_SHUTTLE_LIFEBOAT_PORT "lifeboat-port"
 #define MOBILE_SHUTTLE_LIFEBOAT_STARBOARD "lifeboat-starboard"

code/__DEFINES/subsystems.dm

@@ -111,34 +111,21 @@
 
 #define SS_INIT_PROFILER 86
 #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_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,16 @@
 #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_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 +205,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/surgery.dm

@@ -149,7 +149,7 @@ See also /datum/surgery_step/saw_off_limb/failure var/list/cannot_hack, listing
 #define SURGERY_TOOLS_SEVER_BONE list(\
 	/obj/item/tool/surgery/circular_saw = SURGERY_TOOL_MULT_IDEAL,\
 	/obj/item/weapon/twohanded/fireaxe = SURGERY_TOOL_MULT_SUBOPTIMAL,\
-	/obj/item/weapon/claymore/mercsword/machete = SURGERY_TOOL_MULT_SUBOPTIMAL,\
+	/obj/item/weapon/sword/machete = SURGERY_TOOL_MULT_SUBOPTIMAL,\
 	/obj/item/tool/hatchet = SURGERY_TOOL_MULT_SUBSTITUTE,\
 	/obj/item/tool/kitchen/knife/butcher = SURGERY_TOOL_MULT_SUBSTITUTE,\
 	/obj/item/attachable/bayonet = SURGERY_TOOL_MULT_BAD_SUBSTITUTE\

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.6.0"
+#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/__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"

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))
 

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

@@ -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)

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)

code/_onclick/click_hold.dm

@@ -94,3 +94,12 @@
 
 	// Add the hovered atom to the trace
 	LAZYADD(mouse_trace_history, over_obj)
+
+/client/MouseDrop(datum/over_object, datum/src_location, over_location, src_control, over_control, params)
+	. = ..()
+
+	if(src_location)
+		SEND_SIGNAL(src_location, COMSIG_ATOM_DROPPED_ON, over_object, src)
+
+	if(over_object)
+		SEND_SIGNAL(over_object, COMSIG_ATOM_DROP_ON, src_location, src)

code/_onclick/hud/screen_objects.dm

@@ -30,6 +30,10 @@
 /atom/movable/screen/inventory
 	var/slot_id //The indentifier for the slot. It has nothing to do with ID cards.
 
+/atom/movable/screen/inventory/Initialize(mapload, ...)
+	. = ..()
+
+	RegisterSignal(src, COMSIG_ATOM_DROPPED_ON, PROC_REF(handle_dropped_on))
 
 /atom/movable/screen/close
 	name = "close"
@@ -325,6 +329,22 @@
 				return 1
 	return 0
 
+/atom/movable/screen/inventory/proc/handle_dropped_on(atom/dropped_on, atom/dropping, client/user)
+	SIGNAL_HANDLER
+
+	if(slot_id != WEAR_L_HAND && slot_id != WEAR_R_HAND)
+		return
+
+	if(!isstorage(dropping.loc))
+		return
+
+	if(!user.mob.Adjacent(dropping))
+		return
+
+	var/obj/item/storage/store = dropping.loc
+	store.remove_from_storage(dropping, get_turf(user.mob))
+	user.mob.put_in_active_hand(dropping)
+
 /atom/movable/screen/throw_catch
 	name = "throw/catch"
 	icon = 'icons/mob/hud/human_midnight.dmi'

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

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]