Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements

code/datums/action.dm

@@ -494,6 +494,7 @@
 	else
 		to_chat(owner, "<span class='cultitalic'>Your hands are full!</span>")
 
+//MGS Box
 /datum/action/item_action/agent_box
 	name = "Deploy Box"
 	desc = "Find inner peace, here, in the box."
@@ -502,21 +503,27 @@
 	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "deploy_box"
 	var/cooldown = 0
-	var/obj/structure/closet/cardboard/agent/box
+	var/boxtype = /obj/structure/closet/cardboard/agent
 
+//Handles open and closing the box
 /datum/action/item_action/agent_box/Trigger()
-	if(!..())
+	. = ..()
+	if(!.)
 		return FALSE
-	if(QDELETED(box))
-		if(cooldown < world.time - 100)
-			box = new(owner.drop_location())
-			owner.forceMove(box)
-			cooldown = world.time
-			owner.playsound_local(box, 'sound/misc/box_deploy.ogg', 50, TRUE)
-	else
-		owner.forceMove(box.drop_location())
+	if(istype(owner.loc, /obj/structure/closet/cardboard/agent))
+		var/obj/structure/closet/cardboard/agent/box = owner.loc
+		owner.playsound_local(box, 'sound/misc/box_deploy.ogg', 50, TRUE)
+		box.open()
+		return
+	//Box closing from here on out.
+	if(!isturf(owner.loc)) //Don't let the player use this to escape mechs/welded closets.
+		to_chat(owner, "<span class = 'notice'>You need more space to activate this implant.</span>")
+		return
+	if(cooldown < world.time - 100)
+		var/box = new boxtype(owner.drop_location())
+		owner.forceMove(box)
+		cooldown = world.time
 		owner.playsound_local(box, 'sound/misc/box_deploy.ogg', 50, TRUE)
-		QDEL_NULL(box)
 
 //Preset for spells
 /datum/action/spell_action

code/datums/components/footstep.dm

@@ -14,15 +14,18 @@
 	var/turf/open/T = get_turf(parent)
 	if(!istype(T))
 		return
-	
+
 	var/mob/living/LM = parent
 	var/v = volume
 	var/e = e_range
 	if(!T.footstep || LM.buckled || LM.lying || !LM.canmove || LM.resting || LM.buckled || LM.throwing || LM.movement_type & (VENTCRAWLING | FLYING))
-		if (LM.lying && !(!T.footstep || LM.movement_type & (VENTCRAWLING | FLYING))) //play crawling sound if we're lying
+		if (LM.lying && !LM.buckled && !(!T.footstep || LM.movement_type & (VENTCRAWLING | FLYING))) //play crawling sound if we're lying
 			playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
 		return
-	
+
+	if(HAS_TRAIT(LM, TRAIT_SILENT_STEP))
+		return
+
 	if(iscarbon(LM))
 		var/mob/living/carbon/C = LM
 		if(!C.get_bodypart(BODY_ZONE_L_LEG) && !C.get_bodypart(BODY_ZONE_R_LEG))
@@ -31,18 +34,18 @@
 			v /= 2
 			e -= 5
 	steps++
-	
+
 	if(steps >= 3)
 		steps = 0
-	
+
 	else
 		return
-	
+
 	if(prob(80) && !LM.has_gravity(T)) // don't need to step as often when you hop around
 		return
-		
+
 	//begin playsound shenanigans//
-	
+
 	//for barefooted non-clawed mobs like monkeys
 	if(isbarefoot(LM))
 		playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]),
@@ -50,19 +53,19 @@
 			TRUE,
 			GLOB.barefootstep[T.barefootstep][3] + e)
 		return
-	
+
 	//for xenomorphs, dogs, and other clawed mobs
 	if(isclawfoot(LM))
 		if(isalienadult(LM)) //xenos are stealthy and get quieter footsteps
 			v /= 3
 			e -= 5
-		
+
 		playsound(T, pick(GLOB.clawfootstep[T.clawfootstep][1]),
 				GLOB.clawfootstep[T.clawfootstep][2] * v,
 				TRUE,
 				GLOB.clawfootstep[T.clawfootstep][3] + e)
 		return
-	
+
 	//for megafauna and other large and imtimidating mobs such as the bloodminer
 	if(isheavyfoot(LM))
 		playsound(T, pick(GLOB.heavyfootstep[T.heavyfootstep][1]),
@@ -70,12 +73,12 @@
 				TRUE,
 				GLOB.heavyfootstep[T.heavyfootstep][3] + e)
 		return
