This commit is contained in:
Ikarrus
2015-06-28 12:11:05 -06:00
parent 7894263033
commit d07e315ddf
8 changed files with 18 additions and 3 deletions
@@ -2,6 +2,8 @@
name = "cabinet"
desc = "Old will forever be in fashion."
icon_state = "cabinet"
burn_state = 0 //Burnable
burntime = 20
/obj/structure/closet/acloset
name = "strange closet"
@@ -108,4 +108,6 @@
/obj/structure/closet/coffin
name = "coffin"
desc = "It's a burial receptacle for the dearly departed."
icon_state = "coffin"
icon_state = "coffin"
burn_state = 0 //Burnable
burntime = 20
@@ -2,6 +2,8 @@
name = "booze storage"
req_access = list(access_bar)
icon_state = "cabinet"
burn_state = 0 //Burnable
burntime = 20
/obj/structure/closet/secure_closet/bar/New()
..()
@@ -26,6 +26,7 @@
/obj/structure/closet/secure_closet/personal/cabinet
icon_state = "cabinet"
burn_state = 0 //Burnable
burntime = 20
/obj/structure/closet/secure_closet/personal/cabinet/New()
..()
@@ -156,6 +156,7 @@
req_access = list(access_forensics_lockers)
icon_state = "cabinet"
burn_state = 0 //Burnable
burntime = 20
/obj/structure/closet/secure_closet/detective/New()
..()
+7
View File
@@ -8,6 +8,10 @@
MakeHood()
..()
/obj/item/clothing/suit/hooded/Destroy()
qdel(hood)
..()
/obj/item/clothing/suit/hooded/proc/MakeHood()
if(!hood)
var/obj/item/clothing/head/winterhood/W = new hoodtype(src)
@@ -93,6 +97,9 @@
verbs -= /obj/item/clothing/suit/space/hardsuit/verb/Jetpack
verbs -= /obj/item/clothing/suit/space/hardsuit/verb/Jetpack_Rockets
..()
/obj/item/clothing/suit/space/hardsuit/Destroy()
qdel(helmet)
..()
/obj/item/clothing/suit/space/hardsuit/proc/MakeHelmet()
if(!helmettype)
@@ -12,7 +12,7 @@
health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute
if( ((maxHealth - total_burn) < config.health_threshold_dead) && stat == DEAD )
ChangeToHusk()
if(bodytemperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
if(on_fire)
shred_clothing()
med_hud_set_health()
med_hud_set_status()
@@ -463,7 +463,7 @@
Item.loc = src.loc
spawn(1) //so the shreds aren't instantly deleted by the explosion
var/obj/effect/decal/cleanable/shreds/Shreds = new(loc)
Shreds.desc = "The sad remains of what used to be a glorious [src.name]."
Shreds.desc = "The sad remains of what used to be [src.name]."
qdel(src)
else
burn()