Merge branch 'master' into upstream-merge-37529

code/datums/components/_component.dm

@@ -101,7 +101,10 @@
 /datum/component/proc/InheritComponent(datum/component/C, i_am_original)
 	return
 
-/datum/component/proc/OnTransfer(datum/new_parent)
+/datum/component/proc/PreTransfer()
+	return
+
+/datum/component/proc/PostTransfer()
 	return
 
 /datum/component/proc/_GetInverseTypeList(our_type = type)
@@ -225,23 +228,26 @@
 	if(!.)
 		return AddComponent(arglist(args))
 
-/datum/proc/TakeComponent(datum/component/C)
-	if(!C)
+/datum/component/proc/RemoveComponent()
+	if(!parent)
 		return
-	var/datum/helicopter = C.parent
-	if(helicopter == src)
-		//if we're taking to the same thing no need for anything
+	var/datum/old_parent = parent
+	PreTransfer()
+	_RemoveFromParent()
+	old_parent.SendSignal(COMSIG_COMPONENT_REMOVING, src)
+
+/datum/proc/TakeComponent(datum/component/target)
+	if(!target)
 		return
-	if(C.OnTransfer(src) == COMPONENT_INCOMPATIBLE)
-		var/c_type = C.type
-		qdel(C)
+	if(target.parent)
+		target.RemoveComponent()
+	target.parent = src
+	if(target.PostTransfer() == COMPONENT_INCOMPATIBLE)
+		var/c_type = target.type
+		qdel(target)
 		CRASH("Incompatible [c_type] transfer attempt to a [type]!")
-		return
-	C._RemoveFromParent()
-	helicopter.SendSignal(COMSIG_COMPONENT_REMOVING, C)
-	C.parent = src
-	if(C == AddComponent(C))
-		C._JoinParent()
+	if(target == AddComponent(target))
+		target._JoinParent()
 
 /datum/proc/TransferComponents(datum/target)
 	var/list/dc = datum_components

code/datums/components/armor_plate.dm

