cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reverted previous changes to fire closets and emergency closets.

Browse Source 
The spawn percentages seemed weird. In addition it didn't make much sense to have fire closets spawning at random in the hallways. Stations obviously wouldn't have fire closets just sitting in the hallways, they'd be tucked away in maintenance areas to be used when needed. I've added fire closets to various key areas on the station in maintenance areas, atmos, etc. to ensure that fire equipment is readily accesible.

Additionally, due to the specific-placement I've undone the random spawn potential for items in fire closets, which again didnt' make much sense. They will all now spawn with the appropriate equipment.

Discussed this a bit in IRC before going through with this.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@815 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
hunterluthi
2011-01-08 19:09:12 +00:00
parent ea7ca65ab3
commit e28a9f1204
3 changed files with 5502 additions and 5491 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/closets/emergency.dm
+4 -3
View File
@@ -4,7 +4,7 @@
if (prob(40))
new /obj/item/weapon/storage/toolbox/emergency(src)
switch (pickweight(list("fire" = 15, "small" = 30, "aid" = 15, "tank" = 5, "both" = 5, "nothing" = 4, "delete" = 1)))
switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
if ("small")
new /obj/item/weapon/tank/emergency_oxygen(src)
new /obj/item/weapon/tank/emergency_oxygen(src)
@@ -27,6 +27,7 @@
if ("delete")
del(src)
if ("fire")
//If you want to re-add fire, just add "fire" = 15 to the pick list.
/*if ("fire")
new /obj/closet/firecloset(src.loc)
del(src)
del(src)*/
code/game/objects/closets/firecloset.dm
+7 -2
View File
@@ -5,7 +5,12 @@
del(src)
return
switch (pickweight(list("nothing" = 5, "bare-bones" = 35, "basic" = 40, "pickpocketed" = 10, "untouched" = 10)))
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/tank/emergency_oxygen(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/clothing/suit/fire/firefighter(src)
/*switch (pickweight(list("nothing" = 5, "bare-bones" = 35, "basic" = 40, "pickpocketed" = 10, "untouched" = 10)))
if ("nothing")
//better luck next time
if ("bare-bones")
@@ -24,4 +29,4 @@
new /obj/item/weapon/tank/oxygen(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/head/helmet/hardhat(src)
new /obj/item/clothing/head/helmet/hardhat(src)*/