From 2cf63eaf2088534c65f1b13f82bd379658dfe8c7 Mon Sep 17 00:00:00 2001 From: Tacolizard Date: Mon, 12 Jun 2017 12:15:52 -0700 Subject: [PATCH 1/2] this shits fire --- code/game/objects/items/weapons/flamethrower.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 code/game/objects/items/weapons/flamethrower.dm diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm old mode 100644 new mode 100755 index 3a04008a98c..071c844a0c4 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -23,7 +23,7 @@ //variables for prebuilt flamethrowers var/create_full = FALSE var/create_with_tank = FALSE - var/igniter_type = /obj/item/device/assembly/igniter + var/igniter_type = /obj/item/device/assembly/igniter /obj/item/weapon/flamethrower/Destroy() if(weldtool) @@ -145,7 +145,10 @@ if(!status) to_chat(user, "Secure the igniter first!") return - to_chat(user, "You ignite [src]!") + if(!lit) + to_chat(user, "You ignite [src]!") + else + to_chat(user, "You extinguish [src]!") lit = !lit if(lit) START_PROCESSING(SSobj, src) From 49b6c29641eb8150845cee4be72a71bc382a65ef Mon Sep 17 00:00:00 2001 From: Tacolizard Date: Mon, 12 Jun 2017 13:14:40 -0700 Subject: [PATCH 2/2] maintainers force me --- code/game/objects/items/weapons/flamethrower.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 071c844a0c4..8ea4e7a5d13 100755 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -145,10 +145,7 @@ if(!status) to_chat(user, "Secure the igniter first!") return - if(!lit) - to_chat(user, "You ignite [src]!") - else - to_chat(user, "You extinguish [src]!") + to_chat(user, "You [lit ? "extinguish" : "ignite"] [src]!") lit = !lit if(lit) START_PROCESSING(SSobj, src) @@ -241,4 +238,4 @@ return /obj/item/device/assembly/igniter/proc/ignite_turf(obj/item/weapon/flamethrower/F,turf/open/location,release_amount = 0.05) - F.default_ignite(location,release_amount) \ No newline at end of file + F.default_ignite(location,release_amount)