@@ -0,0 +1,78 @@
+/datum/component/armor_plate
+	var/amount = 0
+	var/maxamount = 3
+	var/upgrade_item = /obj/item/stack/sheet/animalhide/goliath_hide
+	var/datum/armor/added_armor = list("melee" = 10)
+	var/upgrade_name
+
+/datum/component/armor_plate/Initialize(_maxamount,obj/item/_upgrade_item,datum/armor/_added_armor)
+	if(!isobj(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
+	RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/applyplate)
+	RegisterSignal(COMSIG_PARENT_PREQDELETED, .proc/dropplates)
+
+	if(_maxamount)
+		maxamount = _maxamount
+	if(_upgrade_item)
+		upgrade_item = _upgrade_item
+	if(_added_armor)
+		if(islist(_added_armor))
+			added_armor = getArmor(arglist(_added_armor))
+		else if (istype(_added_armor, /datum/armor))
+			added_armor = _added_armor
+		else
+			stack_trace("Invalid type [_added_armor.type] passed as _armor_item argument to armorplate component")
+	else
+		added_armor = getArmor(arglist(added_armor))
+	var/obj/item/typecast = upgrade_item
+	upgrade_name = initial(typecast.name)
+
+/datum/component/armor_plate/proc/examine(mob/user)
+	//upgrade_item could also be typecast here instead
+	if(ismecha(parent))
+		if(amount)
+			if(amount < maxamount)
+				to_chat(user, "<span class='notice'>Its armor is enhanced with [amount] [upgrade_name].</span>")
+			else
+				to_chat(user, "<span class='notice'>It's wearing a fearsome carapace entirely composed of [upgrade_name] - its pilot must be an experienced monster hunter.</span>")
+		else
+			to_chat(user, "<span class='notice'>It has attachment points for strapping monster hide on for added protection.</span>")
+	else
+		if(amount)
+			to_chat(user, "<span class='notice'>It has been strengthened with [amount]/[maxamount] [upgrade_name].</span>")
+		else
+			to_chat(user, "<span class='notice'>It can be strengthened with up to [maxamount] [upgrade_name].</span>")
+
+/datum/component/armor_plate/proc/applyplate(obj/item/I, mob/user, params)
+	if(!istype(I,upgrade_item))
+		return
+	if(amount >= maxamount)
+		to_chat(user, "<span class='warning'>You can't improve [parent] any further!</span>")
+		return
+
+	if(istype(I,/obj/item/stack))
+		I.use(1)
+	else
+		if(length(I.contents))
+			to_chat(user, "<span class='warning'>[I] cannot be used for armoring while there's something inside!</span>")
+			return
+		qdel(I)
+
+	var/obj/O = parent
+	amount++
+	O.armor = O.armor.attachArmor(added_armor)
+
+	if(ismecha(O))
+		var/obj/mecha/R = O
+		R.update_icon()
+		to_chat(user, "<span class='info'>You strengthen [R], improving its resistance against melee, bullet and laser damage.</span>")
+	else
+		to_chat(user, "<span class='info'>You strengthen [O], improving its resistance against melee attacks.</span>")
+
+
+/datum/component/armor_plate/proc/dropplates(force)
+	if(ismecha(parent)) //items didn't drop the plates before and it causes erroneous behavior for the time being with collapsible helmets
+		for(var/i in 1 to amount)
+			new upgrade_item(get_turf(parent))

code/datums/components/chasm.dm

@@ -70,8 +70,8 @@
 			return FALSE
 	if(ishuman(AM))
 		var/mob/living/carbon/human/H = AM
-		if(istype(H.belt, /obj/item/device/wormhole_jaunter))
-			var/obj/item/device/wormhole_jaunter/J = H.belt
+		if(istype(H.belt, /obj/item/wormhole_jaunter))
+			var/obj/item/wormhole_jaunter/J = H.belt
 			//To freak out any bystanders
 			H.visible_message("<span class='boldwarning'>[H] falls into [parent]!</span>")
 			J.chasm_react(H)

code/datums/components/decal.dm

@@ -23,10 +23,12 @@
 	remove()
 	return ..()
 
-/datum/component/decal/OnTransfer(atom/thing)
+/datum/component/decal/PreTransfer()
 	remove()
-	remove(thing)
-	apply(thing)
+
+/datum/component/decal/PostTransfer()
+	remove()
+	apply()
 
 /datum/component/decal/proc/generate_appearance(_icon, _icon_state, _dir, _layer, _color)
 	if(!_icon || !_icon_state)

code/datums/components/lockon_aiming.dm

@@ -238,5 +238,5 @@
 		cd++
 		CHECK_TICK
 
-/datum/component/lockon_aiming/OnTransfer(datum/new_parent)
-	CRASH("Warning: Lockon aiming component transfer attempted, but transfer behavior is not implemented!")
+/datum/component/lockon_aiming/PostTransfer(datum/new_parent)
+	return COMPONENT_INCOMPATIBLE

code/datums/components/material_container.dm

@@ -15,16 +15,18 @@
 	var/sheet_type
 	var/list/materials
 	var/show_on_examine
+	var/disable_attackby
 	var/list/allowed_typecache
 	var/last_inserted_id
 	var/precise_insertion = FALSE
 	var/datum/callback/precondition
 	var/datum/callback/after_insert
 
-/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition, datum/callback/_after_insert)
+/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition, datum/callback/_after_insert, _disable_attackby)
 	materials = list()
 	max_amount = max(0, max_amt)
 	show_on_examine = _show_on_examine
+	disable_attackby = _disable_attackby
 	if(allowed_types)
 		allowed_typecache = typecacheof(allowed_types)
 	precondition = _precondition
@@ -43,14 +45,17 @@
 			materials[id] = new mat_path()
 
 /datum/component/material_container/proc/OnExamine(mob/user)
-	for(var/I in materials)
-		var/datum/material/M = materials[I]
-		var/amt = amount(M.id)
-		if(amt)
-			to_chat(user, "<span class='notice'>It has [amt] units of [lowertext(M.name)] stored.</span>")
+	if(show_on_examine)
+		for(var/I in materials)
+			var/datum/material/M = materials[I]
+			var/amt = amount(M.id)
+			if(amt)
+				to_chat(user, "<span class='notice'>It has [amt] units of [lowertext(M.name)] stored.</span>")
 
 /datum/component/material_container/proc/OnAttackBy(obj/item/I, mob/living/user)
 	var/list/tc = allowed_typecache
+	if(disable_attackby)
+		return
 	if(user.a_intent != INTENT_HELP)
 		return
 	if((I.flags_2 & HOLOGRAM_2) || (I.item_flags & NO_MAT_REDEMPTION) || (tc && !is_type_in_typecache(I, tc)))

code/datums/components/mirage_border.dm

@@ -27,10 +27,13 @@
 	QDEL_NULL(holder)
 	return ..()
 
-/datum/component/mirage_border/OnTransfer(atom/thing)
-	if(!isturf(thing))
+/datum/component/mirage_border/PreTransfer()
+	holder.moveToNullspace()
+
+/datum/component/mirage_border/PostTransfer()
+	if(!isturf(parent))
 		return COMPONENT_INCOMPATIBLE
