From 42ec0e6c5ee6f7350e85d23a84929450d7456362 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 13:26:04 +0200 Subject: [PATCH 01/13] fix --- code/game/objects/items/backpack_sprayers.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index 09f620c345d5..4d25bbc73047 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -8,6 +8,7 @@ w_class = SIZE_LARGE flags_equip_slot = SLOT_BACK flags_atom = OPENCONTAINER + possible_transfer_amounts = null//no point giving it possibility when mister can't it just confuse people volume = 500 var/fill_reagent = "water" var/spawn_empty = FALSE @@ -132,7 +133,7 @@ item_state = "nozzle" w_class = SIZE_LARGE flags_equip_slot = null - amount_per_transfer_from_this = 50 + amount_per_transfer_from_this = 5 possible_transfer_amounts = null spray_size = 5 volume = 500 From 08c3cafffd2669345aa84c2ea64b9be729d4e75e Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 13:43:11 +0200 Subject: [PATCH 02/13] fix hidden bug toggle ;ister was usr change it to user --- code/game/objects/items/backpack_sprayers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index 4d25bbc73047..c0fd8a17caef 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -84,7 +84,7 @@ /obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb() set name = "Toggle Mister" set category = "Object" - toggle_mister(usr) + toggle_mister(user) /obj/item/reagent_container/glass/watertank/MouseDrop(obj/over_object as obj) if(!CAN_PICKUP(usr, src)) From 7202801fb9ff4ed4955f33f6eb339fe07c563303 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 13:46:30 +0200 Subject: [PATCH 03/13] gsoguhouh --- code/game/objects/items/backpack_sprayers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index c0fd8a17caef..ca05d8a99c8e 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -81,7 +81,7 @@ else . = ..() -/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb() +/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb(mob/living/user) set name = "Toggle Mister" set category = "Object" toggle_mister(user) From 0888d18bc5c07aba4dac0a3c6525e4097aa2711f Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 13:57:51 +0200 Subject: [PATCH 04/13] fifowjgpojapsojg --- code/game/objects/items/backpack_sprayers.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index ca05d8a99c8e..c0e91323f615 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -81,10 +81,12 @@ else . = ..() -/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb(mob/living/user) +/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb(mob/user, list/modifiers) set name = "Toggle Mister" set category = "Object" - toggle_mister(user) + if(user.get_item_by_slot(WEAR_BACK) == src) + toggle_mister(user) + /obj/item/reagent_container/glass/watertank/MouseDrop(obj/over_object as obj) if(!CAN_PICKUP(usr, src)) From 96e773ba96f8607da248667d763ed5f9221880ab Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 14:00:42 +0200 Subject: [PATCH 05/13] ahagjrsjtsr --- code/game/objects/items/backpack_sprayers.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index c0e91323f615..abb6f7b5c273 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -84,8 +84,9 @@ /obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb(mob/user, list/modifiers) set name = "Toggle Mister" set category = "Object" - if(user.get_item_by_slot(WEAR_BACK) == src) - toggle_mister(user) + + if(user.get_item_by_slot(WEAR_BACK) == src) + toggle_mister(user) /obj/item/reagent_container/glass/watertank/MouseDrop(obj/over_object as obj) From 3ecec083eaad0005a8e504be4c982b882683d12f Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 14:05:50 +0200 Subject: [PATCH 06/13] sdsgehsjsyjyj --- code/game/objects/items/backpack_sprayers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index abb6f7b5c273..15e2ad3c4601 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -81,7 +81,7 @@ else . = ..() -/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb(mob/user, list/modifiers) +/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb() set name = "Toggle Mister" set category = "Object" From 1286d66783032c4ce8876b2ad04b52c8dc4ee210 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 14:07:26 +0200 Subject: [PATCH 07/13] eragagaeh --- code/game/objects/items/backpack_sprayers.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index 15e2ad3c4601..85da50cdfa07 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -81,12 +81,11 @@ else . = ..() -/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb() +/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb(mob/user) set name = "Toggle Mister" set category = "Object" - if(user.get_item_by_slot(WEAR_BACK) == src) - toggle_mister(user) + toggle_mister(user) /obj/item/reagent_container/glass/watertank/MouseDrop(obj/over_object as obj) From 36414fc4480557a1146c795c78839ef407b4c627 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 14:14:32 +0200 Subject: [PATCH 08/13] sgRHQDFH --- code/game/objects/items/backpack_sprayers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index 85da50cdfa07..4dd6138b51cb 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -81,11 +81,11 @@ else . = ..() -/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb(mob/user) +/obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb() set name = "Toggle Mister" set category = "Object" - toggle_mister(user) + toggle_mister() /obj/item/reagent_container/glass/watertank/MouseDrop(obj/over_object as obj) From 36c847665e8ec137b6495a5c6c357e2511da236f Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 14:31:25 +0200 Subject: [PATCH 09/13] spacing --- code/game/objects/items/backpack_sprayers.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index 4dd6138b51cb..b654b6b9e994 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -84,10 +84,8 @@ /obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb() set name = "Toggle Mister" set category = "Object" - toggle_mister() - /obj/item/reagent_container/glass/watertank/MouseDrop(obj/over_object as obj) if(!CAN_PICKUP(usr, src)) return ..() From bcd6423e94f5793c67bce3411d724b75412c3dd2 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 15:12:19 +0200 Subject: [PATCH 10/13] sdsg --- code/game/objects/items/backpack_sprayers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index b654b6b9e994..3bbb987e6735 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -84,7 +84,7 @@ /obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb() set name = "Toggle Mister" set category = "Object" - toggle_mister() + toggle_mister(src) /obj/item/reagent_container/glass/watertank/MouseDrop(obj/over_object as obj) if(!CAN_PICKUP(usr, src)) From c90b76d3f9a0aa3c3e224bcb1520589769895d28 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 15:27:33 +0200 Subject: [PATCH 11/13] rgjiprgjpijpigjpp --- code/game/objects/items/backpack_sprayers.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index 3bbb987e6735..1022e149a9e1 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -80,11 +80,17 @@ remove_noz() else . = ..() - +/* /obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb() set name = "Toggle Mister" set category = "Object" toggle_mister(src) +*/ + +/mob/living/carbon/human/toggle_mister_verb() + set name = "Toggle Mister" + set category = "Object" + toggle_mister() /obj/item/reagent_container/glass/watertank/MouseDrop(obj/over_object as obj) if(!CAN_PICKUP(usr, src)) From 0b437dedd66d7cf7a53e07906c0933a75cb4cb6c Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 15:31:18 +0200 Subject: [PATCH 12/13] zgshgihqrgq --- code/game/objects/items/backpack_sprayers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index 1022e149a9e1..424c82e25b84 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -87,7 +87,7 @@ toggle_mister(src) */ -/mob/living/carbon/human/toggle_mister_verb() +/mob/living/carbon/human/verb/toggle_mister_verb() set name = "Toggle Mister" set category = "Object" toggle_mister() From 061595e697c4de5733fe3ffba7ee0c209fef425e Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 11 Aug 2023 15:38:22 +0200 Subject: [PATCH 13/13] wdhwdfhqeh --- code/game/objects/items/backpack_sprayers.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/backpack_sprayers.dm b/code/game/objects/items/backpack_sprayers.dm index 424c82e25b84..427a1dd597c7 100644 --- a/code/game/objects/items/backpack_sprayers.dm +++ b/code/game/objects/items/backpack_sprayers.dm @@ -80,17 +80,13 @@ remove_noz() else . = ..() -/* + /obj/item/reagent_container/glass/watertank/verb/toggle_mister_verb() set name = "Toggle Mister" set category = "Object" - toggle_mister(src) -*/ + set src in usr + toggle_mister(usr) -/mob/living/carbon/human/verb/toggle_mister_verb() - set name = "Toggle Mister" - set category = "Object" - toggle_mister() /obj/item/reagent_container/glass/watertank/MouseDrop(obj/over_object as obj) if(!CAN_PICKUP(usr, src))