Merge branch 'master' into revenant_TK

code/game/objects/buckling.dm

@@ -14,6 +14,9 @@
 	if(.)
 		return
 	if(can_buckle && has_buckled_mobs())
+		if(ishuman(src)) //prevent people from unbuckling fireman-carried/piggybacked people unless on disarm or harm intents
+			if(act_intent == INTENT_HELP || act_intent == INTENT_GRAB)
+				return
 		if(buckled_mobs.len > 1)
 			var/unbuckled = input(user, "Who do you wish to unbuckle?","Unbuckle Who?") as null|mob in buckled_mobs
 			if(user_unbuckle_mob(unbuckled,user))
@@ -84,16 +87,22 @@
 			M.IgniteMob()
 
 /atom/movable/proc/unbuckle_mob(mob/living/buckled_mob, force=FALSE)
-	if(istype(buckled_mob) && buckled_mob.buckled == src && (buckled_mob.can_unbuckle() || force))
-		. = buckled_mob
-		buckled_mob.buckled = null
-		buckled_mob.anchored = initial(buckled_mob.anchored)
-		buckled_mob.update_mobility()
-		buckled_mob.clear_alert("buckled")
-		buckled_mobs -= buckled_mob
-		SEND_SIGNAL(src, COMSIG_MOVABLE_UNBUCKLE, buckled_mob, force)
+	if(!isliving(buckled_mob))
+		CRASH("Non-living [buckled_mob] thing called unbuckle_mob() for source.")
+	if(buckled_mob.buckled != src)
+		CRASH("[buckled_mob] called unbuckle_mob() for source while having buckled as [buckled_mob.buckled].")
+	if(!force && !buckled_mob.can_unbuckle())
+		return
+	. = buckled_mob
+	buckled_mob.buckled = null
+	buckled_mob.anchored = initial(buckled_mob.anchored)
+	buckled_mob.update_mobility()
+	buckled_mob.clear_alert("buckled")
+	buckled_mob.set_glide_size(DELAY_TO_GLIDE_SIZE(buckled_mob.total_multiplicative_slowdown()))
+	buckled_mobs -= buckled_mob
+	SEND_SIGNAL(src, COMSIG_MOVABLE_UNBUCKLE, buckled_mob, force)
 
-		post_unbuckle_mob(.)
+	post_unbuckle_mob(.)
 
 /atom/movable/proc/unbuckle_all_mobs(force=FALSE)
 	if(!has_buckled_mobs())

code/game/objects/effects/alien_acid.dm

@@ -53,6 +53,7 @@
 		return 0
 
 /obj/effect/acid/Crossed(AM as mob|obj)
+	. = ..()
 	if(isliving(AM))
 		var/mob/living/L = AM
 		if(L.movement_type & FLYING)

code/game/objects/effects/anomalies.dm

@@ -138,7 +138,7 @@
 
 /obj/effect/anomaly/grav/high/Initialize(mapload, new_lifespan)
 	. = ..()
-	setup_grav_field()
+	INVOKE_ASYNC(src, .proc/setup_grav_field)
 
 /obj/effect/anomaly/grav/high/proc/setup_grav_field()
 	grav_field = make_field(/datum/proximity_monitor/advanced/gravity, list("current_range" = 7, "host" = src, "gravity_value" = rand(0,3)))

code/game/objects/effects/decals/cleanable/robots.dm

@@ -69,4 +69,5 @@
 	persistent = FALSE
 
 /obj/effect/decal/cleanable/oil/slippery/Initialize()
+	. = ..()
 	AddComponent(/datum/component/slippery, 80, (NO_SLIP_WHEN_WALKING | SLIDE))

code/game/objects/effects/proximity.dm

@@ -5,6 +5,7 @@
 	var/list/checkers //list of /obj/effect/abstract/proximity_checkers
 	var/current_range
 	var/ignore_if_not_on_turf	//don't check turfs in range if the host's loc isn't a turf
+	var/wire = FALSE
 
 /datum/proximity_monitor/New(atom/_host, range, _ignore_if_not_on_turf = TRUE)
 	checkers = list()
@@ -35,6 +36,8 @@
 	return ..()
 
 /datum/proximity_monitor/proc/HandleMove()