-	holder.forceMove(thing)
+	holder.forceMove(parent)
 
 /obj/effect/abstract/mirage_holder
 	name = "Mirage holder"

code/datums/components/ntnet_interface.dm

@@ -2,6 +2,9 @@
 /datum/proc/ntnet_recieve(datum/netdata/data)
 	return
 
+/datum/proc/ntnet_recieve_broadcast(datum/netdata/data)
+	return
+
 /datum/proc/ntnet_send(datum/netdata/data, netid)
 	GET_COMPONENT(NIC, /datum/component/ntnet_interface)
 	if(!NIC)
@@ -9,14 +12,17 @@
 	return NIC.__network_send(data, netid)
 
 /datum/component/ntnet_interface
-	var/hardware_id			//text
+	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.
 
 /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()]"
 	network_name = force_name
-	SSnetworks.register_interface(src)
+	if(!SSnetworks.register_interface(src))
+		. = COMPONENT_INCOMPATIBLE
+		CRASH("Unable to register NTNet interface. Interface deleted.")
 	if(autoconnect_station_network)
 		register_connection(SSnetworks.station_network)
 
@@ -27,7 +33,10 @@
 
 /datum/component/ntnet_interface/proc/__network_recieve(datum/netdata/data)			//Do not directly proccall!
 	parent.SendSignal(COMSIG_COMPONENT_NTNET_RECIEVE, data)
-	parent.ntnet_recieve(data)
+	if(differentiate_broadcast && data.broadcast)
+		parent.ntnet_recieve_broadcast(data)
+	else
+		parent.ntnet_recieve(data)
 
 /datum/component/ntnet_interface/proc/__network_send(datum/netdata/data, netid)			//Do not directly proccall!
 	// Process data before sending it

code/datums/components/signal_redirect.dm

@@ -1,8 +1,13 @@
 /datum/component/redirect
 	dupe_mode = COMPONENT_DUPE_ALLOWED
 
-/datum/component/redirect/Initialize(list/signals, datum/callback/_callback)
+/datum/component/redirect/Initialize(list/signals, datum/callback/_callback, flags=NONE)
 	//It's not our job to verify the right signals are registered here, just do it.
 	if(!LAZYLEN(signals) || !istype(_callback))
 		return COMPONENT_INCOMPATIBLE
+	if(flags & REDIRECT_TRANSFER_WITH_TURF && isturf(parent))
+		RegisterSignal(COMSIG_TURF_CHANGE, .proc/turf_change)
 	RegisterSignal(signals, _callback)
+
+/datum/component/redirect/proc/turf_change(path, new_baseturfs, flags, list/transfers)
+	transfers += src

code/datums/components/spooky.dm

@@ -42,11 +42,11 @@
 		var/T = get_turf(H)
 		if(too_spooky)
 			if(prob(30))
-				new/obj/item/device/instrument/saxophone/spectral(T)
+				new/obj/item/instrument/saxophone/spectral(T)
 			else if(prob(30))
-				new/obj/item/device/instrument/trumpet/spectral(T)
+				new/obj/item/instrument/trumpet/spectral(T)
 			else if(prob(30))
-				new/obj/item/device/instrument/trombone/spectral(T)
+				new/obj/item/instrument/trombone/spectral(T)
 			else
 				to_chat(H, "The spooky gods forgot to ship your instrument. Better luck next unlife.")
 		to_chat(H, "<B>You are the spooky skeleton!</B>")

code/datums/components/stationloving.dm

@@ -28,13 +28,7 @@
 			CRASH("Unable to find a blobstart landmark")
 
 	var/atom/movable/AM = parent
-	if(ismob(AM.loc))
-		var/mob/M = AM.loc
-		M.transferItemToLoc(AM, targetturf, TRUE)	//nodrops disks when?
-	else if(AM.loc.SendSignal(COMSIG_CONTAINS_STORAGE))
-		AM.loc.SendSignal(COMSIG_TRY_STORAGE_TAKE, src, targetturf, TRUE)
-	else
-		AM.forceMove(targetturf)
+	AM.forceMove(targetturf)
 	// move the disc, so ghosts remain orbiting it even if it's "destroyed"
 	return targetturf
 

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

