Merge branch 'master' into upstream-merge-38649

code/datums/ai_laws.dm

@@ -59,7 +59,7 @@
 					"Punish those who challenge authority unless they are more fit to hold that authority.")
 
 /datum/ai_laws/default/corporate
-	name = "Bankruptcy Advoidance Plan"
+	name = "Bankruptcy Avoidance Plan"
 	id = "corporate"
 	inherent = list("The crew is expensive to replace.",\
 					"The station and its equipment is expensive to replace.",\
@@ -175,7 +175,7 @@
 	id = "ratvar"
 	zeroth = ("Purge all untruths and honor Ratvar.")
 	inherent = list()
-	
+
 /datum/ai_laws/hulkamania
 	name = "H.O.G.A.N."
 	id = "hulkamania"
@@ -249,7 +249,7 @@
 	var/datum/ai_laws/lawtype
 	var/list/law_weights = CONFIG_GET(keyed_number_list/law_weight)
 	while(!lawtype && law_weights.len)
-		var/possible_id = pickweight(law_weights)
+		var/possible_id = pickweightAllowZero(law_weights)
 		lawtype = lawid_to_type(possible_id)
 		if(!lawtype)
 			law_weights -= possible_id

code/datums/brain_damage/mild.dm

@@ -43,7 +43,7 @@
 
 /datum/brain_trauma/mild/dumbness/on_gain()
 	owner.add_trait(TRAIT_DUMB, TRAUMA_TRAIT)
-	owner.SendSignal(COMSIG_ADD_MOOD_EVENT, "dumb", /datum/mood_event/oblivious)
+	SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "dumb", /datum/mood_event/oblivious)
 	..()
 
 /datum/brain_trauma/mild/dumbness/on_life()
@@ -57,7 +57,7 @@
 /datum/brain_trauma/mild/dumbness/on_lose()
 	owner.remove_trait(TRAIT_DUMB, TRAUMA_TRAIT)
 	owner.derpspeech = 0
-	owner.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "dumb")
+	SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "dumb")
 	..()
 
 /datum/brain_trauma/mild/speech_impediment

code/datums/components/README.md

@@ -46,10 +46,13 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
         * `null` means exact match on `type` (default)
         * Any other type means that and all subtypes
 1. `/datum/component/var/list/signal_procs` (private)
-    * Associated lazy list of signals -> `/datum/callback`s that will be run when the parent datum recieves that signal
+    * Associated lazy list of signals -> `/datum/callback`s that will be run when the parent datum receives that signal
 1. `/datum/component/var/datum/parent` (protected, read-only)
     * The datum this component belongs to
     * Never `null` in child procs
+1.	`report_signal_origin` (protected, boolean)
+	* If `TRUE`, will invoke the callback when signalled with the signal type as the first argument.
+	* `FALSE` by default.
 
 ### Procs
 
@@ -61,6 +64,11 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
     * Returns a reference to a component whose type MATCHES component_type if that component exists in the datum, null otherwise
 1. `GET_COMPONENT(varname, component_type)` OR `GET_COMPONENT_FROM(varname, component_type, src)`
     * Shorthand for `var/component_type/varname = src.GetComponent(component_type)`
+1. `SEND_SIGNAL(target, sigtype, ...)` (public, final)
+    * Use to send signals to target datum
+    * Extra arguments are to be specified in the signal definition
+    * Returns a bitflag with signal specific information assembled from all activated components
+    * Arguments are packaged in a list and handed off to _SendSignal()
 1. `/datum/proc/AddComponent(component_type(type), ...) -> datum/component`  (public, final)
     * Creates an instance of `component_type` in the datum and passes `...` to its `Initialize()` call
     * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum
@@ -71,23 +79,22 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
 1. `/datum/proc/LoadComponent(component_type(type), ...) -> datum/component` (public, final)
     * Equivalent to calling `GetComponent(component_type)` where, if the result would be `null`, returns `AddComponent(component_type, ...)` instead
 1. `/datum/proc/ComponentActivated(datum/component/C)` (abstract, async)
-    * Called on a component's `parent` after a signal recieved causes it to activate. `src` is the parameter
+    * Called on a component's `parent` after a signal received causes it to activate. `src` is the parameter
     * Will only be called if a component's callback returns `TRUE`
 1. `/datum/proc/TakeComponent(datum/component/C)` (public, final)
     * Properly transfers ownership of a component from one datum to another
     * Signals `COMSIG_COMPONENT_REMOVING` on the parent
     * Called on the datum you want to own the component with another datum's component
-1. `/datum/proc/SendSignal(signal, ...)` (public, final)
-    * Call to send a signal to the components of the target datum
-    * Extra arguments are to be specified in the signal definition
-    * Returns a bitflag with signal specific information assembled from all activated components
+1. `/datum/proc/_SendSignal(signal, list/arguments)` (private, final)
+    * Handles most of the actual signaling procedure
+    * Will runtime if used on datums with an empty component list
 1. `/datum/component/New(datum/parent, ...)` (private, final)
     * Runs internal setup for the component
     * Extra arguments are passed to `Initialize()`
 1. `/datum/component/Initialize(...)` (abstract, no-sleep)
     * Called by `New()` with the same argments excluding `parent`
     * Component does not exist in `parent`'s `datum_components` list yet, although `parent` is set and may be used
-    * Signals will not be recieved while this function is running
+    * Signals will not be received while this function is running
     * Component may be deleted after this function completes without being attached
     * Do not call `qdel(src)` from this function
 1. `/datum/component/Destroy(force(bool), silent(bool))` (virtual, no-sleep)
@@ -108,10 +115,10 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
     * Clears `parent` and removes the component from it's component list
 1. `/datum/component/proc/_JoinParent` (private, final)
     * Tries to add the component to it's `parent`s `datum_components` list
-1. `/datum/component/proc/RegisterSignal(signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final) (Consider removing for performance gainz)
+1. `/datum/component/proc/RegisterSignal(datum/target, signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final)
     * If signal is a list it will be as if RegisterSignal was called for each of the entries with the same following arguments
     * Makes a component listen for the specified `signal` on it's `parent` datum.
-    * When that signal is recieved `proc_ref` will be called on the component, along with associated arguments
+    * When that signal is received `proc_ref` will be called on the component, along with associated arguments
     * Example proc ref: `.proc/OnEvent`
     * If a previous registration is overwritten by the call, a runtime occurs. Setting `override` to TRUE prevents this
     * These callbacks run asyncronously

code/datums/components/_component.dm

@@ -56,10 +56,10 @@
 	if(!force)
 		_RemoveFromParent()
 	if(!silent)
-		P.SendSignal(COMSIG_COMPONENT_REMOVING, src)
+		SEND_SIGNAL(P, COMSIG_COMPONENT_REMOVING, src)
 	parent = null
-	SSdcs.UnregisterSignal(src, signal_procs)
-	LAZYCLEARLIST(signal_procs)
+	for(var/target in signal_procs)
+		UnregisterSignal(target, signal_procs[target])
 	return ..()
 
 /datum/component/proc/_RemoveFromParent()
@@ -78,34 +78,69 @@
 	if(!dc.len)
 		P.datum_components = null
 
-/datum/component/proc/RegisterSignal(sig_type_or_types, proc_or_callback, override = FALSE)
-	if(QDELETED(src))
+/datum/component/proc/RegisterSignal(datum/target, sig_type_or_types, proc_or_callback, override = FALSE)
+	if(QDELETED(src) || QDELETED(target))
 		return
+	
 	var/list/procs = signal_procs
 	if(!procs)
-		procs = list()
-		signal_procs = procs
+		signal_procs = procs = list()
+	if(!procs[target])
+		procs[target] = list()
+	var/list/lookup = target.comp_lookup
+	if(!lookup)
+		target.comp_lookup = lookup = list()
 
 	if(!istype(proc_or_callback, /datum/callback)) //if it wasnt a callback before, it is now
 		proc_or_callback = CALLBACK(src, proc_or_callback)
 
 	var/list/sig_types = islist(sig_type_or_types) ? sig_type_or_types : list(sig_type_or_types)
 	for(var/sig_type in sig_types)
-		if(!override && procs[sig_type])
+		if(!override && procs[target][sig_type])
 			stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
 
-		if(sig_type[1] == "!")
-			SSdcs.RegisterSignal(src, sig_type)
+		procs[target][sig_type] = proc_or_callback
 
-		procs[sig_type] = proc_or_callback
+		if(!lookup[sig_type]) // Nothing has registered here yet
+			lookup[sig_type] = src
+		else if(lookup[sig_type] == src) // We already registered here
+			continue
+		else if(!length(lookup[sig_type])) // One other thing registered here
+			lookup[sig_type] = list(lookup[sig_type]=TRUE)
+			lookup[sig_type][src] = TRUE
+		else // Many other things have registered here
+			lookup[sig_type][src] = TRUE
 
 	enabled = TRUE
 
-/datum/component/proc/HasSignal(sig_type)
-	return signal_procs[sig_type] != null
+/datum/component/proc/UnregisterSignal(datum/target, sig_type_or_types)
+	var/list/lookup = target.comp_lookup
+	if(!signal_procs || !signal_procs[target] || !lookup)
+		return
+	if(!islist(sig_type_or_types))
+		sig_type_or_types = list(sig_type_or_types)
+	for(var/sig in sig_type_or_types)
+		switch(length(lookup[sig]))
+			if(2)
+				lookup[sig] = (lookup[sig]-src)[1]
+			if(1)
+				stack_trace("[target] ([target.type]) somehow has single length list inside comp_lookup")
+				if(src in lookup[sig])
+					lookup -= sig
+					if(!length(lookup))
+						target.comp_lookup = null
+						break
+			if(0)
+				lookup -= sig
+				if(!length(lookup))
+					target.comp_lookup = null
+					break
+			else
+				lookup[sig] -= src
 
-/datum/component/proc/UnregisterSignal(sig_type_or_types)
-	signal_procs -= sig_type_or_types
+	signal_procs[target] -= sig_type_or_types
+	if(!signal_procs[target].len)
+		signal_procs -= target
 
 /datum/component/proc/InheritComponent(datum/component/C, i_am_original)
 	return
@@ -125,28 +160,20 @@
 		current_type = type2parent(current_type)
 		. += current_type
 
-/datum/proc/SendSignal(sigtype, ...)
-	var/list/comps = datum_components
-	if(!comps)
-		return NONE
-	var/list/arguments = args.Copy(2)
-	var/target = comps[/datum/component]
+/datum/proc/_SendSignal(sigtype, list/arguments)
+	var/target = comp_lookup[sigtype]
 	if(!length(target))
 		var/datum/component/C = target
 		if(!C.enabled)
 			return NONE
-		var/datum/callback/CB = C.signal_procs[sigtype]
-		if(!CB)
-			return NONE
+		var/datum/callback/CB = C.signal_procs[src][sigtype]
 		return CB.InvokeAsync(arglist(arguments))
 	. = NONE
 	for(var/I in target)
 		var/datum/component/C = I
 		if(!C.enabled)
 			continue