+	SIGNAL_HANDLER
+
 	var/atom/_host = host
 	var/atom/new_host_loc = _host.loc
 	if(last_host_loc != new_host_loc)
@@ -58,6 +61,8 @@
 	var/atom/_host = host
 
 	var/atom/loc_to_use = ignore_if_not_on_turf ? _host.loc : get_turf(_host)
+	if(wire && !isturf(loc_to_use)) //it makes assemblies attached on wires work
+		loc_to_use = get_turf(loc_to_use)
 	if(!isturf(loc_to_use))	//only check the host's loc
 		if(range)
 			var/obj/effect/abstract/proximity_checker/pc
@@ -109,4 +114,5 @@
 
 /obj/effect/abstract/proximity_checker/Crossed(atom/movable/AM)
 	set waitfor = FALSE
-	monitor?.hasprox_receiver.HasProximity(AM)
+	. = ..()
+	monitor?.hasprox_receiver?.HasProximity(AM)

code/game/objects/effects/spawners/bundle.dm

@@ -170,6 +170,7 @@
 		/obj/item/clothing/under/rank/civilian/mime/sexy)
 
 /obj/effect/spawner/bundle/crate/Initialize(mapload)
+	SHOULD_CALL_PARENT(FALSE)
 	if(items && items.len)
 		var/turf/T = get_turf(src)
 		var/obj/structure/closet/LC = locate(/obj/structure/closet) in T

code/game/objects/effects/spawners/lootdrop.dm

@@ -664,9 +664,8 @@
 	lootcount = 1
 	spawn_on_turf = FALSE
 	loot = list("" = 50,
-		/obj/item/weaponcrafting/improvised_parts/rifle_receiver = 13,
-		/obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 13,
-		/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 12,
+		/obj/item/weaponcrafting/receiver = 25,
+		/obj/item/weaponcrafting/stock = 25,
 		)
 
 /obj/effect/spawner/lootdrop/weapon_parts
@@ -674,8 +673,8 @@
 	lootcount = 1
 	spawn_on_turf = FALSE
 	loot = list("" = 80,
-		/obj/item/weaponcrafting/improvised_parts/rifle_receiver = 5,
-		/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 5,
+		/obj/item/weaponcrafting/receiver = 5,
+		/obj/item/weaponcrafting/stock = 5,
 		)
 
 /obj/effect/spawner/lootdrop/ammo

code/game/objects/effects/spawners/xeno_egg_delivery.dm

@@ -15,5 +15,5 @@
 	message_admins("An alien egg has been delivered to [ADMIN_VERBOSEJMP(T)].")
 	log_game("An alien egg has been delivered to [AREACOORD(T)]")
 	var/message = "Attention [station_name()], we have entrusted you with a research specimen in [get_area_name(T, TRUE)]. Remember to follow all safety precautions when dealing with the specimen."
-	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /proc/print_command_report, message), announcement_time))
+	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/_addtimer, CALLBACK(GLOBAL_PROC, /proc/print_command_report, message), announcement_time))
 	return INITIALIZE_HINT_QDEL

code/game/objects/items.dm

@@ -428,18 +428,19 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 /obj/item/proc/talk_into(mob/M, input, channel, spans, datum/language/language)
 	return ITALICS | REDUCE_RANGE
 
-/obj/item/proc/dropped(mob/user)
+/// Called when a mob drops an item.
+/obj/item/proc/dropped(mob/user, silent = FALSE)
 	SHOULD_CALL_PARENT(TRUE)
-	current_equipped_slot = null
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.Remove(user)
 	if(item_flags & DROPDEL)
 		qdel(src)
 	item_flags &= ~IN_INVENTORY
-	if(SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user) & COMPONENT_DROPPED_RELOCATION)
-		. = ITEM_RELOCATED_BY_DROPPED
-	user.update_equipment_speed_mods()
+	SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user)
+	// if(!silent)
+	// 	playsound(src, drop_sound, DROP_SOUND_VOLUME, ignore_walls = FALSE)
+	user?.update_equipment_speed_mods()
 
 // called just as an item is picked up (loc is not yet changed)
 /obj/item/proc/pickup(mob/user)