@@ -1,185 +1,198 @@
-
-// External storage-related logic:
-// /mob/proc/ClickOn() in /_onclick/click.dm - clicking items in storages
-// /mob/living/Move() in /modules/mob/living/living.dm - hiding storage boxes on mob movement
-
-/datum/component/storage/concrete
-	var/drop_all_on_deconstruct = TRUE
-	var/drop_all_on_destroy = FALSE
-	var/transfer_contents_on_component_transfer = FALSE
-	var/list/datum/component/storage/slaves = list()
-
-/datum/component/storage/concrete/Initialize()
-	. = ..()
-	RegisterSignal(COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
-	RegisterSignal(COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct)
-
-/datum/component/storage/concrete/Destroy()
-	var/atom/real_location = real_location()
-	for(var/atom/_A in real_location)
-		_A.mouse_opacity = initial(_A.mouse_opacity)
-	if(drop_all_on_destroy)
-		do_quick_empty()
-	for(var/i in slaves)
-		var/datum/component/storage/slave = i
-		slave.change_master(null)
-	return ..()
-
-/datum/component/storage/concrete/master()
-	return src
-
-/datum/component/storage/concrete/real_location()
-	return parent
-
-/datum/component/storage/concrete/OnTransfer(datum/new_parent)
-	if(!isatom(new_parent))
-		return COMPONENT_INCOMPATIBLE
-	var/list/mob/_is_using
-	if(is_using)
-		_is_using = is_using.Copy()
-		close_all()
-	if(transfer_contents_on_component_transfer)
-		var/atom/old = parent
-		for(var/i in old)
-			var/atom/movable/AM = i
-			AM.forceMove(new_parent)
-	if(_is_using)
-		for(var/i in _is_using)
-			var/mob/M = i
-			show_to(M)
-
-/datum/component/storage/concrete/_insert_physical_item(obj/item/I, override = FALSE)
-	. = TRUE
-	var/atom/real_location = real_location()
-	if(I.loc != real_location)
-		I.forceMove(real_location)
-	refresh_mob_views()
-
-/datum/component/storage/concrete/refresh_mob_views()
-	. = ..()
-	for(var/i in slaves)
-		var/datum/component/storage/slave = i
-		slave.refresh_mob_views()
-
-/datum/component/storage/concrete/emp_act(severity)
-	var/atom/real_location = real_location()
-	for(var/i in real_location)
-		var/atom/A = i
-		A.emp_act(severity)
-
-/datum/component/storage/concrete/proc/on_slave_link(datum/component/storage/S)
-	if(S == src)
-		return FALSE
-	slaves += S
-	return TRUE
-
-/datum/component/storage/concrete/proc/on_slave_unlink(datum/component/storage/S)
-	slaves -= S
-	return FALSE
-
-/datum/component/storage/concrete/proc/on_contents_del(atom/A)
-	var/atom/real_location = parent
-	if(A in real_location)
-		usr = null
-		remove_from_storage(A, null)
-
-/datum/component/storage/concrete/proc/on_deconstruct(disassembled)
-	if(drop_all_on_deconstruct)
-		do_quick_empty()
-
-/datum/component/storage/concrete/can_see_contents()
-	. = ..()
-	for(var/i in slaves)
-		var/datum/component/storage/slave = i
-		. |= slave.can_see_contents()
-
-//Resets screen loc and other vars of something being removed from storage.
-/datum/component/storage/concrete/_removal_reset(atom/movable/thing)
-	thing.layer = initial(thing.layer)
-	thing.plane = initial(thing.plane)
-	thing.mouse_opacity = initial(thing.mouse_opacity)
-	if(thing.maptext)
-		thing.maptext = ""
-
-/datum/component/storage/concrete/remove_from_storage(atom/movable/AM, atom/new_location)
-	//Cache this as it should be reusable down the bottom, will not apply if anyone adds a sleep to dropped
-	//or moving objects, things that should never happen
-	var/atom/parent = src.parent
-	var/list/seeing_mobs = can_see_contents()
-	for(var/mob/M in seeing_mobs)
-		M.client.screen -= AM
-	if(ismob(parent.loc) && isitem(AM))
-		var/obj/item/I = AM
-		var/mob/M = parent.loc
-		I.dropped(M)
-	if(new_location)
-		//Reset the items values
-		_removal_reset(AM)
-		AM.forceMove(new_location)
-		//We don't want to call this if the item is being destroyed
-		AM.on_exit_storage(src)
-	else
-		//Being destroyed, just move to nullspace now (so it's not in contents for the icon update)
-		AM.moveToNullspace()
-	refresh_mob_views()
-	if(isobj(parent))
-		var/obj/O = parent
-		O.update_icon()
-	return TRUE
-
-/datum/component/storage/concrete/proc/slave_can_insert_object(datum/component/storage/slave, obj/item/I, stop_messages = FALSE, mob/M)
-	return TRUE
-
-/datum/component/storage/concrete/proc/handle_item_insertion_from_slave(datum/component/storage/slave, obj/item/I, prevent_warning = FALSE, M)
-	. = handle_item_insertion(I, prevent_warning, M, slave)
-	if(. && !prevent_warning)
-		slave.mob_item_insertion_feedback(usr, M, I)
-
-/datum/component/storage/concrete/handle_item_insertion(obj/item/I, prevent_warning = FALSE, mob/M, datum/component/storage/remote)		//Remote is null or the slave datum
-	var/datum/component/storage/concrete/master = master()
-	var/atom/parent = src.parent
-	var/moved = FALSE
-	if(!istype(I))
-		return FALSE
-	if(M)
-		if(!M.temporarilyRemoveItemFromInventory(I))
-			return FALSE
-		else
-			moved = TRUE			//At this point if the proc fails we need to manually move the object back to the turf/mob/whatever.
-	if(I.pulledby)
-		I.pulledby.stop_pulling()
-	if(silent)
-		prevent_warning = TRUE
-	if(!_insert_physical_item(I))
-		if(moved)
-			if(M)
-				if(!M.put_in_active_hand(I))
-					I.forceMove(parent.drop_location())
-			else
-				I.forceMove(parent.drop_location())
-		return FALSE
-	I.on_enter_storage(master)
-	refresh_mob_views()
-	I.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt
-	if(M)
-		if(M.client && M.active_storage != src)
-			M.client.screen -= I
-		if(M.observers && M.observers.len)
-			for(var/i in M.observers)
-				var/mob/dead/observe = i
-				if(observe.client && observe.active_storage != src)
-					observe.client.screen -= I
-		if(!remote)
-			parent.add_fingerprint(M)
-			if(!prevent_warning)
-				mob_item_insertion_feedback(usr, M, I)
-	update_icon()
-	return TRUE
-
-/datum/component/storage/concrete/update_icon()
-	if(isobj(parent))
-		var/obj/O = parent
-		O.update_icon()
-	for(var/i in slaves)
-		var/datum/component/storage/slave = i
-		slave.update_icon()
+
+// External storage-related logic:
+// /mob/proc/ClickOn() in /_onclick/click.dm - clicking items in storages
+// /mob/living/Move() in /modules/mob/living/living.dm - hiding storage boxes on mob movement
+
+/datum/component/storage/concrete
+	var/drop_all_on_deconstruct = TRUE
+	var/drop_all_on_destroy = FALSE
+	var/transfer_contents_on_component_transfer = FALSE
+	var/list/datum/component/storage/slaves = list()
+
+	var/list/_contents_limbo // Where objects go to live mid transfer
+	var/list/_user_limbo // The last users before the component started moving
+
+/datum/component/storage/concrete/Initialize()
+	. = ..()
+	RegisterSignal(COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
+	RegisterSignal(COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct)
+
+/datum/component/storage/concrete/Destroy()
+	var/atom/real_location = real_location()
+	for(var/atom/_A in real_location)
+		_A.mouse_opacity = initial(_A.mouse_opacity)
+	if(drop_all_on_destroy)
+		do_quick_empty()
+	for(var/i in slaves)
+		var/datum/component/storage/slave = i
+		slave.change_master(null)
+	QDEL_LIST(_contents_limbo)
+	_user_limbo = null
+	return ..()
+
+/datum/component/storage/concrete/master()
+	return src
+
+/datum/component/storage/concrete/real_location()
+	return parent
+
+/datum/component/storage/concrete/PreTransfer()
+	if(is_using)
+		_user_limbo = is_using.Copy()
+		close_all()
+	if(transfer_contents_on_component_transfer)
+		_contents_limbo = list()
+		for(var/atom/movable/AM in parent)
+			_contents_limbo += AM
+			AM.moveToNullspace()
+
+/datum/component/storage/concrete/PostTransfer()
+	if(!isatom(parent))
+		return COMPONENT_INCOMPATIBLE
+	if(transfer_contents_on_component_transfer)
+		for(var/i in _contents_limbo)
+			var/atom/movable/AM = i
+			AM.forceMove(parent)
+		_contents_limbo = null
+	if(_user_limbo)
+		for(var/i in _user_limbo)
+			show_to(i)
+		_user_limbo = null
+
+/datum/component/storage/concrete/_insert_physical_item(obj/item/I, override = FALSE)
+	. = TRUE
+	var/atom/real_location = real_location()
+	if(I.loc != real_location)
+		I.forceMove(real_location)
+	refresh_mob_views()
+
+/datum/component/storage/concrete/refresh_mob_views()
+	. = ..()
+	for(var/i in slaves)
+		var/datum/component/storage/slave = i
+		slave.refresh_mob_views()
+
+/datum/component/storage/concrete/emp_act(severity)
+	if(emp_shielded)
+		return
+	var/atom/real_location = real_location()
+	for(var/i in real_location)
+		var/atom/A = i
+		A.emp_act(severity)
+
+/datum/component/storage/concrete/proc/on_slave_link(datum/component/storage/S)
+	if(S == src)
+		return FALSE
+	slaves += S
+	return TRUE
+
+/datum/component/storage/concrete/proc/on_slave_unlink(datum/component/storage/S)
+	slaves -= S
+	return FALSE
+
+/datum/component/storage/concrete/proc/on_contents_del(atom/A)
+	var/atom/real_location = parent
+	if(A in real_location)
+		usr = null
+		remove_from_storage(A, null)
+
+/datum/component/storage/concrete/proc/on_deconstruct(disassembled)
+	if(drop_all_on_deconstruct)
+		do_quick_empty()
+
+/datum/component/storage/concrete/can_see_contents()
+	. = ..()
+	for(var/i in slaves)
+		var/datum/component/storage/slave = i
+		. |= slave.can_see_contents()
+
+//Resets screen loc and other vars of something being removed from storage.
+/datum/component/storage/concrete/_removal_reset(atom/movable/thing)
+	thing.layer = initial(thing.layer)
+	thing.plane = initial(thing.plane)
+	thing.mouse_opacity = initial(thing.mouse_opacity)
+	if(thing.maptext)
+		thing.maptext = ""
+
+/datum/component/storage/concrete/remove_from_storage(atom/movable/AM, atom/new_location)
+	//Cache this as it should be reusable down the bottom, will not apply if anyone adds a sleep to dropped
+	//or moving objects, things that should never happen
+	var/atom/parent = src.parent
+	var/list/seeing_mobs = can_see_contents()
+	for(var/mob/M in seeing_mobs)
+		M.client.screen -= AM
+	if(ismob(parent.loc) && isitem(AM))
+		var/obj/item/I = AM
+		var/mob/M = parent.loc
+		I.dropped(M)
+	if(new_location)
+		//Reset the items values
+		_removal_reset(AM)
+		AM.forceMove(new_location)
+		//We don't want to call this if the item is being destroyed
+		AM.on_exit_storage(src)
+	else
+		//Being destroyed, just move to nullspace now (so it's not in contents for the icon update)
+		AM.moveToNullspace()
+	refresh_mob_views()
+	if(isobj(parent))
+		var/obj/O = parent
+		O.update_icon()
+	return TRUE
+
+/datum/component/storage/concrete/proc/slave_can_insert_object(datum/component/storage/slave, obj/item/I, stop_messages = FALSE, mob/M)
+	return TRUE
+
+/datum/component/storage/concrete/proc/handle_item_insertion_from_slave(datum/component/storage/slave, obj/item/I, prevent_warning = FALSE, M)
+	. = handle_item_insertion(I, prevent_warning, M, slave)
+	if(. && !prevent_warning)
+		slave.mob_item_insertion_feedback(usr, M, I)
+
+/datum/component/storage/concrete/handle_item_insertion(obj/item/I, prevent_warning = FALSE, mob/M, datum/component/storage/remote)		//Remote is null or the slave datum
+	var/datum/component/storage/concrete/master = master()
+	var/atom/parent = src.parent
+	var/moved = FALSE
+	if(!istype(I))
+		return FALSE
+	if(M)
+		if(!M.temporarilyRemoveItemFromInventory(I))
+			return FALSE
+		else
+			moved = TRUE			//At this point if the proc fails we need to manually move the object back to the turf/mob/whatever.
+	if(I.pulledby)
+		I.pulledby.stop_pulling()
+	if(silent)
+		prevent_warning = TRUE
+	if(!_insert_physical_item(I))
+		if(moved)
+			if(M)
+				if(!M.put_in_active_hand(I))
+					I.forceMove(parent.drop_location())
+			else
+				I.forceMove(parent.drop_location())
+		return FALSE
+	I.on_enter_storage(master)
+	refresh_mob_views()
+	I.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt
+	if(M)
+		if(M.client && M.active_storage != src)
+			M.client.screen -= I
+		if(M.observers && M.observers.len)
+			for(var/i in M.observers)
+				var/mob/dead/observe = i
+				if(observe.client && observe.active_storage != src)
+					observe.client.screen -= I
+		if(!remote)
+			parent.add_fingerprint(M)
+			if(!prevent_warning)
+				mob_item_insertion_feedback(usr, M, I)
+	update_icon()
+	return TRUE
+
+/datum/component/storage/concrete/update_icon()
+	if(isobj(parent))
+		var/obj/O = parent
+		O.update_icon()
+	for(var/i in slaves)
+		var/datum/component/storage/slave = i
+		slave.update_icon()

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

@@ -1,17 +1,18 @@
-/datum/component/storage/concrete/implant
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 6
-	max_items = 2
-	drop_all_on_destroy = TRUE
-	drop_all_on_deconstruct = TRUE
-	silent = TRUE
-
-/datum/component/storage/concrete/implant/Initialize()
-	. = ..()
-	cant_hold = typecacheof(list(/obj/item/disk/nuclear))
-
-/datum/component/storage/concrete/implant/InheritComponent(datum/component/storage/concrete/implant/I, original)
-	if(!istype(I))
-		return ..()
-	max_combined_w_class += I.max_combined_w_class
-	max_items += I.max_items
+/datum/component/storage/concrete/implant
+	max_w_class = WEIGHT_CLASS_NORMAL
+	max_combined_w_class = 6
+	max_items = 2
+	drop_all_on_destroy = TRUE
+	drop_all_on_deconstruct = TRUE
+	silent = TRUE
+	allow_big_nesting = TRUE
+
+/datum/component/storage/concrete/implant/Initialize()
+	. = ..()
+	cant_hold = typecacheof(list(/obj/item/disk/nuclear))
+
+/datum/component/storage/concrete/implant/InheritComponent(datum/component/storage/concrete/implant/I, original)
+	if(!istype(I))
+		return ..()
+	max_combined_w_class += I.max_combined_w_class
+	max_items += I.max_items

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

@@ -39,7 +39,7 @@
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
-		/obj/item/device/firing_pin
+		/obj/item/firing_pin
 		))
 
 /datum/component/storage/concrete/pockets/shoes/clown/Initialize()
