Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/modules/clothing/spacesuits/rig/suits/light.dm

code/game/objects/buckling.dm

@@ -24,6 +24,7 @@
 		return 0
 
 	M.buckled = src
+	M.facing_dir = null
 	M.set_dir(dir)
 	M.update_canmove()
 	buckled_mob = M

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

@@ -140,7 +140,6 @@
 	..()
 	name = "DV-136ZB #[rand(1000,9999)]"
 	c_tag = name
-	cameranet.removeCamera(src)		// Sorry, no AI spying.
 
 /obj/machinery/camera/spy/check_eye(var/mob/user as mob)
 	return 1

code/game/objects/items/weapons/handcuffs.dm

@@ -28,7 +28,7 @@
 		if (C == user)
 			place_handcuffs(user, user)
 			return
-		
+
 		//check for an aggressive grab
 		for (var/obj/item/weapon/grab/G in C.grabbed_by)
 			if (G.loc == user && G.state >= GRAB_AGGRESSIVE)
@@ -41,11 +41,15 @@
 
 	if (ishuman(target))
 		var/mob/living/carbon/human/H = target
-		
+
 		if (!H.has_organ_for_slot(slot_handcuffed))
-			user << "\red \The [H] needs at least two wrists before you can cuff them together!"
+			user << "<span class='danger'>\The [H] needs at least two wrists before you can cuff them together!</span>"
 			return
-		
+
+		if(istype(H.gloves,/obj/item/clothing/gloves/rig)) // Can't cuff someone who's in a deployed hardsuit.
+			user << "<span class='danger'>The cuffs won't fit around \the [H.gloves]!</span>"
+			return
+
 		H.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been handcuffed (attempt) by [user.name] ([user.ckey])</font>")
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to handcuff [H.name] ([H.ckey])</font>")
 		msg_admin_attack("[key_name(user)] attempted to handcuff [key_name(H)]")
@@ -62,7 +66,7 @@
 			feedback_add_details("handcuffs","H")
 			O.process()
 		return
-	
+
 	if (ismonkey(target))
 		var/mob/living/carbon/monkey/M = target
 		var/obj/effect/equip_e/monkey/O = new /obj/effect/equip_e/monkey(  )
@@ -155,13 +159,13 @@ var/last_chew = 0
 		var/turf/p_loc_m = C.loc
 		playsound(src.loc, cuff_sound, 30, 1, -2)
 		user.visible_message("\red <B>[user] is trying to put handcuffs on [C]!</B>")
-		
+
 		if (ishuman(C))
 			var/mob/living/carbon/human/H = C
 			if (!H.has_organ_for_slot(slot_handcuffed))
 				user << "\red \The [H] needs at least two wrists before you can cuff them together!"
 				return
-		
+
 		spawn(30)
 			if(!C)	return
 			if(p_loc == user.loc && p_loc_m == C.loc)

code/game/objects/structures/door_assembly.dm

@@ -248,6 +248,10 @@
 							glass = 1
 				else if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype)
 					var/M = S.sheettype
+					// Ugly hack, will suffice for now. Need to fix it upstream as well, may rewrite mineral walls. ~Z
+					if(M in list("mhydrogen","osmium","tritium","platinum","iron"))
+						user << "You cannot make an airlock out of that material."
+						return
 					if(S.get_amount() >= 2)
 						playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
 						user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")

code/game/objects/structures/girders.dm

@@ -26,7 +26,7 @@
 	var/damage = Proj.damage
 	if(!istype(Proj, /obj/item/projectile/beam))
 		damage *= 0.4 //non beams do reduced damage
-	
+
 	health -= damage
 	..()
 	if(health <= 0)
@@ -144,6 +144,10 @@
 
 		if(S.sheettype)
 			var/M = S.sheettype
+			// Ugly hack, will suffice for now. Need to fix it upstream as well, may rewrite mineral walls. ~Z
+			if(M in list("mhydrogen","osmium","tritium","platinum","iron"))
+				user << "You cannot plate the girder in that material."
+				return
 			if(!anchored)
 				if(S.amount < 2) return
 				S.use(2)
@@ -271,11 +275,11 @@
 	//Girders only provide partial cover. There's a chance that the projectiles will just pass through. (unless you are trying to shoot the girder)
 	if(Proj.original != src && !prob(cover))
 		return -1 //pass through
-	
+
 	//Tasers and the like should not damage cultgirders.
 	if(!(Proj.damage_type == BRUTE || Proj.damage_type == BURN))
 		return
-	
+
 	health -= Proj.damage
 	..()
 	if(health <= 0)

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -138,8 +138,8 @@
 		density = 1
 		icon_state = "up"
 	else
-		buckled_mob.pixel_y = 0
-		buckled_mob.old_y = 0
+		M.pixel_y = 0
+		M.old_y = 0
 		density = 0
 		icon_state = "down"