From 0f3acabbaac7defa57b22178f04da744e17f63cc Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Fri, 4 Apr 2014 20:40:12 +0800 Subject: [PATCH 1/2] AmountChange --- .../objects/items/weapons/tanks/watertank.dm | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 6e171d9dbd9..058b91d3a76 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -1,4 +1,4 @@ -//Hydroponics tank and base code + //Hydroponics tank and base code /obj/item/weapon/watertank name = "backpack water tank" desc = "A S.U.N.S.H.I.N.E. brand watertank backpack with nozzle to water plants." @@ -19,7 +19,7 @@ create_reagents(volume) noz = make_noz() return - + /obj/item/weapon/watertank/examine() set src in usr ..() @@ -38,7 +38,7 @@ set name = "Toggle Mister" set category = "Object" on = !on - + var/mob/living/carbon/human/user = usr if(on) //Detach the nozzle into the user's hands @@ -52,7 +52,7 @@ //Remove from their hands and put back "into" the tank remove_noz(user) return - + /obj/item/weapon/watertank/proc/make_noz() return new /obj/item/weapon/reagent_containers/spray/mister(src) @@ -102,10 +102,10 @@ user << "The mister snaps back onto the watertank!" tank.on = 0 loc = tank - + /obj/item/weapon/reagent_containers/spray/mister/attack_self() return - + /proc/check_tank_exists(parent_tank, var/mob/living/carbon/human/M, var/obj/O) if (!parent_tank || !istype(parent_tank, /obj/item/weapon/watertank)) //To avoid weird issues from admin spawns M.unEquip(O) @@ -120,12 +120,12 @@ desc = "A janitorial watertank backpack with nozzle to clean dirt and graffiti." icon_state = "waterbackpackjani" item_state = "waterbackpackjani" - + /obj/item/weapon/watertank/janitor/New() ..() - reagents.add_reagent("cleaner", 250) - - + reagents.add_reagent("cleaner", 500) + + /obj/item/weapon/reagent_containers/spray/mister/janitor name = "janitor spray nozzle" desc = "A janitorial spray nozzle attached to a watertank, designed to clean up large messes." @@ -137,11 +137,11 @@ /obj/item/weapon/watertank/janitor/make_noz() return new /obj/item/weapon/reagent_containers/spray/mister/janitor(src) - + /obj/item/weapon/reagent_containers/spray/mister/janitor/attack_self(var/mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) user << "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray." - + //Atmos tank /obj/item/weapon/watertank/atmos name = "backpack water tank" @@ -149,10 +149,10 @@ icon_state = "waterbackpackatmos" item_state = "waterbackpackatmos" volume = 100 - + /obj/item/weapon/watertank/atmos/make_noz() return new /obj/item/weapon/extinguisher/mini/nozzle(src) - + /obj/item/weapon/extinguisher/mini/nozzle name = "fire extinguisher nozzle" desc = "A fire extinguisher nozzle attached to a water tank." @@ -161,7 +161,7 @@ item_state = "misteratmos" safety = 0 var/obj/item/weapon/watertank/tank - + /obj/item/weapon/extinguisher/mini/nozzle/New(parent_tank) if(check_tank_exists(parent_tank, src)) tank = parent_tank @@ -169,11 +169,11 @@ max_water = tank.volume loc = tank return - + /obj/item/weapon/extinguisher/mini/nozzle/dropped(mob/user as mob) user << "The nozzle snaps back onto the watertank!" tank.on = 0 loc = tank - + /obj/item/weapon/extinguisher/mini/nozzle/attack_self() return \ No newline at end of file From 3fe253008667bfcc2ba0af0c07f8ff068d8da10e Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Fri, 4 Apr 2014 21:06:30 +0800 Subject: [PATCH 2/2] Fix --- code/game/objects/items/weapons/tanks/watertank.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 058b91d3a76..1df8270a496 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -1,4 +1,4 @@ - //Hydroponics tank and base code +//Hydroponics tank and base code /obj/item/weapon/watertank name = "backpack water tank" desc = "A S.U.N.S.H.I.N.E. brand watertank backpack with nozzle to water plants."