@@ -49,7 +49,7 @@
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
-		/obj/item/device/firing_pin, /obj/item/bikehorn))
+		/obj/item/firing_pin, /obj/item/bikehorn))
 
 /datum/component/storage/concrete/pockets/pocketprotector
 	max_items = 3
@@ -61,5 +61,5 @@
 		/obj/item/pen,
 		/obj/item/toy/crayon,
 		/obj/item/lipstick,
-		/obj/item/device/flashlight/pen,
+		/obj/item/flashlight/pen,
 		/obj/item/clothing/mask/cigarette))

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

@@ -1,31 +1,33 @@
-/datum/component/storage/concrete/rped
-	collection_mode = COLLECT_EVERYTHING
-	allow_quick_gather = TRUE
-	allow_quick_empty = TRUE
-	click_gather = TRUE
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 100
-	max_items = 50
-	display_numerical_stacking = TRUE
-
-/datum/component/storage/concrete/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
-	. = ..()
-	if(!I.get_part_rating() && !stop_messages)
-		to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
-		return FALSE
-
-/datum/component/storage/concrete/bluespace/rped
-	collection_mode = COLLECT_EVERYTHING
-	allow_quick_gather = TRUE
-	allow_quick_empty = TRUE
-	click_gather = TRUE
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 800
-	max_items = 400
-	display_numerical_stacking = TRUE
-
-/datum/component/storage/concrete/bluespace/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
-	. = ..()
-	if(!I.get_part_rating() && !stop_messages)
-		to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
-		return FALSE
+/datum/component/storage/concrete/rped
+	collection_mode = COLLECT_EVERYTHING
+	allow_quick_gather = TRUE
+	allow_quick_empty = TRUE
+	click_gather = TRUE
+	max_w_class = WEIGHT_CLASS_NORMAL
+	max_combined_w_class = 100
+	max_items = 50
+	display_numerical_stacking = TRUE
+
+/datum/component/storage/concrete/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
+	. = ..()
+	if(!I.get_part_rating())
+		if (!stop_messages)
+			to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
+		return FALSE
+
+/datum/component/storage/concrete/bluespace/rped
+	collection_mode = COLLECT_EVERYTHING
+	allow_quick_gather = TRUE
+	allow_quick_empty = TRUE
+	click_gather = TRUE
+	max_w_class = WEIGHT_CLASS_NORMAL
+	max_combined_w_class = 800
+	max_items = 400
+	display_numerical_stacking = TRUE
+
+/datum/component/storage/concrete/bluespace/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
+	. = ..()
+	if(!I.get_part_rating())
+		if (!stop_messages)
+			to_chat(M, "<span class='warning'>[parent] only accepts machine par	ts!</span>")
+		return FALSE

