shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270

Browse Source 
[MIRROR] [READY] advanced foam extinguisers [READY]
This commit is contained in:
LetterJay
2018-06-18 12:28:42 -05:00
committed by GitHub
parent 119fb6abf6 343a20ed41
commit fb53413ded
6 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/packs.dm
+10 -2
View File
@@ -102,8 +102,8 @@
/obj/item/flashlight,
/obj/item/tank/internals/oxygen/red,
/obj/item/tank/internals/oxygen/red,
/obj/item/extinguisher,
/obj/item/extinguisher,
/obj/item/extinguisher/advanced,
/obj/item/extinguisher/advanced,
/obj/item/clothing/head/hardhat/red,
/obj/item/clothing/head/hardhat/red)
crate_name = "firefighting crate"
@@ -1000,6 +1000,14 @@
crate_name = "water tank crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/materials/foamtank
name = "Foam Tank Crate"
desc = "Contains plasmamen's bane."
cost = 1500
contains = list(/obj/structure/reagent_dispensers/foamtank)
crate_name = "foam tank crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/materials/hightank
name = "Large Water Tank Crate"
desc = "Contains a high-capacity water tank. Useful for botany or other service jobs."
code/modules/reagents/reagent_dispenser.dm
+7
View File
@@ -51,6 +51,13 @@
icon_state = "water_high" //I was gonna clean my room...
tank_volume = 100000
/obj/structure/reagent_dispensers/foamtank
name = "firefoam tank"
desc = "A tank full of foaming things."
icon_state = "foam"
reagent_id = "firefighting_foam"
tank_volume = 500
/obj/structure/reagent_dispensers/fueltank
name = "fuel tank"
desc = "A tank full of industrial welding fuel. Do not consume."