diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 690d67599a71..d4d6b0fd726a 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -7,7 +7,7 @@ hitsound = 'sound/weapons/smash.ogg' flags_1 = CONDUCT_1 throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_BULKY throw_speed = 2 throw_range = 7 force = 10 @@ -15,7 +15,7 @@ attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") dog_fashion = /datum/dog_fashion/back resistance_flags = FIRE_PROOF - var/max_water = 50 + var/max_water = 100 var/last_use = 1 var/chem = /datum/reagent/water var/safety = TRUE @@ -54,6 +54,8 @@ desc = "Used to stop thermonuclear fires from spreading inside your engine." icon_state = "foam_extinguisher0" //item_state = "foam_extinguisher" needs sprite + max_water = 150 + w_class = WEIGHT_CLASS_NORMAL dog_fashion = null chem = /datum/reagent/firefighting_foam tanktype = /obj/structure/reagent_dispensers/foamtank diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 0631555566ab..e850a35317f3 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -128,6 +128,7 @@ new /obj/item/clothing/mask/breath(src) new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/reagent_containers/autoinjector/medipen(src) + new /obj/item/extinguisher/mini(src) if(HAS_TRAIT(SSstation, STATION_TRAIT_PREMIUM_INTERNALS)) new /obj/item/flashlight/flare(src) @@ -142,6 +143,7 @@ new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/crowbar/red(src) new /obj/item/gps/mining(src) + new /obj/item/extinguisher/mini(src) new /obj/item/reagent_containers/autoinjector/medipen(src) // Engineer survival box @@ -149,6 +151,7 @@ new /obj/item/clothing/mask/breath(src) new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/reagent_containers/autoinjector/medipen(src) + new /obj/item/extinguisher/mini(src) /obj/item/storage/box/engineer/radio/PopulateContents() ..() // we want the regular items too. @@ -158,12 +161,14 @@ /obj/item/storage/box/syndie/PopulateContents() new /obj/item/clothing/mask/gas/syndicate(src) new /obj/item/tank/internals/emergency_oxygen/engi(src) + new /obj/item/extinguisher/mini(src) // Security survival box /obj/item/storage/box/security/PopulateContents() new /obj/item/clothing/mask/gas/sechailer(src) new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/reagent_containers/autoinjector/medipen(src) + new /obj/item/extinguisher/mini(src) /obj/item/storage/box/security/radio/PopulateContents() ..() // we want the regular stuff too @@ -174,6 +179,7 @@ new /obj/item/clothing/mask/breath(src) new /obj/item/tank/internals/plasmaman/belt/full(src) new /obj/item/reagent_containers/autoinjector/medipen(src) + new /obj/item/extinguisher/mini(src) /obj/item/storage/box/plasmaman/miner/PopulateContents() //mining box for plasmemes new /obj/item/clothing/mask/gas/explorer(src) @@ -181,6 +187,7 @@ new /obj/item/crowbar/red(src) new /obj/item/gps/mining(src) new /obj/item/reagent_containers/autoinjector/medipen(src) + new /obj/item/extinguisher/mini(src) /obj/item/storage/box/gloves name = "box of latex gloves" diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index e82ffdd224cf..584562e7d194 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -54,6 +54,7 @@ new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400, VENDING_MINEBOT), new /datum/data/mining_equipment("Minebot Cooldown Upgrade", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600, VENDING_MINEBOT), new /datum/data/mining_equipment("Minebot AI Upgrade", /obj/item/slimepotion/slime/sentience/mining, 1000, VENDING_MINEBOT), + new /datum/data/mining_equipment("Pocket Fire Extinguisher", /obj/item/extinguisher/mini, 50, VENDING_EQUIPMENT), new /datum/data/mining_equipment("Lesser Mining Charge", /obj/item/grenade/plastic/miningcharge/lesser, 300, VENDING_EQUIPMENT), new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500, VENDING_EQUIPMENT), new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000, VENDING_EQUIPMENT), @@ -267,6 +268,7 @@ new /datum/data/mining_equipment("Extra ID", /obj/item/card/id/mining, 250, VENDING_MISC), new /datum/data/mining_equipment("Monkey Cube", /obj/item/reagent_containers/food/snacks/monkeycube, 300, VENDING_MISC), new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000, VENDING_MISC), + new /datum/data/mining_equipment("Pocket Fire Extinguisher", /obj/item/extinguisher/mini, 50, VENDING_EQUIPMENT), new /datum/data/mining_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250, VENDING_EQUIPMENT), new /datum/data/mining_equipment("Toolbelt", /obj/item/storage/belt/utility, 350, VENDING_EQUIPMENT), new /datum/data/mining_equipment("Random Poster", /obj/item/poster/random_official, 200, VENDING_MISC), @@ -311,6 +313,7 @@ new /datum/data/mining_equipment("Mecha Plasma Generator", /obj/item/mecha_parts/mecha_equipment/generator, 1500, VENDING_MECHA), new /datum/data/mining_equipment("Diamond Mecha Drill", /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill, 2000, VENDING_MECHA), new /datum/data/mining_equipment("Mecha Plasma Cutter", /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma, 3000, VENDING_MECHA), + new /datum/data/mining_equipment("Pocket Fire Extinguisher", /obj/item/extinguisher/mini, 50, VENDING_EQUIPMENT), new /datum/data/mining_equipment("Lesser Mining Charge", /obj/item/grenade/plastic/miningcharge/lesser, 300, VENDING_EQUIPMENT), new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500, VENDING_EQUIPMENT), new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000, VENDING_EQUIPMENT),