code/datums/components/storage/storage.dm

@@ -87,7 +87,8 @@
 	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_EXITED, .proc/_removal_reset)
+	RegisterSignal(COMSIG_ATOM_ENTERED, .proc/refresh_mob_views)
+	RegisterSignal(COMSIG_ATOM_EXITED, .proc/_remove_and_refresh)
 
 	RegisterSignal(COMSIG_ITEM_PRE_ATTACK, .proc/preattack_intercept)
 	RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/attack_self)
@@ -108,7 +109,7 @@
 	LAZYCLEARLIST(is_using)
 	return ..()
 
-/datum/component/storage/OnTransfer(datum/new_parent)
+/datum/component/storage/PreTransfer()
 	update_actions()
 
 /datum/component/storage/proc/update_actions()
@@ -232,13 +233,15 @@
 		stoplag(1)
 	qdel(progress)
 
-/datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress)
+/datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress, trigger_on_found = TRUE)
 	var/atom/real_location = real_location()
 	for(var/obj/item/I in things)
 		things -= I
 		if(I.loc != real_location)
 			continue
 		remove_from_storage(I, target)
+		if(trigger_on_found && I.on_found())
+			return FALSE
 		if(TICK_CHECK)
 			progress.update(progress.goal - length(things))
 			return TRUE