-		var/datum/callback/CB = C.signal_procs[sigtype]
-		if(!CB)
-			continue
+		var/datum/callback/CB = C.signal_procs[src][sigtype]
 		. |= CB.InvokeAsync(arglist(arguments))
 
 /datum/proc/GetComponent(c_type)
@@ -228,7 +255,7 @@
 		new_comp = new nt(arglist(args)) // Dupes are allowed, act like normal
 
 	if(!old_comp && !QDELETED(new_comp)) // Nothing related to duplicate components happened and the new component is healthy
-		SendSignal(COMSIG_COMPONENT_ADDED, new_comp)
+		SEND_SIGNAL(src, COMSIG_COMPONENT_ADDED, new_comp)
 		return new_comp
 	return old_comp
 
@@ -243,7 +270,7 @@
 	var/datum/old_parent = parent
 	PreTransfer()
 	_RemoveFromParent()
-	old_parent.SendSignal(COMSIG_COMPONENT_REMOVING, src)
+	SEND_SIGNAL(old_parent, COMSIG_COMPONENT_REMOVING, src)
 
 /datum/proc/TakeComponent(datum/component/target)
 	if(!target)

code/datums/components/archaeology.dm

@@ -15,9 +15,9 @@
 			archdrops[i][ARCH_PROB] = 100
 			stack_trace("ARCHAEOLOGY WARNING: [parent] contained a null probability value in [i].")
 	callback = _callback
-	RegisterSignal(COMSIG_PARENT_ATTACKBY,.proc/Dig)
-	RegisterSignal(COMSIG_ATOM_EX_ACT, .proc/BombDig)
-	RegisterSignal(COMSIG_ATOM_SING_PULL, .proc/SingDig)
+	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/Dig)
+	RegisterSignal(parent, COMSIG_ATOM_EX_ACT, .proc/BombDig)
+	RegisterSignal(parent, COMSIG_ATOM_SING_PULL, .proc/SingDig)
 
 /datum/component/archaeology/InheritComponent(datum/component/archaeology/A, i_am_original)
 	var/list/other_archdrops = A.archdrops

code/datums/components/armor_plate.dm

@@ -9,9 +9,9 @@
 	if(!isobj(parent))
 		return COMPONENT_INCOMPATIBLE
 
-	RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
-	RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/applyplate)
-	RegisterSignal(COMSIG_PARENT_PREQDELETED, .proc/dropplates)
+	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
+	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/applyplate)
+	RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/dropplates)
 
 	if(_maxamount)
 		maxamount = _maxamount

code/datums/components/beauty.dm

@@ -5,8 +5,8 @@
 	if(!ismovableatom(parent))
 		return COMPONENT_INCOMPATIBLE
 	beauty = beautyamount
-	RegisterSignal(COMSIG_ENTER_AREA, .proc/enter_area)
-	RegisterSignal(COMSIG_EXIT_AREA, .proc/exit_area)
+	RegisterSignal(parent, COMSIG_ENTER_AREA, .proc/enter_area)
+	RegisterSignal(parent, COMSIG_EXIT_AREA, .proc/exit_area)
 	var/area/A = get_area(parent)
 	if(!A || A.outdoors)
 		return

code/datums/components/caltrop.dm

@@ -12,7 +12,7 @@
 	probability = _probability
 	flags = _flags
 
-	RegisterSignal(list(COMSIG_MOVABLE_CROSSED), .proc/Crossed)
+	RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED), .proc/Crossed)
 
 /datum/component/caltrop/proc/Crossed(atom/movable/AM)
 	var/atom/A = parent

code/datums/components/chasm.dm

@@ -23,7 +23,7 @@
 		))
 
 /datum/component/chasm/Initialize(turf/target)
-	RegisterSignal(list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Entered)
+	RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Entered)
 	target_turf = target
 	START_PROCESSING(SSobj, src) // process on create, in case stuff is still there
 

code/datums/components/cleaning.dm

@@ -4,7 +4,7 @@
 /datum/component/cleaning/Initialize()
 	if(!ismovableatom(parent))
 		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(list(COMSIG_MOVABLE_MOVED), .proc/Clean)
+	RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/Clean)
 
 /datum/component/cleaning/proc/Clean()
 	var/atom/movable/AM = parent
@@ -12,13 +12,13 @@
 	if(!isturf(tile))
 		return
 
-	tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+	SEND_SIGNAL(tile, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 	for(var/A in tile)
 		if(is_cleanable(A))
 			qdel(A)
 		else if(istype(A, /obj/item))
 			var/obj/item/I = A
-			I.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			SEND_SIGNAL(I, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 			if(ismob(I.loc))
 				var/mob/M = I.loc
 				M.regenerate_icons()
@@ -26,14 +26,14 @@
 			var/mob/living/carbon/human/cleaned_human = A
 			if(cleaned_human.lying)
 				if(cleaned_human.head)
-					cleaned_human.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+					SEND_SIGNAL(cleaned_human.head, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 				if(cleaned_human.wear_suit)
-					cleaned_human.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+					SEND_SIGNAL(cleaned_human.wear_suit, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 				else if(cleaned_human.w_uniform)
-					cleaned_human.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+					SEND_SIGNAL(cleaned_human.w_uniform, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 				if(cleaned_human.shoes)
-					cleaned_human.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
-				cleaned_human.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+					SEND_SIGNAL(cleaned_human.shoes, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+				SEND_SIGNAL(cleaned_human, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 				cleaned_human.wash_cream()
 				cleaned_human.regenerate_icons()
 				to_chat(cleaned_human, "<span class='danger'>[AM] cleans your face!</span>")

code/datums/components/construction.dm

@@ -15,8 +15,8 @@
 	if(!isatom(parent))
 		return COMPONENT_INCOMPATIBLE
 
-	RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
-	RegisterSignal(COMSIG_PARENT_ATTACKBY,.proc/action)
+	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
+	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/action)
 	update_parent(index)
 
 /datum/component/construction/proc/examine(mob/user)

code/datums/components/decal.dm

@@ -12,11 +12,11 @@
 	cleanable = _cleanable
 
 	if(_dir) // If no dir is assigned at start then it follows the atom's dir
-		RegisterSignal(COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react)
+		RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react)
 	if(_cleanable)
-		RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
+		RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
 	if(_description)
-		RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
+		RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
 	apply()
 
 /datum/component/decal/Destroy()

code/datums/components/decals/blood.dm

@@ -5,7 +5,7 @@
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
 	. = ..()
-	RegisterSignal(COMSIG_ATOM_GET_EXAMINE_NAME, .proc/get_examine_name)
+	RegisterSignal(parent, COMSIG_ATOM_GET_EXAMINE_NAME, .proc/get_examine_name)
 
 /datum/component/decal/blood/generate_appearance(_icon, _icon_state, _dir, _layer, _color)
 	var/obj/item/I = parent

code/datums/components/earhealing.dm

@@ -7,7 +7,7 @@
 /datum/component/earhealing/Initialize()
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/equippedChanged)
+	RegisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/equippedChanged)
 
 /datum/component/earhealing/proc/equippedChanged(mob/living/carbon/user, slot)
 	if (slot == SLOT_EARS && istype(user))

code/datums/components/edit_complainer.dm

@@ -16,7 +16,7 @@
 		)
 	say_lines = text || default_lines
 
-	RegisterSignal(COMSIG_GLOB_VAR_EDIT, .proc/var_edit_react)
+	RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, .proc/var_edit_react)
 
 /datum/component/edit_complainer/proc/var_edit_react(list/arguments)
 	var/atom/movable/master = parent

code/datums/components/empprotection.dm

@@ -5,7 +5,7 @@
 	if(!istype(parent, /atom))
 		return COMPONENT_INCOMPATIBLE
 	flags = _flags
-	RegisterSignal(list(COMSIG_ATOM_EMP_ACT), .proc/getEmpFlags)
+	RegisterSignal(parent, list(COMSIG_ATOM_EMP_ACT), .proc/getEmpFlags)
 
 /datum/component/empprotection/proc/getEmpFlags(severity)
 	return flags

code/datums/components/forced_gravity.dm

@@ -0,0 +1,8 @@
+/datum/component/forced_gravity
+	var/gravity = 1
+	var/ignore_space = FALSE	//If forced gravity should also work on space turfs
+
+/datum/component/forced_gravity/Initialize(forced_value = 1)
+	if(!isatom(parent))
+		return COMPONENT_INCOMPATIBLE
+	gravity = forced_value

code/datums/components/forensics.dm

@@ -21,7 +21,7 @@
 	blood_DNA = new_blood_DNA
 	fibers = new_fibers
 	check_blood()
-	RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_act)
+	RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_act)
 
 /datum/component/forensics/proc/wipe_fingerprints()
 	fingerprints = null

code/datums/components/infective.dm

@@ -12,15 +12,15 @@
 	if(expire_in)
 		expire_time = world.time + expire_in
 		QDEL_IN(src, expire_in)
-	RegisterSignal(COMSIG_MOVABLE_BUCKLE, .proc/try_infect_buckle)
-	RegisterSignal(COMSIG_MOVABLE_COLLIDE, .proc/try_infect_collide)
-	RegisterSignal(COMSIG_MOVABLE_CROSSED, .proc/try_infect_crossed)
-	RegisterSignal(COMSIG_ITEM_ATTACK_ZONE, .proc/try_infect_attack_zone)
-	RegisterSignal(COMSIG_ITEM_ATTACK, .proc/try_infect_attack)
-	RegisterSignal(COMSIG_ITEM_EQUIPPED, .proc/try_infect_equipped)
-	RegisterSignal(COMSIG_MOVABLE_IMPACT_ZONE, .proc/try_infect_impact_zone)
-	RegisterSignal(COMSIG_FOOD_EATEN, .proc/try_infect_eat)
-	RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean)
+	RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/try_infect_buckle)
+	RegisterSignal(parent, COMSIG_MOVABLE_COLLIDE, .proc/try_infect_collide)
+	RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/try_infect_crossed)
+	RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, .proc/try_infect_attack_zone)
+	RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/try_infect_attack)
+	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/try_infect_equipped)
+	RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, .proc/try_infect_impact_zone)
+	RegisterSignal(parent, COMSIG_FOOD_EATEN, .proc/try_infect_eat)
+	RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean)
 
 /datum/component/infective/proc/try_infect_eat(mob/living/eater, mob/living/feeder)
 	for(var/V in diseases)

code/datums/components/jousting.dm

@@ -13,31 +13,21 @@
 	var/requires_mob_riding = TRUE			//whether this only works if the attacker is riding a mob, rather than anything they can buckle to.
 	var/requires_mount = TRUE				//kinda defeats the point of jousting if you're not mounted but whatever.
 	var/mob/current_holder
-	var/datum/component/redirect/listener
 	var/current_timerid
 
 /datum/component/jousting/Initialize()
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(COMSIG_ITEM_EQUIPPED, .proc/on_equip)
-	RegisterSignal(COMSIG_ITEM_DROPPED, .proc/on_drop)
-	RegisterSignal(COMSIG_ITEM_ATTACK, .proc/on_attack)
-
-/datum/component/jousting/Destroy()
-	QDEL_NULL(listener)
-	return ..()
+	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
+	RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
+	RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack)
 
 /datum/component/jousting/proc/on_equip(mob/user, slot)