-	
+
 	//for slimes
-	if(isslime(LM)) 
+	if(isslime(LM))
 		playsound(T, 'sound/effects/footstep/slime1.ogg', 15 * v)
 		return
-		
+
 	//for (simple) humanoid mobs (clowns, russians, pirates, etc.)
 	if(isshoefoot(LM))
 		if(!ishuman(LM))
@@ -87,17 +90,17 @@
 		if(ishuman(LM)) //for proper humans, they're special
 			var/mob/living/carbon/human/H = LM
 			var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET))
-			
+
 			if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") //are we a naga or tentacle taur creature
 				playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
 				return
-			
+
 			if(H.shoes || feetCover) //are we wearing shoes
 				playsound(T, pick(GLOB.footstep[T.footstep][1]),
 					GLOB.footstep[T.footstep][2] * v,
 					TRUE,
 					GLOB.footstep[T.footstep][3] + e)
-			
+
 			if((!H.shoes && !feetCover)) //are we NOT wearing shoes
 				playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]),
 					GLOB.barefootstep[T.barefootstep][2] * v,

code/datums/helper_datums/teleport.dm

@@ -5,11 +5,19 @@
 // effectout: effect to show right after teleportation
 // asoundin: soundfile to play before teleportation
 // asoundout: soundfile to play after teleportation
-// force_teleport: if false, teleport will use Move() proc (dense objects will prevent teleportation)
 // no_effects: disable the default effectin/effectout of sparks
-/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, force_teleport=TRUE, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE)
+// forceMove: if false, teleport will use Move() proc (dense objects will prevent teleportation)
+// forced: whether or not to ignore no_teleport
+/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, forceMove = TRUE, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE, channel=TELEPORT_CHANNEL_BLUESPACE, forced = FALSE)
 	// teleporting most effects just deletes them
-	if(iseffect(teleatom) && !istype(teleatom, /obj/effect/dummy/chameleon))
+	var/static/list/delete_atoms = typecacheof(list(
+		/obj/effect,
+		)) - typecacheof(list(
+		/obj/effect/dummy/chameleon,
+		/obj/effect/wisp,
+		/obj/effect/mob_spawn
+		))
+	if(delete_atoms[teleatom.type])
 		qdel(teleatom)
 		return FALSE
 
@@ -17,25 +25,37 @@
 	// if the precision is not specified, default to 0, but apply BoH penalties
 	if (isnull(precision))
 		precision = 0
-		if(istype(teleatom, /obj/item/storage/backpack/holding))
-			precision = rand(1,100)
 
-		var/static/list/bag_cache = typecacheof(/obj/item/storage/backpack/holding)
-		var/list/bagholding = typecache_filter_list(teleatom.GetAllContents(), bag_cache)
-		if(bagholding.len)
-			precision = max(rand(1,100)*bagholding.len,100)
-			if(isliving(teleatom))
-				var/mob/living/MM = teleatom
-				to_chat(MM, "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>")
+	switch(channel)
+		if(TELEPORT_CHANNEL_BLUESPACE)
+			if(istype(teleatom, /obj/item/storage/backpack/holding))
+				precision = rand(1,100)
 
-	// if effects are not specified and not explicitly disabled, sparks
-	if ((!effectin || !effectout) && !no_effects)
-		var/datum/effect_system/spark_spread/sparks = new
-		sparks.set_up(5, 1, teleatom)
-		if (!effectin)
-			effectin = sparks
-		if (!effectout)
-			effectout = sparks
+			var/static/list/bag_cache = typecacheof(/obj/item/storage/backpack/holding)
+			var/list/bagholding = typecache_filter_list(teleatom.GetAllContents(), bag_cache)
+			if(bagholding.len)
+				precision = max(rand(1,100)*bagholding.len,100)
+				if(isliving(teleatom))
+					var/mob/living/MM = teleatom
+					to_chat(MM, "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>")
+
+			// if effects are not specified and not explicitly disabled, sparks
+			if ((!effectin || !effectout) && !no_effects)
+				var/datum/effect_system/spark_spread/sparks = new
+				sparks.set_up(5, 1, teleatom)
+				if (!effectin)
+					effectin = sparks
+				if (!effectout)
+					effectout = sparks
+		if(TELEPORT_CHANNEL_QUANTUM)
+			// if effects are not specified and not explicitly disabled, rainbow sparks
+			if ((!effectin || !effectout) && !no_effects)
+				var/datum/effect_system/spark_spread/quantum/sparks = new
+				sparks.set_up(5, 1, teleatom)
+				if (!effectin)
+					effectin = sparks
+				if (!effectout)
+					effectout = sparks
 
 	// perform the teleport
 	var/turf/curturf = get_turf(teleatom)