@@ -478,23 +479,33 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	over.MouseDrop_T(src,usr)
 	return
 
-// called after an item is placed in an equipment slot
-// user is mob that equipped it
-// slot uses the slot_X defines found in setup.dm
-// for items that can be placed in multiple slots
-// note this isn't called during the initial dressing of a player
-/obj/item/proc/equipped(mob/user, slot)
+/**
+ * Called after an item is placed in an equipment slot.
+ *
+ * Note that hands count as slots.
+ *
+ * Arguments:
+ * * user is mob that equipped it
+ * * slot uses the slot_X defines found in setup.dm for items that can be placed in multiple slots
+ * * Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it
+ */
+/obj/item/proc/equipped(mob/user, slot, initial = FALSE)
 	SHOULD_CALL_PARENT(TRUE)
-	. = SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot)
+	SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot)
 	current_equipped_slot = slot
-	if(!(. & COMPONENT_NO_GRANT_ACTIONS))
-		for(var/X in actions)
-			var/datum/action/A = X
-			if(item_action_slot_check(slot, user, A)) //some items only give their actions buttons when in a specific slot.
-				A.Grant(user)
+	for(var/X in actions)
+		var/datum/action/A = X
+		if(item_action_slot_check(slot, user, A)) //some items only give their actions buttons when in a specific slot.
+			A.Grant(user)
 	item_flags |= IN_INVENTORY
+	// if(!initial)
+	// 	if(equip_sound && (slot_flags & slot))
+	// 		playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE)
+	// 	else if(slot == ITEM_SLOT_HANDS)
+	// 		playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE)
 	user.update_equipment_speed_mods()
 
+
 //Overlays for the worn overlay so you can overlay while you overlay
 //eg: ammo counters, primed grenade flashing, etc.
 //"icon_file" is used automatically for inhands etc. to make sure it gets the right inhand file
@@ -661,6 +672,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 			else
 				playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1)
 
+		// else
+		// 	playsound(src, drop_sound, YEET_SOUND_VOLUME, ignore_walls = FALSE)
 		return hit_atom.hitby(src, 0, itempush, throwingdatum=throwingdatum)
 
 /obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, messy_throw = TRUE)

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -263,6 +263,7 @@
 		/obj/machinery/vending/cola = "Robust Softdrinks",
 		/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
 		/obj/machinery/vending/games = "\improper Good Clean Fun",
+		/obj/machinery/vending/kink = "KinkMate",
 		/obj/machinery/vending/autodrobe = "AutoDrobe",
 		/obj/machinery/vending/assist = "\improper Vendomat",
 		/obj/machinery/vending/engivend = "\improper Engi-Vend",

code/game/objects/items/devices/dogborg_sleeper.dm

@@ -347,9 +347,9 @@
 						last_hearcheck = world.time
 						for(var/mob/H in hearing_mobs)
 							if(!istype(H.loc, /obj/item/dogborg/sleeper))
-								H.playsound_local(source, null, 45, falloff = 0, S = pred_death)
+								H.playsound_local(source, null, 45, S = pred_death)
 							else if(H in contents)
-								H.playsound_local(source, null, 65, falloff = 0, S = prey_death)
+								H.playsound_local(source, null, 65, S = prey_death)
 					for(var/belly in T.vore_organs)
 						var/obj/belly/B = belly
 						for(var/atom/movable/thing in B)
@@ -391,9 +391,9 @@
 			last_hearcheck = world.time
 			for(var/mob/H in hearing_mobs)
 				if(!istype(H.loc, /obj/item/dogborg/sleeper))
-					H.playsound_local(source, null, 45, falloff = 0, S = pred_digest)
+					H.playsound_local(source, null, 45, S = pred_digest)
 				else if(H in contents)
-					H.playsound_local(source, null, 65, falloff = 0, S = prey_digest)
+					H.playsound_local(source, null, 65, S = prey_digest)
 
 	update_gut(hound)
 

code/game/objects/items/grenades/plastic.dm

@@ -85,6 +85,7 @@
 /obj/item/grenade/plastic/Crossed(atom/movable/AM)
 	if(nadeassembly)
 		nadeassembly.Crossed(AM)