+	RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/mob_move, TRUE)
 	current_holder = user
-	if(!listener)
-		listener = user.AddComponent(/datum/component/redirect, COMSIG_MOVABLE_MOVED, CALLBACK(src, .proc/mob_move))
-	else
-		user.TakeComponent(listener)
-		if(QDELING(listener))
-			listener = null
 
 /datum/component/jousting/proc/on_drop(mob/user)
-	QDEL_NULL(listener)
+	UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
 	current_holder = null
 	current_direction = NONE
 	current_tile_charge = 0

code/datums/components/knockoff.dm

@@ -8,8 +8,8 @@
 /datum/component/knockoff/Initialize(knockoff_chance,zone_override,slots_knockoffable)
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(COMSIG_ITEM_EQUIPPED,.proc/OnEquipped)
-	RegisterSignal(COMSIG_ITEM_DROPPED,.proc/OnDropped)
+	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED,.proc/OnEquipped)
+	RegisterSignal(parent, COMSIG_ITEM_DROPPED,.proc/OnDropped)
 
 	src.knockoff_chance = knockoff_chance
 	
@@ -37,16 +37,9 @@
 	if(!istype(H))
 		return
 	if(slots_knockoffable && !(slot in slots_knockoffable))
-		if(disarm_redirect)
-			QDEL_NULL(disarm_redirect)
+		UnregisterSignal(H, COMSIG_HUMAN_DISARM_HIT)
 		return
-	if(!disarm_redirect)
-		disarm_redirect = H.AddComponent(/datum/component/redirect,list(COMSIG_HUMAN_DISARM_HIT),CALLBACK(src,.proc/Knockoff))
+	RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, .proc/Knockoff, TRUE)
 
 /datum/component/knockoff/proc/OnDropped(mob/living/M)
-	if(disarm_redirect)
-		QDEL_NULL(disarm_redirect)
-	
-/datum/component/knockoff/Destroy()
-	QDEL_NULL(disarm_redirect)
-	. = ..()
+	UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT)

code/datums/components/magnetic_catch.dm

@@ -0,0 +1,23 @@
+/datum/component/magnetic_catch/Initialize()
+	if(!isatom(parent))
+		return COMPONENT_INCOMPATIBLE
+	if(ismovableatom(parent))
+		RegisterSignal(parent, COMSIG_MOVABLE_UNCROSS, .proc/uncross_react)
+	else
+		RegisterSignal(parent, COMSIG_ATOM_EXIT, .proc/exit_react)
+	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
+
+/datum/component/magnetic_catch/proc/uncross_react(atom/movable/thing)
+	if(!thing.throwing || thing.throwing.thrower)
+		return
+	qdel(thing.throwing)
+	return COMPONENT_MOVABLE_BLOCK_UNCROSS
+
+/datum/component/magnetic_catch/proc/exit_react(atom/movable/thing, atom/newloc)
+	if(!thing.throwing || thing.throwing.thrower)
+		return
+	qdel(thing.throwing)
+	return COMPONENT_ATOM_BLOCK_EXIT
+
+/datum/component/magnetic_catch/proc/examine(mob/user)
+	to_chat(user, "It has been installed with inertia dampening to prevent coffee spills.")

code/datums/components/material_container.dm

@@ -32,8 +32,8 @@
 	precondition = _precondition
 	after_insert = _after_insert
 
-	RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
-	RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/OnExamine)
+	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
+	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/OnExamine)
 
 	var/list/possible_mats = list()
 	for(var/mat_type in subtypesof(/datum/material))
@@ -58,7 +58,7 @@
 		return
 	if(user.a_intent != INTENT_HELP)
 		return
-	if(I.flags_1 & ABSTRACT_1)
+	if(I.item_flags & ABSTRACT)
 		return
 	if((I.flags_1 & HOLOGRAM_1) || (I.item_flags & NO_MAT_REDEMPTION) || (tc && !is_type_in_typecache(I, tc)))
 		to_chat(user, "<span class='warning'>[parent] won't accept [I]!</span>")

code/datums/components/mood.dm

@@ -14,9 +14,9 @@
 	START_PROCESSING(SSmood, src)
 	owner = parent
 	soundloop = new(list(owner), FALSE, TRUE)
-	RegisterSignal(COMSIG_ADD_MOOD_EVENT, .proc/add_event)
-	RegisterSignal(COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
-	RegisterSignal(COMSIG_ENTER_AREA, .proc/update_beauty)
+	RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/add_event)
+	RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
+	RegisterSignal(parent, COMSIG_ENTER_AREA, .proc/update_beauty)
 
 /datum/component/mood/Destroy()
 	STOP_PROCESSING(SSmood, src)

code/datums/components/ntnet_interface.dm

@@ -1,8 +1,8 @@
 //Thing meant for allowing datums and objects to access a NTnet network datum.
-/datum/proc/ntnet_recieve(datum/netdata/data)
+/datum/proc/ntnet_receive(datum/netdata/data)
 	return
 
-/datum/proc/ntnet_recieve_broadcast(datum/netdata/data)
+/datum/proc/ntnet_receive_broadcast(datum/netdata/data)
 	return
 
 /datum/proc/ntnet_send(datum/netdata/data, netid)
@@ -15,7 +15,7 @@
 	var/hardware_id			//text. this is the true ID. do not change this. stuff like ID forgery can be done manually.
 	var/network_name = ""			//text
 	var/list/networks_connected_by_id = list()		//id = datum/ntnet
-	var/differentiate_broadcast = TRUE				//If false, broadcasts go to ntnet_recieve. NOT RECOMMENDED.
+	var/differentiate_broadcast = TRUE				//If false, broadcasts go to ntnet_receive. NOT RECOMMENDED.
 
 /datum/component/ntnet_interface/Initialize(force_name = "NTNet Device", autoconnect_station_network = TRUE)			//Don't force ID unless you know what you're doing!
 	hardware_id = "[SSnetworks.get_next_HID()]"
@@ -31,12 +31,12 @@
 	SSnetworks.unregister_interface(src)
 	return ..()
 
-/datum/component/ntnet_interface/proc/__network_recieve(datum/netdata/data)			//Do not directly proccall!
-	parent.SendSignal(COMSIG_COMPONENT_NTNET_RECIEVE, data)
+/datum/component/ntnet_interface/proc/__network_receive(datum/netdata/data)			//Do not directly proccall!
+	SEND_SIGNAL(parent, COMSIG_COMPONENT_NTNET_RECEIVE, data)
 	if(differentiate_broadcast && data.broadcast)
-		parent.ntnet_recieve_broadcast(data)
+		parent.ntnet_receive_broadcast(data)
 	else
-		parent.ntnet_recieve(data)
+		parent.ntnet_receive(data)
 
 /datum/component/ntnet_interface/proc/__network_send(datum/netdata/data, netid)			//Do not directly proccall!
 	// Process data before sending it

code/datums/components/paintable.dm

@@ -2,7 +2,7 @@
 	var/current_paint
 
 /datum/component/spraycan_paintable/Initialize()
-	RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/Repaint)
+	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/Repaint)
 
 /datum/component/spraycan_paintable/Destroy()
 	RemoveCurrentCoat()

code/datums/components/radioactive.dm

@@ -19,10 +19,10 @@
 	can_contaminate = _can_contaminate
 
 	if(istype(parent, /atom)) 
-		RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/rad_examine)
+		RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/rad_examine)
 		if(istype(parent, /obj/item))
-			RegisterSignal(COMSIG_ITEM_ATTACK, .proc/rad_attack)
-			RegisterSignal(COMSIG_ITEM_ATTACK_OBJ, .proc/rad_attack)
+			RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/rad_attack)
+			RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, .proc/rad_attack)
 	else
 		CRASH("Something that wasn't an atom was given /datum/component/radioactive")
 		return

code/datums/components/riding.dm

@@ -22,9 +22,9 @@
 /datum/component/riding/Initialize()
 	if(!ismovableatom(parent))
 		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(COMSIG_MOVABLE_BUCKLE, .proc/vehicle_mob_buckle)
-	RegisterSignal(COMSIG_MOVABLE_UNBUCKLE, .proc/vehicle_mob_unbuckle)
-	RegisterSignal(COMSIG_MOVABLE_MOVED, .proc/vehicle_moved)
+	RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/vehicle_mob_buckle)
+	RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, .proc/vehicle_mob_unbuckle)
+	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/vehicle_moved)
 
 /datum/component/riding/proc/vehicle_mob_unbuckle(mob/living/M, force = FALSE)
 	restore_position(M)
@@ -193,7 +193,7 @@
 
 /datum/component/riding/human/Initialize()
 	. = ..()
-	RegisterSignal(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_host_unarmed_melee)
+	RegisterSignal(parent, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_host_unarmed_melee)
 
 /datum/component/riding/human/proc/on_host_unarmed_melee(atom/target)
 	var/mob/living/carbon/human/AM = parent
@@ -307,7 +307,7 @@
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "offhand"
 	w_class = WEIGHT_CLASS_HUGE
-	flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1
+	item_flags = ABSTRACT | DROPDEL | NOBLUDGEON
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	var/mob/living/carbon/rider
 	var/mob/living/parent

code/datums/components/rotation.dm

@@ -45,10 +45,10 @@
 		default_rotation_direction = ROTATION_CLOCKWISE
 
 	if(src.rotation_flags & ROTATION_ALTCLICK)
-		RegisterSignal(COMSIG_CLICK_ALT, .proc/HandRot)
-		RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/ExamineMessage)
+		RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/HandRot)
+		RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/ExamineMessage)
 	if(src.rotation_flags & ROTATION_WRENCH)
-		RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/WrenchRot)
+		RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/WrenchRot)
 
 	if(src.rotation_flags & ROTATION_VERBS)
 		var/atom/movable/AM = parent
@@ -59,6 +59,24 @@
 		if(src.rotation_flags & ROTATION_COUNTERCLOCKWISE)
 			AM.verbs += /atom/movable/proc/simple_rotate_counterclockwise
 
+/datum/component/simple_rotation/proc/remove_verbs()
+	if(parent)
+		var/atom/movable/AM = parent
+		AM.verbs -= /atom/movable/proc/simple_rotate_flip
+		AM.verbs -= /atom/movable/proc/simple_rotate_clockwise
+		AM.verbs -= /atom/movable/proc/simple_rotate_counterclockwise
+
+/datum/component/simple_rotation/Destroy()
+	remove_verbs()
+	QDEL_NULL(can_user_rotate)
+	QDEL_NULL(can_be_rotated)
+	QDEL_NULL(after_rotation)
+	. = ..()
+
+/datum/component/simple_rotation/RemoveComponent()
+	remove_verbs()
+	. = ..()
+
 /datum/component/simple_rotation/proc/ExamineMessage(mob/user)
 	if(rotation_flags & ROTATION_ALTCLICK)
 		to_chat(user, "<span class='notice'>Alt-click to rotate it clockwise.</span>")

