diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 7ae15a086f2..ebc0db47c32 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/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.
") else dat += text("Insert Prisoner ID
") - dat += "
Chemical Implants
" var/turf/Tr = null + dat += "
Chemical Implants
" 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]
" + loc_display = "[get_area(M)]" + dat += "ID: [T.id]
Subject: [M]
Location: [loc_display]
Health: [health_display]
" dat += "(Message Holder) |
" dat += "********************************
" dat += "
Lock Console" diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm index 72816600d37..a68a617f2aa 100644 --- a/code/game/objects/items/weapons/implants/implant_chem.dm +++ b/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) - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 95f2a280be6..6d5efda18b7 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -58,8 +58,6 @@ update_icon() - - /obj/item/weapon/implanter/adrenalin name = "implanter (adrenalin)" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 281537c5f77..b7eb89bfe60 100644 --- a/code/modules/clothing/clothing.dm +++ b/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)