+	. = ..()
 
 /obj/item/grenade/plastic/on_found(mob/finder)
 	if(nadeassembly)

code/game/objects/items/holy_weapons.dm

@@ -803,6 +803,7 @@
 	force = 4
 	throwforce = 0
 	attack_verb = list("whipped", "repented", "lashed", "flagellated")
+	slot_flags = ITEM_SLOT_BELT
 	var/praying = FALSE
 	var/deity_name = "Coderbus" //This is the default, hopefully won't actually appear if the religion subsystem is running properly
 

code/game/objects/items/plushes.dm

@@ -466,6 +466,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
 	can_random_spawn = FALSE
 
 /obj/item/toy/plush/random/Initialize()
+	SHOULD_CALL_PARENT(FALSE)
 	var/newtype
 	var/list/snowflake_list = CONFIG_GET(keyed_list/snowflake_plushies)
 

code/game/objects/items/puzzle_pieces.dm

@@ -134,7 +134,7 @@
 /obj/item/pressure_plate/hologrid/Crossed(atom/movable/AM)
 	. = ..()
 	if(trigger_item && istype(AM, specific_item) && !claimed)
-		AM.anchored = TRUE
+		AM.set_anchored(TRUE)
 		flick("laserbox_burn", AM)
 		trigger()
 		QDEL_IN(src, 15)

code/game/objects/items/stacks/medical.dm

@@ -173,11 +173,11 @@
 					 "<span class='italics'>You hear cutting.</span>")
 		use(2)
 	else if(I.is_drainable() && I.reagents.has_reagent(/datum/reagent/space_cleaner/sterilizine))
-		if(!I.reagents.has_reagent(/datum/reagent/space_cleaner/sterilizine, 10))
+		if(!I.reagents.has_reagent(/datum/reagent/space_cleaner/sterilizine, 5))
 			to_chat(user, "<span class='warning'>There's not enough sterilizine in [I] to sterilize [src]!</span>")
 			return
-		user.visible_message("<span class='notice'>[user] pours the contents of [I] onto [src], sterilizing it.</span>", "<span class='notice'>You pour the contents of [I] onto [src], sterilizing it.</span>")
-		I.reagents.remove_reagent(/datum/reagent/space_cleaner/sterilizine, 10)
+		user.visible_message("<span class='notice'>[user] sterilizes [src] with the contents of [I].</span>", "<span class='notice'>You pour the contents of [I] onto [src], sterilizing it.</span>")
+		I.reagents.remove_reagent(/datum/reagent/space_cleaner/sterilizine, 5)
 		new /obj/item/stack/medical/gauze/adv/one(user.drop_location())
 		use(1)
 	else
@@ -187,6 +187,9 @@
 	user.visible_message("<span class='suicide'>[user] begins tightening \the [src] around [user.p_their()] neck! It looks like [user.p_they()] forgot how to use medical supplies!</span>")
 	return OXYLOSS
 
+/obj/item/stack/medical/gauze/one
+	amount = 1
+
 /obj/item/stack/medical/gauze/improvised
 	name = "improvised gauze"
 	singular_name = "improvised gauze"
@@ -204,8 +207,9 @@
 	heal_brute = 6
 	self_delay = 45
 	other_delay = 15
-	absorption_rate = 0.4
-	absorption_capacity = 6
+	absorption_rate = 0.5
+	absorption_capacity = 12
+	splint_factor = 0.15
 
 /obj/item/stack/medical/gauze/adv/one
 	amount = 1
@@ -472,3 +476,51 @@
 		return TRUE
 
 	to_chat(user, "<span class='warning'>You can't heal [M] with the \the [src]!</span>")