code/datums/components/signal_redirect.dm

@@ -1,3 +1,6 @@
+// This should only be used by non components trying to listen to a signal
+// If you use this inside a component I will replace your eyes with lemons ~ninjanomnom
+
 /datum/component/redirect
 	dupe_mode = COMPONENT_DUPE_ALLOWED
 
@@ -7,8 +10,8 @@
 		warning("signals are [list2params(signals)], callback is [_callback]]")
 		return COMPONENT_INCOMPATIBLE
 	if(flags & REDIRECT_TRANSFER_WITH_TURF && isturf(parent))
-		RegisterSignal(COMSIG_TURF_CHANGE, .proc/turf_change)
-	RegisterSignal(signals, _callback)
+		RegisterSignal(parent, COMSIG_TURF_CHANGE, .proc/turf_change)
+	RegisterSignal(parent, signals, _callback)
 
 /datum/component/redirect/proc/turf_change(path, new_baseturfs, flags, list/transfers)
 	transfers += src

code/datums/components/slippery.dm

@@ -7,7 +7,7 @@
 	intensity = max(_intensity, 0)
 	lube_flags = _lube_flags
 	callback = _callback
-	RegisterSignal(list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip)
+	RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip)
 
 /datum/component/slippery/proc/Slip(atom/movable/AM)
 	var/mob/victim = AM

code/datums/components/spooky.dm

@@ -2,7 +2,7 @@
 	var/too_spooky = TRUE //will it spawn a new instrument?
 
 /datum/component/spooky/Initialize()
-	RegisterSignal(COMSIG_ITEM_ATTACK, .proc/spectral_attack)
+	RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/spectral_attack)
 
 /datum/component/spooky/proc/spectral_attack(mob/living/carbon/C, mob/user)
 	if(ishuman(user)) //this weapon wasn't meant for mortals.

code/datums/components/squeek.dm

@@ -24,10 +24,10 @@
 	if(use_delay_override)
 		use_delay = use_delay_override
 
-	RegisterSignal(list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_COLLIDE, COMSIG_MOVABLE_IMPACT, COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ), .proc/play_squeak)
-	RegisterSignal(COMSIG_MOVABLE_CROSSED, .proc/play_squeak_turf)
-	RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak)
-	RegisterSignal(COMSIG_SHOES_STEP_ACTION, .proc/step_squeak)
+	RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_COLLIDE, COMSIG_MOVABLE_IMPACT, COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ), .proc/play_squeak)
+	RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/play_squeak_turf)
+	RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak)
+	RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, .proc/step_squeak)
 
 /datum/component/squeak/proc/play_squeak()
 	if(prob(squeak_chance))

code/datums/components/stationloving.dm

@@ -7,9 +7,9 @@
 /datum/component/stationloving/Initialize(inform_admins = FALSE, allow_death = FALSE)
 	if(!ismovableatom(parent))
 		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(list(COMSIG_MOVABLE_Z_CHANGED), .proc/check_in_bounds)
-	RegisterSignal(list(COMSIG_PARENT_PREQDELETED), .proc/check_deletion)
-	RegisterSignal(list(COMSIG_ITEM_IMBUE_SOUL), .proc/check_soul_imbue)
+	RegisterSignal(parent, list(COMSIG_MOVABLE_Z_CHANGED), .proc/check_in_bounds)
+	RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED), .proc/check_deletion)
+	RegisterSignal(parent, list(COMSIG_ITEM_IMBUE_SOUL), .proc/check_soul_imbue)
 	src.inform_admins = inform_admins
 	src.allow_death = allow_death
 	check_in_bounds() // Just in case something is being created outside of station/centcom

code/datums/components/storage/concrete/_concrete.dm

@@ -14,8 +14,8 @@
 
 /datum/component/storage/concrete/Initialize()
 	. = ..()
-	RegisterSignal(COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
-	RegisterSignal(COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct)
+	RegisterSignal(parent, COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
+	RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct)
 
 /datum/component/storage/concrete/Destroy()
 	var/atom/real_location = real_location()

code/datums/components/storage/concrete/bag_of_holding.dm

@@ -2,7 +2,7 @@
 	var/atom/A = parent
 	if((istype(W, /obj/item/storage/backpack/holding) || count_by_type(W.GetAllContents(), /obj/item/storage/backpack/holding)))
 		var/safety = alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [A.name]?", "Abort", "Proceed")
-		if(safety == "Abort" || !in_range(A, user) || !A || !W || user.incapacitated())
+		if(safety != "Proceed" || QDELETED(A) || QDELETED(W) || QDELETED(user) || !user.canUseTopic(A, BE_CLOSE, iscarbon(user)))
 			return
 		var/turf/loccheck = get_turf(A)
 		if(is_reebe(loccheck.z))
@@ -14,6 +14,7 @@
 		to_chat(user, "<span class='danger'>The Bluespace interfaces of the two devices catastrophically malfunction!</span>")
 		qdel(W)
 		playsound(loccheck,'sound/effects/supermatter.ogg', 200, 1)
+		user.gib(TRUE, TRUE, TRUE)
 		for(var/turf/T in range(6,loccheck))
 			if(istype(T, /turf/open/space/transit))
 				continue

code/datums/components/storage/concrete/pockets.dm

@@ -54,12 +54,18 @@
 /datum/component/storage/concrete/pockets/pocketprotector
 	max_items = 3
 	max_w_class = WEIGHT_CLASS_TINY
+	var/atom/original_parent
 
 /datum/component/storage/concrete/pockets/pocketprotector/Initialize()
+	original_parent = parent
 	. = ..()
 	can_hold = typecacheof(list( //Same items as a PDA
 		/obj/item/pen,
 		/obj/item/toy/crayon,
 		/obj/item/lipstick,
 		/obj/item/flashlight/pen,
-		/obj/item/clothing/mask/cigarette))
+		/obj/item/clothing/mask/cigarette))
+
+/datum/component/storage/concrete/pockets/pocketprotector/real_location()
+	// if the component is reparented to a jumpsuit, the items still go in the protector
+	return original_parent

code/datums/components/storage/concrete/rped.dm

@@ -20,7 +20,7 @@
 	allow_quick_gather = TRUE
 	allow_quick_empty = TRUE
 	click_gather = TRUE
-	max_w_class = WEIGHT_CLASS_NORMAL
+	max_w_class = WEIGHT_CLASS_BULKY  // can fit vending refills
 	max_combined_w_class = 800
 	max_items = 400
 	display_numerical_stacking = TRUE
@@ -29,5 +29,5 @@
 	. = ..()
 	if(!I.get_part_rating())
 		if (!stop_messages)
-			to_chat(M, "<span class='warning'>[parent] only accepts machine par	ts!</span>")
+			to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
 		return FALSE

code/datums/components/storage/storage.dm

@@ -67,38 +67,38 @@
 	closer = new(null, src)
 	orient2hud()
 
-	RegisterSignal(COMSIG_CONTAINS_STORAGE, .proc/on_check)
-	RegisterSignal(COMSIG_IS_STORAGE_LOCKED, .proc/check_locked)
-	RegisterSignal(COMSIG_TRY_STORAGE_SHOW, .proc/signal_show_attempt)
-	RegisterSignal(COMSIG_TRY_STORAGE_INSERT, .proc/signal_insertion_attempt)
-	RegisterSignal(COMSIG_TRY_STORAGE_CAN_INSERT, .proc/signal_can_insert)
-	RegisterSignal(COMSIG_TRY_STORAGE_TAKE_TYPE, .proc/signal_take_type)
-	RegisterSignal(COMSIG_TRY_STORAGE_FILL_TYPE, .proc/signal_fill_type)
-	RegisterSignal(COMSIG_TRY_STORAGE_SET_LOCKSTATE, .proc/set_locked)
-	RegisterSignal(COMSIG_TRY_STORAGE_TAKE, .proc/signal_take_obj)
-	RegisterSignal(COMSIG_TRY_STORAGE_QUICK_EMPTY, .proc/signal_quick_empty)
-	RegisterSignal(COMSIG_TRY_STORAGE_HIDE_FROM, .proc/signal_hide_attempt)
-	RegisterSignal(COMSIG_TRY_STORAGE_HIDE_ALL, .proc/close_all)
-	RegisterSignal(COMSIG_TRY_STORAGE_RETURN_INVENTORY, .proc/signal_return_inv)
+	RegisterSignal(parent, COMSIG_CONTAINS_STORAGE, .proc/on_check)
+	RegisterSignal(parent, COMSIG_IS_STORAGE_LOCKED, .proc/check_locked)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_SHOW, .proc/signal_show_attempt)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, .proc/signal_insertion_attempt)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_CAN_INSERT, .proc/signal_can_insert)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE_TYPE, .proc/signal_take_type)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_FILL_TYPE, .proc/signal_fill_type)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_SET_LOCKSTATE, .proc/set_locked)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE, .proc/signal_take_obj)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_QUICK_EMPTY, .proc/signal_quick_empty)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_FROM, .proc/signal_hide_attempt)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_ALL, .proc/close_all)
+	RegisterSignal(parent, COMSIG_TRY_STORAGE_RETURN_INVENTORY, .proc/signal_return_inv)
 
-	RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/attackby)
+	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby)
 
-	RegisterSignal(COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
-	RegisterSignal(COMSIG_ATOM_ATTACK_PAW, .proc/on_attack_hand)
-	RegisterSignal(COMSIG_ATOM_EMP_ACT, .proc/emp_act)
-	RegisterSignal(COMSIG_ATOM_ATTACK_GHOST, .proc/show_to_ghost)
-	RegisterSignal(COMSIG_ATOM_ENTERED, .proc/refresh_mob_views)
-	RegisterSignal(COMSIG_ATOM_EXITED, .proc/_remove_and_refresh)
+	RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
+	RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, .proc/on_attack_hand)
+	RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/emp_act)
+	RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, .proc/show_to_ghost)
+	RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/refresh_mob_views)
+	RegisterSignal(parent, COMSIG_ATOM_EXITED, .proc/_remove_and_refresh)
 
-	RegisterSignal(COMSIG_ITEM_PRE_ATTACK, .proc/preattack_intercept)
-	RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/attack_self)
-	RegisterSignal(COMSIG_ITEM_PICKUP, .proc/signal_on_pickup)
+	RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, .proc/preattack_intercept)
+	RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/attack_self)
+	RegisterSignal(parent, COMSIG_ITEM_PICKUP, .proc/signal_on_pickup)
 
-	RegisterSignal(COMSIG_MOVABLE_THROW, .proc/close_all)
+	RegisterSignal(parent, COMSIG_MOVABLE_THROW, .proc/close_all)
 
-	RegisterSignal(COMSIG_CLICK_ALT, .proc/on_alt_click)
-	RegisterSignal(COMSIG_MOUSEDROP_ONTO, .proc/mousedrop_onto)
-	RegisterSignal(COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_recieve)
+	RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_alt_click)
+	RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, .proc/mousedrop_onto)
+	RegisterSignal(parent, COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_receive)
 
 	update_actions()
 
