Skip to content

Commit

Permalink
-The shuttle will not stop creating holes when it is on fire.
Browse files Browse the repository at this point in the history
-Aliens will be able to recover plasma even when they have cloneloss damage. Previously, if they did have any amount of cloneloss damage they wouldn't be able to regain plasma at all.
-Runtime fixes for IDs.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5522 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
[email protected] committed Jan 11, 2013
1 parent db1cd83 commit 5cbb7b4
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 19 deletions.
6 changes: 3 additions & 3 deletions code/FEA/FEA_fire.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -168,8 +167,9 @@
dir = pick(cardinal)
return

/*
/obj/effect/hotspot/Del()
if (istype(loc, /turf/simulated))
DestroyTurf()
..()
return
*/
3 changes: 3 additions & 0 deletions code/modules/clothing/glasses/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/alien/alien.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
33 changes: 18 additions & 15 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 5cbb7b4

Please sign in to comment.