+
+/obj/item/stack/medical/nanogel
+	name = "nanogel"
+	singular_name = "nanogel"
+	desc = "A highly advanced gel that when applied on a sufficiently repaired robotic limb will neutralize internal damage if present, allowing further repairs without the need for surgery."
+	self_delay = 150	//Agonizingly slow if used on self, but, not completely forbidden because antags with robolimbs need a way to handle their thresholds.
+	other_delay = 30	//Pretty fast if used on others.
+	amount = 12
+	max_amount = 12	//Two synths worth of fixing, if every single bodypart of them has internal damage. Usually, probably more like 6-12.
+	icon_state = "nanogel"
+	var/being_applied = FALSE	//No doafter stacking.
+
+/obj/item/stack/medical/nanogel/try_heal(mob/living/M, mob/user, silent = FALSE)
+	if(being_applied)
+		to_chat(user, "<span class='warning'>You are already applying [src]!</span>")
+		return
+	if(!iscarbon(M))
+		to_chat(user, "<span class='warning'>This won't work on [M]!</span>")
+		return
+	being_applied = TRUE
+	..()
+	being_applied = FALSE
+
+/obj/item/stack/medical/nanogel/heal(mob/living/M, mob/user)
+	var/mob/living/carbon/C = M	//Only carbons should be able to get here
+	if(!C)
+		return
+	var/obj/item/bodypart/affecting = C.get_bodypart(check_zone(user.zone_selected))
+	if(!affecting) //Missing limb?
+		to_chat(user, "<span class='warning'>[C] doesn't have \a [parse_zone(user.zone_selected)]!</span>")
+		return
+	if(!affecting.is_robotic_limb())
+		to_chat(user, "<span class='warning'>This won't work on nonrobotic limbs!</span>")
+		return
+	if(!affecting.threshhold_brute_passed && !affecting.threshhold_burn_passed)
+		to_chat(user, "<span class='warning'>There is no need to use this on [affecting]</span>")
+		return
+	if(affecting.threshhold_brute_passed && affecting.brute_dam == affecting.threshhold_passed_mindamage)
+		. = TRUE
+		affecting.threshhold_brute_passed = FALSE
+	if(affecting.threshhold_burn_passed && affecting.burn_dam == affecting.threshhold_passed_mindamage)
+		. = TRUE
+		affecting.threshhold_burn_passed = FALSE
+	if(.)
+		user.visible_message("<span class='green'>The nanogel gets to work on [C], repairing [affecting]'s internal damage.</span>", "<span_class='green'>You watch as the nanogel gets to work on fixing the internal damage in [affecting]</span>")
+		return
+	//If it gets here: It failed, lets tell the user why.
+	to_chat(user, "<span class='warning'>[src] fails to work on [affecting] due to residual [(affecting.threshhold_burn_passed && affecting.threshhold_burn_passed) ? "brute and burn" : "[affecting.threshhold_burn_passed ? "burn" : "brute"]"] damage! Perform some external repairs before using this.</span>")

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -246,7 +246,6 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 		new /datum/stack_recipe("pew (right)", /obj/structure/chair/pew/right, 3, one_per_turf = TRUE, on_floor = TRUE),\
 		)),
 	null, \
-	new/datum/stack_recipe("wooden firearm body", /obj/item/weaponcrafting/improvised_parts/wooden_body, 10, time = 20), \
 	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 20), \
 	new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
 	new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \
@@ -391,7 +390,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("construction bag", /obj/item/storage/bag/construction, 4), \
 	null, \
 	new/datum/stack_recipe("string", /obj/item/weaponcrafting/string, 1, time = 10), \
-	new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \
+	new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 10), \
 	new/datum/stack_recipe("rag", /obj/item/reagent_containers/rag, 1), \
 	new/datum/stack_recipe("towel", /obj/item/reagent_containers/rag/towel, 3), \
 	new/datum/stack_recipe("bedsheet", /obj/item/bedsheet, 3), \

code/game/objects/items/stacks/stack.dm

@@ -65,7 +65,7 @@
 	if(merge)
 		for(var/obj/item/stack/S in loc)
 			if(S.merge_type == merge_type)
-				merge(S)
+				INVOKE_ASYNC(src, .proc/merge, S)
 	var/list/temp_recipes = get_main_recipes()
 	recipes = temp_recipes.Copy()
 	if(material_type)

code/game/objects/items/stunbaton.dm

@@ -196,7 +196,7 @@
 			return FALSE
 		stunpwr *= round(stuncharge/hitcost, 0.1)
 