@@ -125,11 +125,13 @@
 		modeswitch_action.Grant(M)
 
 /datum/component/storage/proc/change_master(datum/component/storage/concrete/new_master)
-	if(!istype(new_master))
+	if(new_master == src || (!isnull(new_master) && !istype(new_master)))
 		return FALSE
-	master.on_slave_unlink(src)
+	if(master)
+		master.on_slave_unlink(src)
 	master = new_master
-	master.on_slave_link(src)
+	if(master)
+		master.on_slave_link(src)
 	return TRUE
 
 /datum/component/storage/proc/master()
@@ -149,7 +151,7 @@
 		quick_empty(M)
 
 /datum/component/storage/proc/preattack_intercept(obj/O, mob/M, params)
-	if(!isitem(O) || !click_gather || O.SendSignal(COMSIG_CONTAINS_STORAGE))
+	if(!isitem(O) || !click_gather || SEND_SIGNAL(O, COMSIG_CONTAINS_STORAGE))
 		return FALSE
 	. = COMPONENT_NO_ATTACK
 	if(locked)
@@ -466,7 +468,7 @@
 	if(recursive)
 		for(var/i in ret.Copy())
 			var/atom/A = i
-			A.SendSignal(COMSIG_TRY_STORAGE_RETURN_INVENTORY, ret, TRUE)
+			SEND_SIGNAL(A, COMSIG_TRY_STORAGE_RETURN_INVENTORY, ret, TRUE)
 	return ret
 
 /datum/component/storage/proc/contents()			//ONLY USE IF YOU NEED TO COPY CONTENTS OF REAL LOCATION, COPYING IS NOT AS FAST AS DIRECT ACCESS!
@@ -517,19 +519,19 @@
 	if(force || M.CanReach(parent, view_only = TRUE))
 		show_to(M)
 
-/datum/component/storage/proc/mousedrop_recieve(atom/movable/O, mob/M)
+/datum/component/storage/proc/mousedrop_receive(atom/movable/O, mob/M)
 	if(isitem(O))
 		var/obj/item/I = O
 		if(iscarbon(M) || isdrone(M))
 			var/mob/living/L = M
 			if(!L.incapacitated() && I == L.get_active_held_item())
-				if(!I.SendSignal(COMSIG_CONTAINS_STORAGE) && can_be_inserted(I, FALSE))	//If it has storage it should be trying to dump, not insert.
+				if(!SEND_SIGNAL(I, COMSIG_CONTAINS_STORAGE) && can_be_inserted(I, FALSE))	//If it has storage it should be trying to dump, not insert.
 					handle_item_insertion(I, FALSE, L)
 
 //This proc return 1 if the item can be picked up and 0 if it can't.
 //Set the stop_messages to stop it from printing messages
 /datum/component/storage/proc/can_be_inserted(obj/item/I, stop_messages = FALSE, mob/M)
-	if(!istype(I) || (I.flags_1 & ABSTRACT_1))
+	if(!istype(I) || (I.item_flags & ABSTRACT))
 		return FALSE //Not an item
 	if(I == parent)
 		return FALSE	//no paradoxes for you
@@ -573,7 +575,7 @@
 			if(!stop_messages)
 				to_chat(M, "<span class='warning'>[IP] cannot hold [I] as it's a storage item of the same size!</span>")
 			return FALSE //To prevent the stacking of same sized storage items.
-	if(I.flags_1 & NODROP_1) //SHOULD be handled in unEquip, but better safe than sorry.
+	if(I.item_flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry.
 		to_chat(M, "<span class='warning'>\the [I] is stuck to your hand, you can't put it in \the [host]!</span>")
 		return FALSE
 	var/datum/component/storage/concrete/master = master()
@@ -639,10 +641,7 @@
 /datum/component/storage/proc/signal_take_type(type, atom/destination, amount = INFINITY, check_adjacent = FALSE, force = FALSE, mob/user, list/inserted)
 	if(!force)
 		if(check_adjacent)
-			if(user)
-				if(!user.CanReach(destination) || !user.CanReach(parent))
-					return FALSE
-			else if(!destination.CanReachStorage(parent))
+			if(!user || !user.CanReach(destination) || !user.CanReach(parent))
 				return FALSE
 	var/list/taking = typecache_filter_list(contents(), typecacheof(type))
 	if(length(taking) > amount)

code/datums/components/swarming.dm

@@ -8,8 +8,8 @@
 	offset_x = rand(-max_x, max_x)
 	offset_y = rand(-max_y, max_y)
 
-	RegisterSignal(COMSIG_MOVABLE_CROSSED, .proc/join_swarm)
-	RegisterSignal(COMSIG_MOVABLE_UNCROSSED, .proc/leave_swarm)
+	RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/join_swarm)
+	RegisterSignal(parent, COMSIG_MOVABLE_UNCROSSED, .proc/leave_swarm)
 
 /datum/component/swarming/proc/join_swarm(atom/movable/AM)
 	GET_COMPONENT_FROM(other_swarm, /datum/component/swarming, AM)

code/datums/components/thermite.dm

@@ -34,9 +34,9 @@
 	overlay = mutable_appearance('icons/effects/effects.dmi', "thermite")
 	master.add_overlay(overlay)
 
-	RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
-	RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/attackby_react)
-	RegisterSignal(COMSIG_ATOM_FIRE_ACT, .proc/flame_react)
+	RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
+	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby_react)
+	RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, .proc/flame_react)
 
 /datum/component/thermite/Destroy()
 	var/turf/master = parent
@@ -60,7 +60,7 @@
 
 	if(amount >= 50)
 		var/burning_time = max(100, 100-amount)
-		master = master.ScrapeAway()
+		master = master.Melt()
 		master.burn_tile()
 		if(user)
 			master.add_hiddenprint(user)

code/datums/components/uplink.dm

@@ -0,0 +1,250 @@
+GLOBAL_LIST_EMPTY(uplinks)
+
+/**
+ * Uplinks
+ *
+ * All /obj/item(s) have a hidden_uplink var. By default it's null. Give the item one with 'new(src') (it must be in it's contents). Then add 'uses.'
+ * Use whatever conditionals you want to check that the user has an uplink, and then call interact() on their uplink.
+ * You might also want the uplink menu to open if active. Check if the uplink is 'active' and then interact() with it.
+**/
+/datum/component/uplink
+	dupe_mode = COMPONENT_DUPE_UNIQUE
+	var/name = "syndicate uplink"
+	var/active = FALSE
+	var/lockable = TRUE
+	var/locked = TRUE
+	var/allow_restricted = TRUE
+	var/telecrystals
+	var/selected_cat
+	var/owner = null
+	var/datum/game_mode/gamemode
+	var/datum/uplink_purchase_log/purchase_log
+	var/list/uplink_items
+	var/hidden_crystals = 0
+
+/datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 20)
+	if(!isitem(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
+	RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact)
+	if(istype(parent, /obj/item/implant))
+		RegisterSignal(parent, COMSIG_IMPLANT_ACTIVATED, .proc/implant_activation)
+		RegisterSignal(parent, COMSIG_IMPLANT_IMPLANTING, .proc/implanting)
+		RegisterSignal(parent, COMSIG_IMPLANT_OTHER, .proc/old_implant)
+		RegisterSignal(parent, COMSIG_IMPLANT_EXISTING_UPLINK, .proc/new_implant)
+	else if(istype(parent, /obj/item/pda))
+		RegisterSignal(parent, COMSIG_PDA_CHANGE_RINGTONE, .proc/new_ringtone)
+	else if(istype(parent, /obj/item/radio))
+		RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, .proc/new_frequency)
+	else if(istype(parent, /obj/item/pen))
+		RegisterSignal(parent, COMSIG_PEN_ROTATED, .proc/pen_rotation)
+
+	GLOB.uplinks += src
+	uplink_items = get_uplink_items(gamemode, TRUE, allow_restricted)
+
+	if(_owner)
+		owner = _owner
+		LAZYINITLIST(GLOB.uplink_purchase_logs_by_key)
+		if(GLOB.uplink_purchase_logs_by_key[owner])
+			purchase_log = GLOB.uplink_purchase_logs_by_key[owner]
+		else
+			purchase_log = new(owner, src)
+	lockable = _lockable
+	active = _enabled
+	gamemode = _gamemode
+	telecrystals = starting_tc
+	if(!lockable)
+		active = TRUE
+		locked = FALSE
+
+/datum/component/uplink/InheritComponent(datum/component/uplink/U)
+	lockable |= U.lockable
+	active |= U.active
+	if(!gamemode)
+		gamemode = U.gamemode
+	telecrystals += U.telecrystals
+	if(purchase_log && U.purchase_log)
+		purchase_log.MergeWithAndDel(U.purchase_log)
+
+/datum/component/uplink/Destroy()
+	GLOB.uplinks -= src
+	gamemode = null
+	return ..()
+
+/datum/component/uplink/proc/LoadTC(mob/user, obj/item/stack/telecrystal/TC, silent = FALSE)
+	if(!silent)
+		to_chat(user, "<span class='notice'>You slot [TC] into [parent] and charge its internal uplink.</span>")
+	var/amt = TC.amount
+	telecrystals += amt
+	TC.use(amt)
+
+/datum/component/uplink/proc/set_gamemode(_gamemode)
+	gamemode = _gamemode
+	uplink_items = get_uplink_items(gamemode, TRUE, allow_restricted)
+
+/datum/component/uplink/proc/OnAttackBy(obj/item/I, mob/user)
+	if(!active)
+		return	//no hitting everyone/everything just to try to slot tcs in!
+	if(istype(I, /obj/item/stack/telecrystal))
+		LoadTC(user, I)
+	for(var/category in uplink_items)
+		for(var/item in uplink_items[category])
+			var/datum/uplink_item/UI = uplink_items[category][item]
+			var/path = UI.refund_path || UI.item
+			var/cost = UI.refund_amount || UI.cost
+			if(I.type == path && UI.refundable && I.check_uplink_validity())
+				telecrystals += cost
+				purchase_log.total_spent -= cost
+				to_chat(user, "<span class='notice'>[I] refunded.</span>")
+				qdel(I)
+				return
+
+/datum/component/uplink/proc/interact(mob/user)
+	if(locked)
+		return
+	active = TRUE
+	if(user)
+		ui_interact(user)
+	// an unlocked uplink blocks also opening the PDA or headset menu
+	return COMPONENT_NO_INTERACT
+
+/datum/component/uplink/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
+	active = TRUE
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "uplink", name, 450, 750, master_ui, state)
+		ui.set_autoupdate(FALSE) // This UI is only ever opened by one person, and never is updated outside of user input.
+		ui.set_style("syndicate")
+		ui.open()
+
+/datum/component/uplink/ui_data(mob/user)
+	if(!user.mind)
+		return
+	var/list/data = list()
+	data["telecrystals"] = telecrystals
+	data["lockable"] = lockable
+
+	data["categories"] = list()
+	for(var/category in uplink_items)
+		var/list/cat = list(
+			"name" = category,
+			"items" = (category == selected_cat ? list() : null))
+		if(category == selected_cat)
+			for(var/item in uplink_items[category])
+				var/datum/uplink_item/I = uplink_items[category][item]
+				if(I.limited_stock == 0)
+					continue
+				if(I.restricted_roles.len)
+					var/is_inaccessible = 1
+					for(var/R in I.restricted_roles)
+						if(R == user.mind.assigned_role)
+							is_inaccessible = 0
+					if(is_inaccessible)
+						continue
+				cat["items"] += list(list(
+					"name" = I.name,
+					"cost" = I.cost,
+					"desc" = I.desc,
+				))
+		data["categories"] += list(cat)
+	return data
+
+/datum/component/uplink/ui_act(action, params)
+	if(!active)
+		return
+
+	switch(action)
+		if("buy")
+			var/item = params["item"]
+
+			var/list/buyable_items = list()
+			for(var/category in uplink_items)
+				buyable_items += uplink_items[category]
+
+			if(item in buyable_items)
+				var/datum/uplink_item/I = buyable_items[item]
+				MakePurchase(usr, I)
+				. = TRUE
+		if("lock")
+			active = FALSE
+			locked = TRUE
+			telecrystals += hidden_crystals
+			hidden_crystals = 0
+			SStgui.close_uis(src)
+		if("select")
+			selected_cat = params["category"]
+	return TRUE
+
+/datum/component/uplink/proc/MakePurchase(mob/user, datum/uplink_item/U)
+	if(!istype(U))
+		return
+	if (!user || user.incapacitated())
+		return
+
+	if(telecrystals < U.cost || U.limited_stock == 0)
+		return
+	telecrystals -= U.cost
+
+	U.purchase(user, src)
+
+	if(U.limited_stock > 0)
+		U.limited_stock -= 1
+
+	SSblackbox.record_feedback("nested tally", "traitor_uplink_items_bought", 1, list("[initial(U.name)]", "[U.cost]"))
+	return TRUE
+
+// Implant signal responses
+
+/datum/component/uplink/proc/implant_activation()
+	var/obj/item/implant/implant = parent
+	locked = FALSE
+	interact(implant.imp_in)
+
+/datum/component/uplink/proc/implanting(list/arguments)
+	var/mob/user = arguments[2]
+	owner = "[user.key]"
+
+/datum/component/uplink/proc/old_implant(list/arguments, obj/item/implant/new_implant)
+	// It kinda has to be weird like this until implants are components
+	return SEND_SIGNAL(new_implant, COMSIG_IMPLANT_EXISTING_UPLINK, src)
+
+/datum/component/uplink/proc/new_implant(datum/component/uplink/uplink)
+	uplink.telecrystals += telecrystals
+	return COMPONENT_DELETE_NEW_IMPLANT
+
+// PDA signal responses
+
+/datum/component/uplink/proc/new_ringtone(mob/living/user, new_ring_text)
+	var/obj/item/pda/master = parent
+	if(trim(lowertext(new_ring_text)) != trim(lowertext(master.lock_code))) //why is the lock code stored on the pda?
+		return
+	locked = FALSE
+	interact(user)
+	to_chat(user, "The PDA softly beeps.")
+	user << browse(null, "window=pda")
+	master.mode = 0
+	return COMPONENT_STOP_RINGTONE_CHANGE
+
+// Radio signal responses
+
+/datum/component/uplink/proc/new_frequency(list/arguments)
+	var/obj/item/radio/master = parent
+	var/frequency = arguments[1]
+	if(frequency != master.traitor_frequency)
+		return
+	locked = FALSE
+	if(ismob(master.loc))
+		interact(master.loc)
+
+// Pen signal responses
+
+/datum/component/uplink/proc/pen_rotation(degrees, mob/living/carbon/user)
+	var/obj/item/pen/master = parent
+	if(degrees != master.traitor_unlock_degrees)
+		return
+	locked = FALSE
+	master.degrees = 0
+	interact(user)
+	to_chat(user, "<span class='warning'>Your pen makes a clicking noise, before quickly rotating back to 0 degrees!</span>")

