From c6011bb853b9f2754ffe5e5cc38ae22b71b451f7 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 4 Mar 2019 23:35:25 -0500 Subject: [PATCH 01/10] Update extinguisher.dm --- code/game/objects/items/extinguisher.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index a57bf47a2e..b84fa15c33 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -226,7 +226,7 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) - +/* /obj/item/extinguisher/AltClick(mob/user) if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return @@ -242,3 +242,4 @@ theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS) user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "You quietly empty out \the [src] using its release valve.") +/* From eb80b6f6cda782affdd7dd0624b18eb483c49881 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 5 Mar 2019 00:29:20 -0500 Subject: [PATCH 02/10] ? --- code/game/objects/items/extinguisher.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index b84fa15c33..32fb300851 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -226,6 +226,7 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) + /* /obj/item/extinguisher/AltClick(mob/user) if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) From 8f02bf0357bc92ae33b9628c697215240805a6e3 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 5 Mar 2019 00:33:53 -0500 Subject: [PATCH 03/10] Oh I did a goof --- code/game/objects/items/extinguisher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 32fb300851..179dc823c8 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -243,4 +243,4 @@ theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS) user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "You quietly empty out \the [src] using its release valve.") -/* +*/ From a0b38d0ed719febf93a8cb4bbb9d1c3af41da208 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 5 Mar 2019 03:34:38 -0500 Subject: [PATCH 04/10] Update extinguisher.dm --- code/game/objects/items/extinguisher.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 179dc823c8..93dcedf582 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -227,8 +227,7 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) -/* -/obj/item/extinguisher/AltClick(mob/user) +/obj/item/extinguisher//attackby(obj/item/W, mob/user, params) if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return EmptyExtinguisher(user) @@ -243,4 +242,4 @@ theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS) user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "You quietly empty out \the [src] using its release valve.") -*/ + From 1228bb4b110989e366b5ed23160ebef535e4f439 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 5 Mar 2019 15:37:27 -0500 Subject: [PATCH 05/10] Update extinguisher.dm --- code/game/objects/items/extinguisher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 93dcedf582..ad74de3b7c 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -227,7 +227,7 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) -/obj/item/extinguisher//attackby(obj/item/W, mob/user, params) +/obj/item/extinguisher/attackby(/obj/item/screwdriver_act() procs) if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return EmptyExtinguisher(user) From 8a5b4414a363c3092f444f61bd2f24408a306348 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 5 Mar 2019 16:37:22 -0500 Subject: [PATCH 06/10] Update extinguisher.dm --- code/game/objects/items/extinguisher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index ad74de3b7c..e0d6b553fd 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -227,7 +227,7 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) -/obj/item/extinguisher/attackby(/obj/item/screwdriver_act() procs) +/obj/item/extinguisher/screwdriver_act(mob/user, obj/item/tool) if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return EmptyExtinguisher(user) From 371a4a1a9ecdef18ef4741607d8dc896d322ef77 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 6 Mar 2019 16:45:47 -0500 Subject: [PATCH 07/10] Maybe --- code/game/objects/items/extinguisher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index e0d6b553fd..a2332b1f6d 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -227,7 +227,7 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) -/obj/item/extinguisher/screwdriver_act(mob/user, obj/item/tool) +/obj/item/extinguisher/screwdriver_act() if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return EmptyExtinguisher(user) From fdad1c30be5458da3c021175d9d044814f055a24 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 6 Mar 2019 17:05:54 -0500 Subject: [PATCH 08/10] ? --- code/game/objects/items/extinguisher.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index a2332b1f6d..44c0182c1b 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -227,10 +227,10 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) -/obj/item/extinguisher/screwdriver_act() +/obj/item/extinguisher/screwdriver_act( if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return - EmptyExtinguisher(user) + EmptyExtinguisher(user)) /obj/item/extinguisher/proc/EmptyExtinguisher(var/mob/user) if(loc == user && reagents.total_volume) From 7c794847845e812e884a0141be845aba410e303e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 6 Mar 2019 20:05:53 -0500 Subject: [PATCH 09/10] Update extinguisher.dm --- code/game/objects/items/extinguisher.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 44c0182c1b..a2332b1f6d 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -227,10 +227,10 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) -/obj/item/extinguisher/screwdriver_act( +/obj/item/extinguisher/screwdriver_act() if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return - EmptyExtinguisher(user)) + EmptyExtinguisher(user) /obj/item/extinguisher/proc/EmptyExtinguisher(var/mob/user) if(loc == user && reagents.total_volume) From bda18c077013f836d0765eac6854d3d263025e2a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 6 Mar 2019 20:32:40 -0500 Subject: [PATCH 10/10] Update extinguisher.dm --- code/game/objects/items/extinguisher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index a2332b1f6d..e0d6b553fd 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -227,7 +227,7 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) -/obj/item/extinguisher/screwdriver_act() +/obj/item/extinguisher/screwdriver_act(mob/user, obj/item/tool) if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return EmptyExtinguisher(user)