@@ -367,10 +370,10 @@
 		. = TRUE //returns TRUE if any mobs actually got a close(M) call
 
 /datum/component/storage/proc/emp_act(severity)
-	var/atom/A = parent
-	if(!isliving(A.loc) && !emp_shielded)
-		var/datum/component/storage/concrete/master = master()
-		master.emp_act(severity)
+	if(emp_shielded)
+		return
+	var/datum/component/storage/concrete/master = master()
+	master.emp_act(severity)
 
 //This proc draws out the inventory and places the items on it. tx and ty are the upper left tile and mx, my are the bottm right.
 //The numbers are calculated from the bottom-left The bottom-left slot being 1,1.
@@ -400,6 +403,10 @@
 		return FALSE
 	return master._removal_reset(thing)
 
+/datum/component/storage/proc/_remove_and_refresh(atom/movable/thing)
+	_removal_reset(thing)
+	refresh_mob_views()
+
 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the new_location target, if that is null it's being deleted
 /datum/component/storage/proc/remove_from_storage(atom/movable/AM, atom/new_location)
 	if(!istype(AM))
@@ -453,23 +460,24 @@
 		return FALSE
 	handle_item_insertion(I, FALSE, M)
 
-/datum/component/storage/proc/return_inv()
-	. = list()
-	. += contents()
-	for(var/i in contents())
-		var/atom/a = i
-		GET_COMPONENT_FROM(STR, /datum/component/storage, a)
-		if(STR)
-			. += STR.return_inv()
+/datum/component/storage/proc/return_inv(recursive)
+	var/list/ret = list()
+	ret |= contents()
+	if(recursive)
+		for(var/i in ret.Copy())
+			var/atom/A = i
+			A.SendSignal(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!
 	var/atom/real_location = real_location()
 	return real_location.contents.Copy()
 
-/datum/component/storage/proc/signal_return_inv(list/interface)
+//Abuses the fact that lists are just references, or something like that.
+/datum/component/storage/proc/signal_return_inv(list/interface, recursive = TRUE)
 	if(!islist(interface))
 		return FALSE
-	interface |= return_inv()
+	interface |= return_inv(recursive)
 	return TRUE
 
 /datum/component/storage/proc/mousedrop_onto(atom/over_object, mob/M)

code/datums/components/wet_floor.dm

@@ -135,12 +135,14 @@
 	for(var/i in time_left_list)
 		. |= text2num(i)
 
-/datum/component/wet_floor/OnTransfer(datum/to_datum)
-	if(!isopenturf(to_datum))
-		return COMPONENT_INCOMPATIBLE
+/datum/component/wet_floor/PreTransfer()
 	var/turf/O = parent
 	O.cut_overlay(current_overlay)
-	var/turf/T = to_datum
+
+/datum/component/wet_floor/PostTransfer()
+	if(!isopenturf(parent))
+		return COMPONENT_INCOMPATIBLE
+	var/turf/T = parent
 	T.add_overlay(current_overlay)
 
 /datum/component/wet_floor/proc/add_wet(type, duration_minimum = 0, duration_add = 0, duration_maximum = MAXIMUM_WET_TIME, _permanent = FALSE)