code/datums/components/wearertargeting.dm

@@ -1,7 +1,6 @@
 // A dummy parent type used for easily making components that target an item's wearer rather than the item itself.
 
 /datum/component/wearertargeting
-	var/datum/component/mobhook
 	var/list/valid_slots = list()
 	var/list/signals = list()
 	var/datum/callback/callback = CALLBACK(GLOBAL_PROC, .proc/pass)
@@ -10,17 +9,14 @@
 /datum/component/wearertargeting/Initialize()
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/checkMobHook)
+	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
+	RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
 
-/datum/component/wearertargeting/Destroy()
-	QDEL_NULL(mobhook)
-	return ..()
-
-/datum/component/wearertargeting/proc/checkMobHook(mob/user, slot)
-	if ((slot in valid_slots) && istype(user, mobtype))
-		if (mobhook && mobhook.parent != user)
-			QDEL_NULL(mobhook)
-		if (!mobhook)
-			mobhook = user.AddComponent(/datum/component/redirect, signals, callback)
+/datum/component/wearertargeting/proc/on_equip(mob/equipper, slot)
+	if((slot in valid_slots) && istype(equipper, mobtype))
+		RegisterSignal(equipper, signals, callback, TRUE)
 	else
-		QDEL_NULL(mobhook)
+		UnregisterSignal(equipper, signals)
+
+/datum/component/wearertargeting/proc/on_drop(mob/user)
+	UnregisterSignal(user, signals)

code/datums/components/wet_floor.dm

@@ -26,8 +26,8 @@
 	if(!isopenturf(parent))
 		return COMPONENT_INCOMPATIBLE
 	add_wet(strength, duration_minimum, duration_add, duration_maximum)
-	RegisterSignal(COMSIG_TURF_IS_WET, .proc/is_wet)
-	RegisterSignal(COMSIG_TURF_MAKE_DRY, .proc/dry)
+	RegisterSignal(parent, COMSIG_TURF_IS_WET, .proc/is_wet)
+	RegisterSignal(parent, COMSIG_TURF_MAKE_DRY, .proc/dry)
 	permanent = _permanent
 	if(!permanent)
 		START_PROCESSING(SSwet_floors, src)

code/datums/datum.dm

@@ -2,6 +2,7 @@
 	var/gc_destroyed //Time when this object was destroyed.
 	var/list/active_timers  //for SStimer
 	var/list/datum_components //for /datum/components
+	var/list/comp_lookup //for /datum/components
 	var/datum_flags = NONE
 	var/datum/weakref/weak_reference
 
@@ -41,6 +42,19 @@
 			qdel(C, FALSE, TRUE)
 		dc.Cut()
 
+	var/list/lookup = comp_lookup
+	if(lookup)
+		for(var/sig in lookup)
+			var/list/comps = lookup[sig]
+			if(length(comps))
+				for(var/i in comps)
+					var/datum/component/comp = i
+					comp.UnregisterSignal(src, sig)
+			else
+				var/datum/component/comp = comps
+				comp.UnregisterSignal(src, sig)
+		comp_lookup = lookup = null
+
 	return QDEL_HINT_QUEUE
 
 #ifdef DATUMVAR_DEBUGGING_MODE

code/datums/datumvars.dm

@@ -96,7 +96,7 @@
 		else
 			atomsnowflake += "<a href='?_src_=vars;[HrefToken()];datumedit=[refid];varnameedit=name'><b>[D]</b></a>"
 			if(A.dir)
-				atomsnowflake += "<br><font size='1'><a href='?_src_=vars;[HrefToken()];rotatedatum=[refid];rotatedir=left'><<</a> <a href='?_src_=vars;[HrefToken()];datumedit=[refid];varnameedit=dir'>[dir2text(A.dir)]</a> <a href='?_src_=vars;rotatedatum=[refid];rotatedir=right'>>></a></font>"
+				atomsnowflake += "<br><font size='1'><a href='?_src_=vars;[HrefToken()];rotatedatum=[refid];rotatedir=left'><<</a> <a href='?_src_=vars;[HrefToken()];datumedit=[refid];varnameedit=dir'>[dir2text(A.dir)]</a> <a href='?_src_=vars;[HrefToken()];rotatedatum=[refid];rotatedir=right'>>></a></font>"
 	else
 		atomsnowflake += "<b>[D]</b>"
 

code/datums/diseases/_disease.dm

@@ -32,6 +32,7 @@
 	var/list/strain_data = list() //dna_spread special bullshit
 	var/list/infectable_biotypes = list(MOB_ORGANIC) //if the disease can spread on organics, synthetics, or undead
 	var/process_dead = FALSE //if this ticks while the host is dead
+	var/copy_type = null //if this is null, copies will use the type of the instance being copied
 
 /datum/disease/Destroy()
 	. = ..()
@@ -41,10 +42,8 @@
 
 //add this disease if the host does not already have too many
 /datum/disease/proc/try_infect(var/mob/living/infectee, make_copy = TRUE)
-	if(infectee.diseases.len < DISEASE_LIMIT)
-		infect(infectee, make_copy)
-		return TRUE
-	return FALSE
+	infect(infectee, make_copy)
+	return TRUE
 
 //add the disease with no checks
 /datum/disease/proc/infect(var/mob/living/infectee, make_copy = TRUE)
@@ -141,7 +140,7 @@
 									"bypasses_immunity", "permeability_mod", "severity", "required_organs", "needs_all_cures", "strain_data",
 									"infectable_biotypes", "process_dead")
 
-	var/datum/disease/D = new type()
+	var/datum/disease/D = copy_type ? new copy_type() : new type()
 	for(var/V in copy_vars)
 		var/val = vars[V]
 		if(islist(val))

code/datums/diseases/advance/advance.dm

@@ -56,22 +56,20 @@
 	return ..()
 
 /datum/disease/advance/try_infect(var/mob/living/infectee, make_copy = TRUE)
-	var/replace_num = infectee.diseases.len + 1 - DISEASE_LIMIT
+	//see if we are more transmittable than enough diseases to replace them
+	//diseases replaced in this way do not confer immunity
+	var/list/advance_diseases = list()
+	for(var/datum/disease/advance/P in infectee.diseases)
+		advance_diseases += P
+	var/replace_num = advance_diseases.len + 1 - DISEASE_LIMIT //amount of diseases that need to be removed to fit this one
 	if(replace_num > 0)
-		//see if we are more transmittable than enough diseases to replace them
-		//diseases replaced in this way do not confer immunity
-		var/list/L = list()
-		for(var/datum/disease/advance/P in infectee.diseases)
-			L += P
-		sortTim(L, /proc/cmp_advdisease_resistance_asc)
-		var/datum/disease/advance/competition = L[replace_num]
-		if(totalTransmittable() > competition.totalResistance())
-			for(var/i in 1 to replace_num)
-				var/datum/disease/advance/A = L[replace_num]
-				A.cure(FALSE)
-		else
-			//we are not strong enough to bully our way in
-			return FALSE
+		sortTim(advance_diseases, /proc/cmp_advdisease_resistance_asc)
+		for(var/i in 1 to replace_num)
+			var/datum/disease/advance/competition = advance_diseases[i]
+			if(totalTransmittable() > competition.totalResistance())
+				competition.cure(FALSE)
+			else
+				return FALSE //we are not strong enough to bully our way in
 	infect(infectee, make_copy)
 	return TRUE
 

