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

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/modules/mob/dead/observer/observer.dm

@@ -453,6 +453,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		src << "<span class='warning'>You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.</span>"
 		return
 
+	var/response = alert(src, "Are you -sure- you want to become a mouse?","Are you sure you want to squeek?","Squeek!","Nope!")
+	if(response != "Squeek!") return  //Hit the wrong key...again.
+	
+
 	//find a viable mouse candidate
 	var/mob/living/simple_animal/mouse/host
 	var/obj/machinery/atmospherics/unary/vent_pump/vent_found

code/modules/paperwork/folders.dm

@@ -61,7 +61,7 @@
 
 		if(href_list["remove"])
 			var/obj/item/P = locate(href_list["remove"])
-			if(P)
+			if(P && P.loc == src)
 				P.loc = usr.loc
 				usr.put_in_hands(P)
 

code/modules/projectiles/targeting.dm

@@ -269,6 +269,7 @@ client/proc/add_gun_icons()
 		screen += usr.gun_run_icon
 
 client/proc/remove_gun_icons()
+	if(isnull(usr)) return 1 // Runtime prevention on N00k agents spawning with SMG
 	screen -= usr.item_use_icon
 	screen -= usr.gun_move_icon
 	if (target_can_move)

code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm

@@ -114,6 +114,11 @@ var/list/valid_secondary_effect_types = list(\
 #define TRIGGER_NITRO 12
 
 /obj/machinery/artifact/process()
+
+	var/turf/L = loc
+	if(isnull(L) || !istype(L)) 	// We're inside a container or on null turf, either way stop processing effects
+		return
+
 	if(my_effect)
 		my_effect.process()
 	if(secondary_effect)

code/modules/telesci/telesci_computer.dm

@@ -84,6 +84,8 @@
 	interact(user)
 
 /obj/machinery/computer/telescience/interact(mob/user)
+	user.machine = src
+	in_use = 1
 
 	var/t = "<div class='statusDisplay'>[temp_msg]</div><BR>"
 	t += "<A href='?src=\ref[src];setrotation=1'>Set Bearing</A>"
@@ -301,9 +303,10 @@
 		temp_msg = "NOTICE:<BR>Bluespace crystals ejected."
 
 	updateDialog()
+	return 1
 
 /obj/machinery/computer/telescience/proc/recalibrate()
 	teles_left = rand(30, 40)
 	angle_off = rand(-25, 25)
 	power_off = rand(-4, 0)
-	rotation_off = rand(-10, 10)
+	rotation_off = rand(-10, 10)