@@ -45,11 +65,15 @@
 		return FALSE
 
 	var/area/A = get_area(curturf)
-	if(A.noteleport)
+	var/area/B = get_area(destturf)
+	if(!forced && (A.noteleport || B.noteleport))
+		return FALSE
+
+	if(SEND_SIGNAL(destturf, COMSIG_ATOM_INTERCEPT_TELEPORT, channel, curturf, destturf))
 		return FALSE
 
 	tele_play_specials(teleatom, curturf, effectin, asoundin)
-	var/success = force_teleport ? teleatom.forceMove(destturf) : teleatom.Move(destturf)
+	var/success = forceMove ? teleatom.forceMove(destturf) : teleatom.Move(destturf)
 	if (success)
 		log_game("[key_name(teleatom)] has teleported from [loc_name(curturf)] to [loc_name(destturf)]")
 		tele_play_specials(teleatom, destturf, effectout, asoundout)

code/datums/martial/krav_maga.dm

@@ -197,7 +197,7 @@
 	name = "combat gloves plus"
 	desc = "These tactical gloves are fireproof and shock resistant, and using nanochip technology it teaches you the powers of krav maga."
 	icon_state = "combat"
-	item_state = "blackglovesplus"
+	item_state = "blackgloves"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	strip_delay = 80

code/datums/mutations/body.dm

@@ -63,16 +63,14 @@
 /datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.resize = 0.8
-	owner.update_transform()
+	owner.transform = owner.transform.Scale(1, 0.8)
 	owner.pass_flags |= PASSTABLE
 	owner.visible_message("<span class='danger'>[owner] suddenly shrinks!</span>", "<span class='notice'>Everything around you seems to grow..</span>")
 
 /datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.resize = 1.25
-	owner.update_transform()
+	owner.transform = owner.transform.Scale(1, 1.25)
 	owner.pass_flags &= ~PASSTABLE
 	owner.visible_message("<span class='danger'>[owner] suddenly grows!</span>", "<span class='notice'>Everything around you seems to shrink..</span>")
 

code/datums/ruins/space.dm

@@ -305,3 +305,9 @@
 	suffix = "spacehermit.dmm"
 	name = "Space Hermit"
 	description = "A late awakening cryo pod in a crashed escape pod wakes up to find what befell of his fellow survivors. Contains all the necessary resources to actually make it out alive. Good luck."
+
+/datum/map_template/ruin/space/advancedlab
+	id = "advancedlab"
+	suffix = "advancedlab.dmm"
+	name = "Abductor Replication Lab"
+	description = "Some scientists tried and almost succeeded to recreate abductor tools. Somewhat slower and a bit less modern than their originals, these tools are the best you can get if you aren't an alien."

code/datums/saymode.dm

@@ -11,7 +11,7 @@
 
 
 /datum/saymode/changeling
-	key = "g"
+	key = MODE_KEY_CHANGELING
 	mode = MODE_CHANGELING
 
 /datum/saymode/changeling/handle_message(mob/living/user, message, datum/language/language)
@@ -73,7 +73,7 @@
 
 
 /datum/saymode/vocalcords
-	key = "x"
+	key = MODE_KEY_VOCALCORDS
 	mode = MODE_VOCALCORDS
 
 /datum/saymode/vocalcords/handle_message(mob/living/user, message, datum/language/language)
@@ -87,7 +87,7 @@
 
 
 /datum/saymode/binary //everything that uses .b (silicons, drones, blobbernauts/spores, swarmers)
-	key = "b"
+	key = MODE_KEY_BINARY
 	mode = MODE_BINARY
 
 /datum/saymode/binary/handle_message(mob/living/user, message, datum/language/language)

code/datums/wires/_wires.dm

@@ -231,6 +231,9 @@
 	// Same for anyone with an abductor multitool.
 	else if(user.is_holding_item_of_type(/obj/item/multitool/abductor))
 		reveal_wires = TRUE
+	// and advanced multitool
+	else if(user.is_holding_item_of_type(/obj/item/multitool/advanced))
+		reveal_wires = TRUE
 
 	// Station blueprints do that too, but only if the wires are not randomized.
 	else if(user.is_holding_item_of_type(/obj/item/areaeditor/blueprints) && !randomize)