Merge remote-tracking branch 'upstream/master'

code/modules/admin/admin.dm

@@ -1890,19 +1890,23 @@
 
 						if(istype(H.wear_id, /obj/item/device/pda))
 							var/obj/item/device/pda/PDA = H.wear_id
-							id = PDA.id								// The ID is contained inside the PDA
-						else
-							id = H.wear_id
+							if(!isnull(PDA.id))				// The PDA may contain no ID
+								id = PDA.id					// The ID is contained inside the PDA
 
-						if(!id)
-							usr << "<font color=red>ERROR:</font> Inform the coders that an [H.name] had wear_id but no ID on their ID slot."
-							dat += "<td><font color=red>ERROR</font></td>"
-						else if(isnull(id.assignment))
-							usr << "<font color=red>ERROR:</font> Inform the coders that an [id.name] was checked for its assignment variable."
+						else
+							id = H.wear_id					// The ID was on the ID slot
+
+						if(!id) 							// Happens when there's no ID in the PDA located on the wear_id slot
+							dat += "<td>[M.mind.assigned_role] (No ID)</td>"
+
+						else if(isnull(id.assignment))		// Preventing runtime errors blocking the player panel
+							usr << "<font color=red>ERROR:</font> Inform the coders that an [id.name] was checked for its assignment variable, and it was null."
 							dat += "<td><font color=red>ERROR</font></td>"
+
 						else
 							if(M.mind.assigned_role == id.assignment)			// Polymorph
 								dat += "<td>[M.mind.assigned_role]</td>"
+
 							else
 								dat += "<td>[M.mind.assigned_role] ([id.assignment])"
 

code/modules/admin/admin_verbs.dm

@@ -779,7 +779,9 @@
 	if(!istype(M, /mob/living/carbon/human))
 		usr << "\red You can only do this to humans!"
 		return
-
+	switch(alert("You sure you wish to edit this mob's appearance?",,"Yes","No"))
+		if("No")
+			return
 	var/new_facial = input("Please select facial hair color.", "Character Generation") as color
 	if(new_facial)
 		M.r_facial = hex2num(copytext(new_facial, 2, 4))

code/modules/chemical/Chemistry-Machinery.dm

@@ -156,8 +156,8 @@
 	if(stat & NOPOWER) return
 	if(!charging_reagents) return
 
-	use_power(5000)
-	src.energy += 0.01
+	use_power(10000)
+	src.energy += 0.05
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

code/modules/chemical/Chemistry-Tools.dm

@@ -172,8 +172,7 @@
 
 
 	afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
-		if (istype(target, /obj/item/weapon/storage)) return ..()
-		if (istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..()
+		if (istype(target, /obj/item/weapon/storage || istype(target, /obj/item/weapon/gun/grenadelauncher) || istype(target, /obj/structure/table))) return ..()
 		if (!src.state && stage == 2 && !crit_fail)
 			user << "\red You prime the grenade! 3 seconds!"
 			message_admins("[key_name_admin(user)] used a chemistry grenade ([src.name]).")

code/modules/recycling/disposal.dm

@@ -521,7 +521,7 @@
 			else if (istype(AM, /mob))	//If there is a mob somewhere in there....
 				tagOverride = 1
 		if(tagOverride)
-			if(prob(50))
+			if(prob(25))
 				src.destinationTag = null	//Then 50% chance of going to the mail room!
 
 

code/modules/recycling/sortingmachinery.dm

@@ -54,6 +54,8 @@
 
 	examine()
 		set src in oview(4)
+		if(sortTag)
+			usr << "\blue It is labeled \"[sortTag]\""
 		if(examtext)
 			usr << examtext
 		..()
@@ -111,6 +113,8 @@
 
 	examine()
 		set src in oview(4)
+		if(sortTag)
+			usr << "\blue It is labeled \"[sortTag]\""
 		if(examtext)
 			usr << examtext
 		..()

code/modules/research/destructive_analyzer.dm

@@ -90,6 +90,9 @@ Note: Must be placed within 3 tiles of the R&D Console
 			busy = 1
 			loaded_item = O
 			user.drop_item()
+			if(istype(O,/obj/item/weapon/storage))
+				var/obj/item/weapon/storage/L = O
+				L.close(user)
 			O.loc = src
 			user << "\blue You add the [O.name] to the machine!"
 			flick("d_analyzer_la", src)

code/modules/security levels/security levels.dm

@@ -61,7 +61,7 @@
 
 				// trigger a response team
 				spawn
-					sleep(6000)
+					sleep(100)
 					if(security_level == SEC_LEVEL_RED) trigger_armed_response_team()
 			if(SEC_LEVEL_DELTA)
 				world << "<font size=4 color='red'>Attention! Delta security level reached!</font>"