From b775da4e603599c71641fd7884c72723897837da Mon Sep 17 00:00:00 2001 From: paprka Date: Tue, 30 Sep 2014 12:38:59 -0700 Subject: [PATCH 1/2] extinguish fires --- code/game/objects/items/weapons/extinguisher.dm | 2 +- code/game/objects/items/weapons/storage/belt.dm | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 3b8180c78f8..b4aa07a66bf 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -19,7 +19,7 @@ var/sprite_name = "fire_extinguisher" /obj/item/weapon/extinguisher/mini - name = "fire extinguisher" + name = "pocket fire extinguisher" desc = "A light and compact fibreglass-framed model fire extinguisher." icon_state = "miniFE0" item_state = "miniFE" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 8176a178ea0..f81ecd83e2e 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -50,8 +50,9 @@ /obj/item/device/flashlight, /obj/item/stack/cable_coil, /obj/item/device/t_scanner, - /obj/item/device/analyzer) - + /obj/item/device/analyzer), + /obj/item/weapon/extinguisher/mini + ) /obj/item/weapon/storage/belt/utility/full/New() ..() @@ -71,6 +72,7 @@ new /obj/item/weapon/crowbar(src) new /obj/item/weapon/wirecutters(src) new /obj/item/device/t_scanner(src) + new /obj/item/weapon/extinguisher/mini(src) @@ -91,8 +93,9 @@ /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/pill_bottle, /obj/item/stack/medical, - /obj/item/device/flashlight/pen - ) + /obj/item/device/flashlight/pen, + /obj/item/weapon/extinguisher/mini + ) /obj/item/weapon/storage/belt/security From 93d160ed687cbe695b85982088d520777a32067d Mon Sep 17 00:00:00 2001 From: paprka Date: Tue, 30 Sep 2014 13:14:44 -0700 Subject: [PATCH 2/2] compile fix --- code/game/objects/items/weapons/storage/belt.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index f81ecd83e2e..716958d35f6 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -50,7 +50,7 @@ /obj/item/device/flashlight, /obj/item/stack/cable_coil, /obj/item/device/t_scanner, - /obj/item/device/analyzer), + /obj/item/device/analyzer, /obj/item/weapon/extinguisher/mini )