diff --git a/code/FEA/FEA_fire.dm b/code/FEA/FEA_fire.dm index 1bd31295e88..df10c3cbb4a 100644 --- a/code/FEA/FEA_fire.dm +++ b/code/FEA/FEA_fire.dm @@ -45,7 +45,6 @@ return igniting - //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile /obj/effect/hotspot anchored = 1 @@ -130,7 +129,7 @@ if(temperature > location.max_fire_temperature_sustained) location.max_fire_temperature_sustained = temperature - if(temperature > location.heat_capacity) + if(location.heat_capacity && temperature > location.heat_capacity) location.to_be_destroyed = 1 /*if(prob(25)) location.ReplaceWithSpace() @@ -168,8 +167,9 @@ dir = pick(cardinal) return +/* /obj/effect/hotspot/Del() if (istype(loc, /turf/simulated)) DestroyTurf() ..() - return \ No newline at end of file +*/ \ No newline at end of file diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index c1664274041..97ed07c7bb4 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -89,6 +89,9 @@ if(I) C.images += image(tempHud, perp, "hud[ckey(I.GetJobName())]") perpname = I.registered_name + else + perpname = perp.name + C.images += image(tempHud, perp, "hudunknown") else perpname = perp.name C.images += image(tempHud, perp, "hudunknown") diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 21c6fc73e0f..eefc85e47a6 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -61,7 +61,7 @@ //If there are alien weeds on the ground then heal if needed or give some toxins if(locate(/obj/effect/alien/weeds) in loc) - if(health >= maxHealth) + if(health >= maxHealth - getCloneLoss()) adjustToxLoss(plasma_rate) else adjustBruteLoss(-heal_rate) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 19e97de3fdc..5fb2a58b69a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -509,29 +509,32 @@ return */ - var/perpname = "wot" var/modified = 0 - + var/perpname = "wot" if(wear_id) var/obj/item/weapon/card/id/I = wear_id.GetID() - perpname = I.registered_name + if(I) + perpname = I.registered_name + else + perpname = name else - perpname = src.name + perpname = name - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if (R.fields["id"] == E.fields["id"]) + if(perpname) + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.security) + if (R.fields["id"] == E.fields["id"]) - var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel") + var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel") - if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud)) - if(setcriminal != "Cancel") - R.fields["criminal"] = setcriminal - modified = 1 + if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud)) + if(setcriminal != "Cancel") + R.fields["criminal"] = setcriminal + modified = 1 - spawn() - H.handle_regular_hud_updates() + spawn() + H.handle_regular_hud_updates() if(!modified) usr << "\red Unable to locate a data core entry for this person."