Merge pull request #4766 from Kyep/parole

Parole

code/game/machinery/computer/prisoner.dm

@@ -38,13 +38,12 @@
 			dat += text("Space Law recommends sentences of 100 points per minute they would normally serve in the brig.<BR>")
 		else
 			dat += text("<A href='?src=\ref[src];id=0'>Insert Prisoner ID</A><br>")
-		dat += "<HR>Chemical Implants<BR>"
 		var/turf/Tr = null
+		dat += "<HR>Chemical Implants<BR>"
 		for(var/obj/item/weapon/implant/chem/C in tracked_implants)
 			Tr = get_turf(C)
 			if((Tr) && (Tr.z != src.z))	continue//Out of range
 			if(!C.implanted) continue
-
 			// AUTOFIXED BY fix_string_idiocy.py
 			// C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\computer\prisoner.dm:41: dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: "
 			dat += {"[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject:
@@ -58,12 +57,17 @@
 			Tr = get_turf(T)
 			if((Tr) && (Tr.z != src.z))	continue//Out of range
 			if(!T.implanted) continue
-			var/loc_display = "Unknown"
 			var/mob/living/carbon/M = T.imp_in
+			var/loc_display = "Unknown"
+			var/health_display = "OK"
+			var/total_loss = (M.maxHealth - M.health)
+			if(M.stat == DEAD)
+				health_display = "DEAD"
+			else if(total_loss)
+				health_display = "HURT ([total_loss])"
 			if((M.z in config.station_levels) && !istype(M.loc, /turf/space))
-				var/turf/mob_loc = get_turf(M)
-				loc_display = mob_loc.loc
-			dat += "ID: [T.id] | Location: [loc_display]<BR>"
+				loc_display = "[get_area(M)]"
+			dat += "ID: [T.id] <BR>Subject: [M] <BR>Location: [loc_display] <BR>Health: [health_display] <BR>"
 			dat += "<A href='?src=\ref[src];warn=\ref[T]'>(<font color=red><i>Message Holder</i></font>)</A> |<BR>"
 			dat += "********************************<BR>"
 		dat += "<HR><A href='?src=\ref[src];lock=1'>Lock Console</A>"

code/game/objects/items/weapons/implants/implant_chem.dm

@@ -58,4 +58,4 @@
 
 /obj/item/weapon/implantcase/chem/New()
 	imp = new /obj/item/weapon/implant/chem(src)
-	..()
+	..()

code/game/objects/items/weapons/implants/implanter.dm

@@ -58,8 +58,6 @@
 		update_icon()
 
 
-
-
 /obj/item/weapon/implanter/adrenalin
 	name = "implanter (adrenalin)"
 

code/modules/clothing/clothing.dm

@@ -95,7 +95,7 @@
 		..()
 		return
 
-	if(flags & NODROP)
+	if(!usr.canUnEquip(src))
 		return
 
 	var/obj/item/clothing/ears/O
@@ -634,8 +634,10 @@ BLIND     // can't see anything
 		//makes sure that the clothing is equipped so that we can't drag it into our hand from miles away.
 		if(!(src.loc == usr))
 			return
-
 		if(!( usr.restrained() ) && !( usr.stat ) && ( over_object ))
+			if(!usr.canUnEquip(src))
+				to_chat(usr, "[src] appears stuck on you!")
+				return
 			switch(over_object.name)
 				if("r_hand")
 					usr.unEquip(src)