-	if(!user.UseStaminaBuffer(getweight(user, STAM_COST_BATON_MOB_MULT), warn = TRUE))
+	if(user && !user.UseStaminaBuffer(getweight(user, STAM_COST_BATON_MOB_MULT), warn = TRUE))
 		return FALSE
 
 	if(!disarming)
@@ -317,12 +317,12 @@
 /obj/item/melee/baton/boomerang
 	name = "\improper OZtek Boomerang"
 	desc = "A device invented in 2486 for the great Space Emu War by the confederacy of Australicus, these high-tech boomerangs also work exceptionally well at stunning crewmembers. Just be careful to catch it when thrown!"
-	throw_speed = 1
+	throw_speed = 1.5
 	icon_state = "boomerang"
 	item_state = "boomerang"
 	force = 5
 	throwforce = 5
-	throw_range = 5
+	throw_range = 10
 	hitcost = 2000
 	throw_hit_chance = 99  //Have you prayed today?
 	custom_materials = list(/datum/material/iron = 10000, /datum/material/glass = 4000, /datum/material/silver = 10000, /datum/material/gold = 2000)
@@ -331,7 +331,7 @@
 	if(turned_on)
 		if(ishuman(thrower))
 			var/mob/living/carbon/human/H = thrower
-			H.throw_mode_off() //so they can catch it on the return.
+			H.throw_mode_on() //so they can catch it on the return.
 	return ..()
 
 /obj/item/melee/baton/boomerang/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)

code/game/objects/items/toys.dm

@@ -531,6 +531,7 @@
 		pop_burst()
 
 /obj/item/toy/snappop/Crossed(H as mob|obj)
+	. = ..()
 	if(ishuman(H) || issilicon(H)) //i guess carp and shit shouldn't set them off
 		var/mob/living/carbon/M = H
 		if(issilicon(H) || M.m_intent == MOVE_INTENT_RUN)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -96,7 +96,7 @@
 	new /obj/item/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/analyzer(src)
 	new /obj/item/holosign_creator/atmos(src)
-	new /obj/item/holosign_creator/firelock(src)
+	new /obj/item/holosign_creator/firelock(src) //what if atmos techs could test things they are meant to test, wild, innit?
 	new /obj/item/watertank/atmos(src)
 	new /obj/item/clothing/suit/fire/atmos(src)
 	new /obj/item/clothing/head/hardhat/atmos(src)

code/game/objects/structures/tables_racks.dm

@@ -269,13 +269,13 @@
 	UnregisterSignal(source, COMSIG_MOVABLE_MOVED)
 
 /obj/structure/table/rolling/Moved(atom/OldLoc, Dir)
+	. = ..()
 	for(var/mob/M in OldLoc.contents)//Kidnap everyone on top
 		M.forceMove(loc)
 	for(var/x in attached_items)
 		var/atom/movable/AM = x
 		if(!AM.Move(loc))
 			RemoveItemFromTable(AM, AM.loc)
-	return TRUE
 
 /*
  * Glass tables

code/game/objects/structures/transit_tubes/transit_tube_pod.dm

@@ -126,12 +126,13 @@
 
 		if(current_tube == null)
 			setDir(next_dir)
-			Move(get_step(loc, dir), dir) // Allow collisions when leaving the tubes.
+			Move(get_step(loc, dir), dir, DELAY_TO_GLIDE_SIZE(exit_delay)) // Allow collisions when leaving the tubes.
 			break
 
 		last_delay = current_tube.enter_delay(src, next_dir)
 		sleep(last_delay)
 		setDir(next_dir)
+		set_glide_size(DELAY_TO_GLIDE_SIZE(last_delay + exit_delay))
 		forceMove(next_loc) // When moving from one tube to another, skip collision and such.
 		density = current_tube.density
 

code/game/objects/structures/traps.dm

@@ -56,6 +56,7 @@
 		animate(src, alpha = initial(alpha), time = time_between_triggers)
 
 /obj/structure/trap/Crossed(atom/movable/AM)
+	. = ..()
 	if(last_trigger + time_between_triggers > world.time)
 		return
 	// Don't want the traps triggered by sparks, ghosts or projectiles.
@@ -67,6 +68,7 @@
 			return
 		if(M.anti_magic_check())
 			flare()
+			return
 	if(charges <= 0)
 		return
 	flare()