Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Conflicts:
	html/changelog.html

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

@@ -1042,6 +1042,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 		if(5)
 			if((istype(A, /obj/item/weapon/tank)) || (istype(A, /obj/machinery/portable_atmospherics)))
+				if(istype(A, /obj/item/weapon/tank))
+					var/obj/item/weapon/tank/t = A
+					t.manipulated_by = user.real_name
 				var/obj/icon = A
 				for (var/mob/O in viewers(user, null))
 					O << "\red [user] has used [src] on \icon[icon] [A]"

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

@@ -285,7 +285,7 @@
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1)
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(!H.shoes && !(H.wear_suit.body_parts_covered & FEET))
+			if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) )
 				var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
 				if(affecting.status & ORGAN_ROBOT)
 					return

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

@@ -203,23 +203,12 @@
 	
 /obj/item/weapon/card/id/syndicate/New(mob/user as mob)
 	..()
-	var/t = reject_bad_name(input(user, "What name would you like to put on this card?\nNode:  You can change this later by clicking on the ID card while it's in your hand.", "Agent card name", ishuman(user) ? user.real_name : user.name))
-	if(!t) 
-		alert("Invalid name.")
-		if(!registered_name) 
-			registered_name = ishuman(user) ? user.real_name : user.name
+	if(!isnull(user)) // Runtime prevention on laggy starts or where users log out because of lag at round start.
+		registered_name = ishuman(user) ? user.real_name : user.name
 	else
-		registered_name = t
-	var/u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN)
-	if(!u)
-		alert("Invalid assignment.")
-		assignment = "Assistant"
-	else
-		assignment = u
-	name = "[registered_name]'s ID Card ([assignment])"
-	user << "\blue You successfully forge the ID card."
-	registered_user = user
-	
+		registered_name = "Agent Card"
+	assignment = "Agent"
+	name = "[registered_name]'s ID Card ([assignment])"		
 
 /obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity)
 	if(!proximity) return
@@ -239,7 +228,7 @@
 			return
 		src.registered_name = t
 
-		var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN)
+		var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Agent")),1,MAX_MESSAGE_LEN)
 		if(!u)
 			alert("Invalid assignment.")
 			src.registered_name = ""
@@ -250,7 +239,7 @@
 		registered_user = user
 	else if(!registered_user || registered_user == user)
 
-		if(!registered_user) registered_user = user  // First one to pick it up is the owner if there is ever a wild case New() doens't work.
+		if(!registered_user) registered_user = user  // 
 
 		switch(alert("Would you like to display the ID, or retitle it?","Choose.","Rename","Show"))
 			if("Rename")
@@ -263,7 +252,6 @@
 				var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN)
 				if(!u)
 					alert("Invalid assignment.")
-					src.registered_name = ""
 					return
 				src.assignment = u
 				src.name = "[src.registered_name]'s ID Card ([src.assignment])"

code/game/objects/items/weapons/storage/secure.dm

@@ -32,6 +32,12 @@
 		..()
 		usr << text("The service panel is [src.open ? "open" : "closed"].")
 
+	attack_alien(mob/user as mob)
+		return attack_hand(user)
+
+	attack_paw(mob/user as mob)
+		return attack_hand(user)
+
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		if(locked)
 			if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (!src.emagged))

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

@@ -15,7 +15,8 @@
 	var/distribute_pressure = ONE_ATMOSPHERE
 	var/integrity = 3
 	var/volume = 70
-
+	var/manipulated_by = null		//Used by _onclick/hud/screen_objects.dm internals to determine if someone has messed with our tank or not.
+						//If they have and we haven't scanned it with the PDA or gas analyzer then we might just breath whatever they put in it.
 /obj/item/weapon/tank/New()
 	..()
 
@@ -86,7 +87,7 @@
 			O << "\red [user] has used [W] on \icon[icon] [src]"
 
 		var/pressure = air_contents.return_pressure()
-
+		manipulated_by = user.real_name			//This person is aware of the contents of the tank.
 		var/total_moles = air_contents.total_moles()
 
 		user << "\blue Results of analysis of \icon[icon]"
@@ -261,4 +262,4 @@
 			integrity--
 
 	else if(integrity < 3)
-		integrity++
+		integrity++