diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index c222ba4e64d..daaf23d369e 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -5,34 +5,34 @@ icon_keyboard = null icon_screen = "invaders" clicksound = null //Gets too spammy and makes no sense for arcade to have the console keyboard noise anyway - var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2, - /obj/item/toy/blink = 2, - /obj/item/clothing/under/syndicate/tacticool = 2, - /obj/item/toy/sword = 2, - /obj/item/weapon/gun/projectile/revolver/capgun = 2, - /obj/item/toy/crossbow = 2, - /obj/item/clothing/suit/syndicatefake = 2, - /obj/item/weapon/storage/fancy/crayons = 2, - /obj/item/toy/spinningtoy = 2, - /obj/item/toy/prize/ripley = 1, - /obj/item/toy/prize/fireripley = 1, - /obj/item/toy/prize/deathripley = 1, - /obj/item/toy/prize/gygax = 1, - /obj/item/toy/prize/durand = 1, - /obj/item/toy/prize/honk = 1, - /obj/item/toy/prize/marauder = 1, - /obj/item/toy/prize/seraph = 1, - /obj/item/toy/prize/mauler = 1, - /obj/item/toy/prize/odysseus = 1, - /obj/item/toy/prize/phazon = 1, - /obj/item/toy/waterflower = 1, - /obj/random/action_figure = 1, - /obj/random/plushie = 1, - /obj/item/toy/cultsword = 1, - /obj/item/toy/bouquet/fake = 1, - /obj/item/clothing/accessory/badge/sheriff = 2, - /obj/item/clothing/head/cowboy_hat/small = 2, - /obj/item/toy/stickhorse = 2 + var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2, + /obj/item/toy/blink = 2, + /obj/item/clothing/under/syndicate/tacticool = 2, + /obj/item/toy/sword = 2, + /obj/item/weapon/gun/projectile/revolver/capgun = 2, + /obj/item/toy/crossbow = 2, + /obj/item/clothing/suit/syndicatefake = 2, + /obj/item/weapon/storage/fancy/crayons = 2, + /obj/item/toy/spinningtoy = 2, + /obj/item/toy/prize/ripley = 1, + /obj/item/toy/prize/fireripley = 1, + /obj/item/toy/prize/deathripley = 1, + /obj/item/toy/prize/gygax = 1, + /obj/item/toy/prize/durand = 1, + /obj/item/toy/prize/honk = 1, + /obj/item/toy/prize/marauder = 1, + /obj/item/toy/prize/seraph = 1, + /obj/item/toy/prize/mauler = 1, + /obj/item/toy/prize/odysseus = 1, + /obj/item/toy/prize/phazon = 1, + /obj/item/weapon/reagent_containers/spray/waterflower = 1, + /obj/random/action_figure = 1, + /obj/random/plushie = 1, + /obj/item/toy/cultsword = 1, + /obj/item/toy/bouquet/fake = 1, + /obj/item/clothing/accessory/badge/sheriff = 2, + /obj/item/clothing/head/cowboy_hat/small = 2, + /obj/item/toy/stickhorse = 2 ) /obj/machinery/computer/arcade/New() diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index edb2b18a3e4..b866a71a2a7 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -949,7 +949,7 @@ /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3) contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/mtearseed = 2, /obj/item/seeds/nettleseed = 2,/obj/item/seeds/reishimycelium = 2,/obj/item/seeds/reishimycelium = 2,/obj/item/seeds/shandseed = 2,) - premium = list(/obj/item/toy/waterflower = 1) + premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1) /** * Populate hydroseeds product_records diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 9760e2da8ae..65614663407 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -379,75 +379,6 @@ playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) -/* - * Water flower - */ -/obj/item/toy/waterflower - name = "water flower" - desc = "A seemingly innocent sunflower...with a twist." - icon = 'icons/obj/device.dmi' - drop_sound = 'sound/items/drop/food.ogg' - icon_state = "sunflower" - item_state = "sunflower" - var/empty = 0 - slot_flags = SLOT_HOLSTER - -/obj/item/toy/waterflower/New() - var/datum/reagents/R = new/datum/reagents(10) - reagents = R - R.my_atom = src - R.add_reagent("water", 10) - -/obj/item/toy/waterflower/attack(mob/living/carbon/human/M as mob, mob/user as mob) - return - -/obj/item/toy/waterflower/afterattack(atom/A as mob|obj, mob/user as mob) - - if (istype(A, /obj/item/weapon/storage/backpack )) - return - - else if (locate (/obj/structure/table, src.loc)) - return - - else if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1) - A.reagents.trans_to_obj(src, 10) - to_chat(user, "You refill your flower!") - return - - else if (src.reagents.total_volume < 1) - src.empty = 1 - to_chat(user, "Your flower has run dry!") - return - - else - src.empty = 0 - - - var/obj/effect/decal/D = new/obj/effect/decal/(get_turf(src)) - D.name = "water" - D.icon = 'icons/obj/chemical.dmi' - D.icon_state = "chempuff" - D.create_reagents(5) - src.reagents.trans_to_obj(D, 1) - playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6) - - spawn(0) - for(var/i=0, i<1, i++) - step_towards(D,A) - D.reagents.touch_turf(get_turf(D)) - for(var/atom/T in get_turf(D)) - D.reagents.touch(T) - if(ismob(T) && T:client) - to_chat(T:client, "\The [user] has sprayed you with water!") - sleep(4) - qdel(D) - - return - -/obj/item/toy/waterflower/examine(mob/user) - if(..(user, 0)) - to_chat(user, "[bicon(src)] [src.reagents.total_volume] units of water left!") - /* * Bosun's whistle */ diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index d39983af2f2..bc6d29a5a5e 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -389,7 +389,7 @@ /obj/item/device/pda/clown, /obj/item/clothing/mask/gas/clown_hat, /obj/item/weapon/bikehorn, - /obj/item/toy/waterflower, + /obj/item/weapon/reagent_containers/spray/waterflower, /obj/item/weapon/pen/crayon/rainbow, /obj/structure/closet/crate ), diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index db3a89bf1b6..2c97432955e 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -515,7 +515,7 @@ /obj/item/toy/balloon, /obj/item/toy/crossbow, /obj/item/toy/blink, - /obj/item/toy/waterflower, + /obj/item/weapon/reagent_containers/spray/waterflower, /obj/item/toy/eight_ball, /obj/item/toy/eight_ball/conch, /obj/item/toy/prize/ripley, diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 121378723f9..4b4f979ef56 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -81,7 +81,7 @@ var/toytype = list() toytype["Blink toy"] = /obj/item/toy/blink toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy - toytype["Water flower"] = /obj/item/toy/waterflower + toytype["Water flower"] = /obj/item/weapon/reagent_containers/spray/waterflower toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 7a7ee7ee95c..6f8fc7a8f96 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -122,7 +122,7 @@ new/obj/item/weapon/bikehorn(src) //new/obj/item/weapon/stamp/clown(src) I'd add it, but only clowns can use it new/obj/item/weapon/pen/crayon/rainbow(src) - new/obj/item/toy/waterflower(src) + new/obj/item/weapon/reagent_containers/spray/waterflower(src) if(95) new/obj/item/clothing/under/mime(src) new/obj/item/clothing/shoes/black(src)