Merge pull request #243 from Abi79/master

Fixed a couple of bugs and made a few changes to Antiqua

code/WorkInProgress/Mini/customitems.dm

@@ -5,7 +5,6 @@
 //yes, it has to be an item, you can't pick up nonitems
 var/list/CustomItemList = list(
 		//    ckey        real_name   item path
-	//	list("miniature","Dave Booze",/obj/item/toy/crayonbox)	//screw this i dont want crayons, it's an example okay
 	list("skymarshal", "Phillip Oswald", /obj/item/weapon/coin/silver),	//Phillip likes to chew on cigars.  Just unlit cigars, don't ask me why.  Must be a clone thing.  (Cigarette machines dispense cigars if they have a coin in them)  --SkyMarshal
 	list("spaceman96", "Trenna Seber", /obj/item/weapon/pen/multi),	//For Spesss.
 	list("asanadas", "Book Berner", /obj/item/clothing/under/chameleon/psyche)

code/defines/obj/clothing/jumpsuit.dm

@@ -32,8 +32,8 @@
 
 /obj/item/clothing/under/chameleon/psyche
 	item_state = "bl_suit"
-	name = "psychedelic"
-	desc = "Groovy!"
+	name = "Groovy Jumpsuit"
+	desc = "A groovy jumpsuit! It seems to have a small dial on the wrist, that won't stop spinning."
 	icon_state = "psyche"
 	color = "psyche"
 

code/game/objects/items/clothing.dm

@@ -168,18 +168,17 @@ THERMAL GLASSES
 	if(!A)
 		return
 
-	desc = null
 	permeability_coefficient = 0.90
 
-	desc = A.desc
 	name = A.name
+	desc = A.desc
 	icon_state = A.icon_state
 	item_state = A.item_state
 	color = A.color
 
 /obj/item/clothing/under/chameleon/emp_act(severity)
-	name = "psychedelic"
-	desc = "Groovy!"
+	name = "Groovy Jumpsuit"
+	desc = "A groovy jumpsuit! It seems to have a small dial on the wrist, that won't stop spinning."
 	icon_state = "psyche"
 	color = "psyche"
 	spawn(200)
@@ -189,6 +188,9 @@ THERMAL GLASSES
 		desc = null
 	..()
 
+/obj/item/clothing/under/chameleon/psyche/emp_act(severity)
+	return
+
 /*
 /obj/item/clothing/suit/swat_suit/death_commando
 	name = "Death Commando Suit"

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])"