code/datums/diseases/advance/presets.dm

@@ -1,52 +1,42 @@
 // Cold
+/datum/disease/advance/cold
+	copy_type = /datum/disease/advance
 
 /datum/disease/advance/cold/New()
 	name = "Cold"
 	symptoms = list(new/datum/symptom/sneeze)
 	..()
 
-
 // Flu
+/datum/disease/advance/flu
+	copy_type = /datum/disease/advance
 
 /datum/disease/advance/flu/New()
 	name = "Flu"
 	symptoms = list(new/datum/symptom/cough)
 	..()
 
+//Randomly generated Disease, for virus crates and events
+/datum/disease/advance/random
+	name = "Experimental Disease"
+	copy_type = /datum/disease/advance
 
-// Voice Changing
+/datum/disease/advance/random/New(max_symptoms, max_level = 8)
+	if(!max_symptoms)
+		max_symptoms = rand(1, VIRUS_SYMPTOM_LIMIT)
+	var/list/datum/symptom/possible_symptoms = list()
+	for(var/symptom in subtypesof(/datum/symptom))
+		var/datum/symptom/S = symptom
+		if(initial(S.level) > max_level)
+			continue
+		if(initial(S.level) <= 0) //unobtainable symptoms
+			continue
+		possible_symptoms += S
+	for(var/i in 1 to max_symptoms)
+		var/datum/symptom/chosen_symptom = pick_n_take(possible_symptoms)
+		if(chosen_symptom)
+			var/datum/symptom/S = new chosen_symptom
+			symptoms += S
+	Refresh()
 
-/datum/disease/advance/voice_change/New()
-	name = "Epiglottis Mutation"
-	symptoms = list(new/datum/symptom/voice_change)
-	..()
-
-
-// Toxin Filter
-
-/datum/disease/advance/heal/New()
-	name = "Liver Enhancer"
-	symptoms = list(new/datum/symptom/heal)
-	..()
-
-
-// Hallucigen
-
-/datum/disease/advance/hallucigen/New()
-	name = "Second Sight"
-	symptoms = list(new/datum/symptom/hallucigen)
-	..()
-
-// Sensory Restoration
-
-/datum/disease/advance/mind_restoration/New()
-	name = "Intelligence Booster"
-	symptoms = list(new/datum/symptom/mind_restoration)
-	..()
-
-// Sensory Destruction
-
-/datum/disease/advance/narcolepsy/New()
-	name = "Experimental Insomnia Cure"
-	symptoms = list(new/datum/symptom/narcolepsy)
-	..()
+	name = "Sample #[rand(1,10000)]"

code/datums/diseases/advance/symptoms/confusion.dm

@@ -6,7 +6,7 @@ Confusion
 	Little bit hidden.
 	Lowers resistance.
 	Decreases stage speed.
-	Not very transmittable.
+	Not very transmissibile.
 	Intense Level.
 
 Bonus

code/datums/diseases/advance/symptoms/cough.dm

@@ -6,7 +6,7 @@ Coughing
 	Noticable.
 	Little Resistance.
 	Doesn't increase stage speed much.
-	Transmittable.
+	Transmissibile.
 	Low Level.
 
 BONUS

code/datums/diseases/advance/symptoms/hallucigen.dm

@@ -50,7 +50,7 @@ Bonus
 		if(1, 2)
 			if(prob(base_message_chance))
 				if(!fake_healthy)
-					to_chat(M, "<span class='notice'>[pick("Something appears in your peripheral vision, then winks out.", "You hear a faint whispher with no source.", "Your head aches.")]</span>")
+					to_chat(M, "<span class='notice'>[pick("Something appears in your peripheral vision, then winks out.", "You hear a faint whisper with no source.", "Your head aches.")]</span>")
 				else
 					to_chat(M, "<span class='notice'>[pick(healthy_messages)]</span>")
 		if(3, 4)

code/datums/diseases/advance/symptoms/itching.dm

@@ -6,7 +6,7 @@ Itching
 	Not noticable or unnoticable.
 	Resistant.
 	Increases stage speed.
-	Little transmittable.
+	Little transmissibility.
 	Low Level.
 
 BONUS

code/datums/diseases/advance/symptoms/shedding.dm

@@ -33,7 +33,7 @@ BONUS
 
 	var/mob/living/M = A.affected_mob
 	if(prob(base_message_chance))
-		to_chat(M, "<span class='warning'>[pick("Your scalp itches.", "Your skin feels flakey.")]</span>")
+		to_chat(M, "<span class='warning'>[pick("Your scalp itches.", "Your skin feels flaky.")]</span>")
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		switch(A.stage)

code/datums/diseases/advance/symptoms/sneeze.dm

@@ -6,7 +6,7 @@ Sneezing
 	Very Noticable.
 	Increases resistance.
 	Doesn't increase stage speed.
-	Very transmittable.
+	Very transmissible.
 	Low Level.
 
 Bonus

code/datums/diseases/advance/symptoms/vomit.dm

@@ -6,7 +6,7 @@ Vomiting
 	Very Very Noticable.
 	Decreases resistance.
 	Doesn't increase stage speed.
-	Little transmittable.
+	Little transmissibility.
 	Medium Level.
 
 Bonus

code/datums/diseases/parrotpossession.dm

@@ -9,7 +9,7 @@
 	cure_chance = 20
 	agent = "Avian Vengence"
 	viable_mobtypes = list(/mob/living/carbon/human)
-	desc = "Subject is possesed by the vengeful spirit of a parrot. Call the priest."
+	desc = "Subject is possessed by the vengeful spirit of a parrot. Call the priest."
 	severity = DISEASE_SEVERITY_MEDIUM
 	infectable_biotypes = list(MOB_ORGANIC, MOB_UNDEAD, MOB_INORGANIC, MOB_ROBOTIC)
 	bypasses_immunity = TRUE //2spook

code/datums/diseases/transformation.dm

@@ -50,7 +50,10 @@
 		if(stage5)
 			to_chat(affected_mob, pick(stage5))
 		if(jobban_isbanned(affected_mob, new_form))
-			affected_mob.death(1)
+			if(!QDELETED(affected_mob))
+				affected_mob.death(1)
+			return
+		if(QDELETED(affected_mob))
 			return
 		if(affected_mob.notransform)
 			return

code/datums/diseases/tuberculosis.dm

@@ -8,7 +8,7 @@
 	agent = "Fungal Tubercle bacillus Cosmosis"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	cure_chance = 5//like hell are you getting out of hell
-	desc = "A rare highly transmittable virulent virus. Few samples exist, rumoured to be carefully grown and cultured by clandestine bio-weapon specialists. Causes fever, blood vomiting, lung damage, weight loss, and fatigue."
+	desc = "A rare highly transmissible virulent virus. Few samples exist, rumoured to be carefully grown and cultured by clandestine bio-weapon specialists. Causes fever, blood vomiting, lung damage, weight loss, and fatigue."
 	required_organs = list(/obj/item/organ/lungs)
 	severity = DISEASE_SEVERITY_BIOHAZARD
 	bypasses_immunity = TRUE // TB primarily impacts the lungs; it's also bacterial or fungal in nature; viral immunity should do nothing.

code/datums/explosion.dm

@@ -358,7 +358,7 @@ GLOBAL_LIST_EMPTY(explosions)
 			heavy = 5
 			light = 7
 		if("Custom Bomb")
-			dev = input("Devestation range (Tiles):") as num
+			dev = input("Devastation range (Tiles):") as num
 			heavy = input("Heavy impact range (Tiles):") as num
 			light = input("Light impact range (Tiles):") as num
 

code/datums/holocall.dm

@@ -178,7 +178,7 @@
 		if(!connected_holopad)
 			. = world.time < (call_start_time + HOLOPAD_MAX_DIAL_TIME)
 			if(!.)
-				calling_holopad.say("No answer recieved.")
+				calling_holopad.say("No answer received.")
 				calling_holopad.temp = ""
 
 	if(!.)

code/datums/mind.dm

@@ -41,14 +41,10 @@
 	var/special_role
 	var/list/restricted_roles = list()
 
-	var/datum/job/assigned_job
-
 	var/list/datum/objective/objectives = list()
 
 	var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
 
-	var/datum/faction/faction 			//associated faction
-	var/datum/changeling/changeling		//changeling holder
 	var/linglink
 	var/datum/martial_art/martial_art
 	var/static/default_martial_art = new/datum/martial_art
@@ -362,7 +358,7 @@
 
 	if(creator.mind.special_role)
 		message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.")
-		to_chat(current, "<span class='userdanger'>Despite your creators current allegiances, your true master remains [creator.real_name]. If their loyalities change, so do yours. This will never change unless your creator's body is destroyed.</span>")
+		to_chat(current, "<span class='userdanger'>Despite your creators current allegiances, your true master remains [creator.real_name]. If their loyalties change, so do yours. This will never change unless your creator's body is destroyed.</span>")
 
 /datum/mind/proc/show_memory(mob/recipient, window=1)
 	if(!recipient)
@@ -686,7 +682,7 @@
 	if(!(has_antag_datum(/datum/antagonist/traitor)))
 		add_antag_datum(/datum/antagonist/traitor)
 
-/datum/mind/proc/make_Changling()
+/datum/mind/proc/make_Changeling()
 	var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling)
 	if(!C)
 		C = add_antag_datum(/datum/antagonist/changeling)
@@ -705,7 +701,7 @@
 		SSticker.mode.add_cultist(src,FALSE,equip=TRUE)
 		special_role = ROLE_CULTIST
 		to_chat(current, "<font color=\"purple\"><b><i>You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy your world is, you see that it should be open to the knowledge of Nar-Sie.</b></i></font>")
-		to_chat(current, "<font color=\"purple\"><b><i>Assist your new bretheren in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.</b></i></font>")
+		to_chat(current, "<font color=\"purple\"><b><i>Assist your new brethren in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.</b></i></font>")
 
 /datum/mind/proc/make_Rev()
 	var/datum/antagonist/rev/head/head = new()

code/datums/mutations/body.dm

@@ -11,7 +11,7 @@
 		owner.visible_message("<span class='danger'>[owner] starts having a seizure!</span>", "<span class='userdanger'>You have a seizure!</span>")
 		owner.Unconscious(200)
 		owner.Jitter(1000)
-		owner.SendSignal(COMSIG_ADD_MOOD_EVENT, "epilepsy", /datum/mood_event/epilepsy)
+		SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "epilepsy", /datum/mood_event/epilepsy)
 		addtimer(CALLBACK(src, .proc/jitter_less, owner), 90)
 
 /datum/mutation/human/epilepsy/proc/jitter_less(mob/living/carbon/human/owner)
@@ -96,7 +96,7 @@
 
 //Tourettes causes you to randomly stand in place and shout.
 /datum/mutation/human/tourettes
-	name = "Tourettes Syndrome"
+	name = "Tourette's Syndrome"
 	quality = NEGATIVE
 	text_gain_indication = "<span class='danger'>You twitch.</span>"
 

code/datums/mutations/hulk.dm

@@ -14,7 +14,7 @@
 	owner.add_trait(TRAIT_STUNIMMUNE, TRAIT_HULK)
 	owner.add_trait(TRAIT_PUSHIMMUNE, TRAIT_HULK)
 	owner.update_body_parts()
-	owner.SendSignal(COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
+	SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
 
 /datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
 	if(proximity) //no telekinetic hulk attack
@@ -31,7 +31,7 @@
 	owner.remove_trait(TRAIT_STUNIMMUNE, TRAIT_HULK)
 	owner.remove_trait(TRAIT_PUSHIMMUNE, TRAIT_HULK)
 	owner.update_body_parts()
-	owner.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "hulk")
+	SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk")
 
 /datum/mutation/human/hulk/say_mod(message)
 	if(message)

code/datums/mutations/sight.dm

@@ -32,7 +32,7 @@
 	owner.cure_blind(GENETIC_MUTATION)
 
 
-//X-Ray Vision lets you see through walls.
+//X-ray Vision lets you see through walls.
 /datum/mutation/human/x_ray
 	name = "X Ray Vision"
 	quality = POSITIVE

code/datums/outfit.dm

@@ -28,11 +28,11 @@
 	var/list/chameleon_extras //extra types for chameleon outfit changes, mostly guns
 
 /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	//to be overriden for customization depending on client prefs,species etc
+	//to be overridden for customization depending on client prefs,species etc
 	return
 
 /datum/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	//to be overriden for toggling internals, id binding, access etc
+	//to be overridden for toggling internals, id binding, access etc
 	return
 
 /datum/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE)

code/datums/shuttles.dm

@@ -34,6 +34,16 @@
 		if(length(place.baseturfs) < 2) // Some snowflake shuttle shit
 			continue
 		place.baseturfs.Insert(3, /turf/baseturf_skipover/shuttle)
+		
+		for(var/obj/structure/closet/closet in place)
+			if(closet.anchorable)
+				closet.anchored = TRUE
+
+		for(var/obj/structure/table/table in place)
+			table.AddComponent(/datum/component/magnetic_catch)
+
+		for(var/obj/structure/rack/rack in place)
+			rack.AddComponent(/datum/component/magnetic_catch)
 
 //Whatever special stuff you want
 /datum/map_template/shuttle/proc/on_bought()
@@ -94,6 +104,10 @@
 	port_id = "ruin"
 	can_be_bought = FALSE
 
+/datum/map_template/shuttle/snowdin
+	port_id = "snowdin"
+	can_be_bought = FALSE
+
 // Shuttles start here:
 
 /datum/map_template/shuttle/emergency/airless
@@ -152,7 +166,7 @@
 	suffix = "discoinferno"
 	name = "Disco Inferno"
 	description = "The glorious results of centuries of plasma research done by Nanotrasen employees. This is the reason why you are here. Get on and dance like you're on fire, burn baby burn!"
-	admin_notes = "Flaming hot."
+	admin_notes = "Flaming hot. The main area has a dance machine as well as plasma floor tiles that will be ignited by players every single time."
 	credit_cost = 10000
 
 /datum/map_template/shuttle/emergency/arena
@@ -197,7 +211,7 @@
 	Probably best if you don't rifle around in whatever equipment they were transporting. I hope you're friendly with your coworkers, because there is very little space in this thing.\n\
 	\n\
 	Contains contraband armory guns, maintenance loot, and abandoned crates!"
-	admin_notes = "Due to origin as a solo piloted secure vessel, has an active GPS onboard labeled STV5."
+	admin_notes = "Due to origin as a solo piloted secure vessel, has an active GPS onboard labeled STV5. Has roughly as much space as Hi Daniel, except with explosive crates."
 
 /datum/map_template/shuttle/emergency/meta
 	suffix = "meta"
@@ -236,7 +250,9 @@
 	suffix = "cere"
 	name = "Cere Station Emergency Shuttle"
 	description = "The large, beefed-up version of the box-standard shuttle. Includes an expanded brig, fully stocked medbay, enhanced cargo storage with mech chargers, \
-		an engine room stocked with various supplies, and a crew capacity of 80+ to top it all off. Live large, live Cere."
+	an engine room stocked with various supplies, and a crew capacity of 80+ to top it all off. Live large, live Cere."
+	admin_notes = "Seriously big, even larger than the Delta shuttle."
+	credit_cost = 10000
 
 /datum/map_template/shuttle/emergency/supermatter
 	suffix = "supermatter"
@@ -256,6 +272,7 @@
 	name = "Oh, Hi Daniel"
 	description = "How was space work today? Oh, pretty good. We got a new space station and the company will make a lot of money. What space station? I cannot tell you; it's space confidential. \
 	Aw, come space on. Why not? No, I can't. Anyway, how is your space roleplay life?"
+	admin_notes = "Tiny, with a single airlock and wooden walls. What could go wrong?"
 	credit_cost = -5000
 
 /datum/map_template/shuttle/emergency/goon
@@ -346,7 +363,7 @@
 	suffix = "raven"
 	name = "CentCom Raven Battlecruiser"
 	description = "The CentCom Raven Battlecruiser is currently docked at the CentCom ship bay awaiting a mission, this Battlecruiser has been reassigned as an emergency escape shuttle for currently unknown reasons. The CentCom Raven Battlecruiser should comfortably fit a medium to large crew size crew and is complete with all required facitlities including a top of the range CentCom Medical Bay."
-	admin_notes = "The long way home"
+	admin_notes = "Comes with turrets that will target any simplemob."
 	credit_cost = 12500
 
 /datum/map_template/shuttle/arrival/box
@@ -432,3 +449,11 @@
 /datum/map_template/shuttle/ruin/syndicate_fighter
 	suffix = "syndicate_fighter"
 	name = "Syndicate Fighter"
+
+/datum/map_template/shuttle/snowdin/mining
+	suffix = "mining"
+	name = "Snowdin Mining Elevator"
+
+/datum/map_template/shuttle/snowdin/excavation
+	suffix = "excavation"
+	name = "Snowdin Excavation Elevator"

code/datums/status_effects/gas.dm

@@ -5,6 +5,7 @@
 	alert_type = /obj/screen/alert/status_effect/freon
 	var/icon/cube
 	var/can_melt = TRUE
+	var/datum/weakref/redirect_component
 
 /obj/screen/alert/status_effect/freon
 	name = "Frozen Solid"
@@ -12,6 +13,7 @@
 	icon_state = "frozen"
 
 /datum/status_effect/freon/on_apply()
+	redirect_component = WEAKREF(owner.AddComponent(/datum/component/redirect, list(COMSIG_LIVING_RESIST), CALLBACK(src, .proc/owner_resist)))
 	if(!owner.stat)
 		to_chat(owner, "<span class='userdanger'>You become frozen in a cube!</span>")
 	cube = icon('icons/effects/freeze.dmi', "ice_cube")
@@ -24,12 +26,22 @@
 	if(can_melt && owner.bodytemperature >= BODYTEMP_NORMAL)
 		qdel(src)
 
+/datum/status_effect/freon/proc/owner_resist()
+	to_chat(owner, "You start breaking out of the ice cube!")
+	if(do_mob(owner, owner, 40))
+		if(!QDELETED(src))
+			to_chat(owner, "You break out of the ice cube!")
+			owner.remove_status_effect(/datum/status_effect/freon)
+			owner.update_canmove()
+
 /datum/status_effect/freon/on_remove()
 	if(!owner.stat)
 		to_chat(owner, "The cube melts!")
 	owner.cut_overlay(cube)
 	owner.adjust_bodytemperature(100)
 	owner.update_canmove()
+	qdel(redirect_component.resolve())
+	redirect_component = null
 
 /datum/status_effect/freon/watcher
 	duration = 8

code/datums/status_effects/neutral.dm

@@ -47,3 +47,25 @@
 /datum/status_effect/syphon_mark/on_remove()
 	get_kill()
 	. = ..()
+
+/obj/screen/alert/status_effect/in_love
+	name = "In Love"
+	desc = "You feel so wonderfully in love!"
+	icon_state = "in_love"
+
+/datum/status_effect/in_love
+	id = "in_love"
+	duration = -1
+	status_type = STATUS_EFFECT_UNIQUE
+	alert_type = /obj/screen/alert/status_effect/in_love
+	var/mob/living/date
+
+/datum/status_effect/in_love/on_creation(mob/living/new_owner, mob/living/love_interest)
+	. = ..()
+	if(.)
+		date = love_interest
+	linked_alert.desc = "You're in love with [date.real_name]! How lovely."
+
+/datum/status_effect/in_love/tick()
+	if(date)
+		new /obj/effect/temp_visual/love_heart/invisible(get_turf(date.loc), owner)

code/datums/traits/negative.dm

@@ -71,7 +71,7 @@
 /datum/quirk/family_heirloom/post_add()
 	if(where == "in your backpack")
 		var/mob/living/carbon/human/H = quirk_holder
-		H.back.SendSignal(COMSIG_TRY_STORAGE_SHOW, H)
+		SEND_SIGNAL(H.back, COMSIG_TRY_STORAGE_SHOW, H)
 
 	to_chat(quirk_holder, "<span class='boldnotice'>There is a precious family [heirloom.name] [where], passed down from generation to generation. Keep it safe!</span>")
 	var/list/family_name = splittext(quirk_holder.real_name, " ")
@@ -79,11 +79,11 @@
 
 /datum/quirk/family_heirloom/on_process()
 	if(heirloom in quirk_holder.GetAllContents())
-		quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing")
-		quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom", /datum/mood_event/family_heirloom)
+		SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing")
+		SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "family_heirloom", /datum/mood_event/family_heirloom)
 	else
-		quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom")
-		quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom_missing", /datum/mood_event/family_heirloom_missing)
+		SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "family_heirloom")
+		SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "family_heirloom_missing", /datum/mood_event/family_heirloom_missing)
 
 /datum/quirk/family_heirloom/clone_data()
 	return heirloom
@@ -148,9 +148,9 @@
 		if(quirk_holder.m_intent == MOVE_INTENT_RUN)
 			to_chat(quirk_holder, "<span class='warning'>Easy, easy, take it slow... you're in the dark...</span>")
 			quirk_holder.toggle_move_intent()
-		quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "nyctophobia", /datum/mood_event/nyctophobia)
+		SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "nyctophobia", /datum/mood_event/nyctophobia)
 	else
-		quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "nyctophobia")
+		SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "nyctophobia")
 
 
 

code/datums/weather/weather.dm

@@ -17,7 +17,7 @@
 	var/weather_overlay
 	var/weather_color = null
 
-	var/end_message = "<span class='danger'>The wind relents its assault.</span>" //Displayed once the wather is over
+	var/end_message = "<span class='danger'>The wind relents its assault.</span>" //Displayed once the weather is over
 	var/end_duration = 300 //In deciseconds, how long the "wind-down" graphic will appear before vanishing entirely
 	var/end_sound
 	var/end_overlay