diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 5f9d1618411..267d417d64b 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -18,6 +18,7 @@ * Toy cult sword * Ring bell * Chess Pieces + * Stress ball */ @@ -1475,3 +1476,39 @@ /obj/item/chess_piece/queen/black name = "black queen" icon_state = "black_queen" + +// Stress ball +/obj/item/toy/stressball + name = "stress ball" + desc = "A small, squishy stress ball. This one has a squeaker inside." + icon_state = "stressball" + drop_sound = 'sound/items/drop/plushie.ogg' + pickup_sound = 'sound/items/pickup/plushie.ogg' + var/squeeze_sound = 'sound/items/drop/plushie.ogg' + var/cooldown = 0 + +/obj/item/toy/stressball/Initialize() + . = ..() + if(!color) + color = RANDOM_RGB + update_icon() + +/obj/item/toy/stressball/attack_self(mob/user as mob) + if(cooldown > world.time) + return + cooldown = world.time + 2 SECONDS + var/volume = 0 + switch(user.a_intent) + if(I_HELP) + user.visible_message(SPAN_NOTICE("[SPAN_BOLD("\The [user]")] plays with \the [src]!"), SPAN_NOTICE("You play with \the [src]!")) + if(I_DISARM) + user.visible_message(SPAN_NOTICE("[SPAN_BOLD("\The [user]")] squeezes \the [src]!"), SPAN_NOTICE("You squeeze \the [src]!")) + volume = 30 + if(I_GRAB) + user.visible_message(SPAN_NOTICE(SPAN_BOLD("\The [user] pinches \the [src]!")), SPAN_NOTICE(SPAN_BOLD("You pinch \the [src]!"))) + volume = 40 + if(I_HURT) + user.visible_message(SPAN_WARNING(SPAN_BOLD("\The [user] crushes \the [src]!")), SPAN_WARNING(SPAN_BOLD("You crush \the [src]!"))) + volume = 50 + if(volume) + playsound(src.loc, squeeze_sound, volume, TRUE) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index a32f2259001..2f1fe7e05ce 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1347,3 +1347,10 @@ . = ..() new /obj/item/stack/cable_coil(src, 6) new /obj/item/stack/material/steel(src, 2) + +/obj/item/storage/box/stressball + name = "box of stress balls" + desc = "A box containing a number of randomly-coloured stress balls." + starts_with = list( + /obj/item/toy/stressball = 6 + ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index feea526ac84..033697f7001 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -209,3 +209,4 @@ new /obj/item/toy/plushie/slime(src) new /obj/item/toy/plushie/bee(src) new /obj/item/device/flashlight/pen(src) + new /obj/item/storage/box/stressball(src) diff --git a/code/modules/client/preference_setup/loadout/items/toy.dm b/code/modules/client/preference_setup/loadout/items/toy.dm index 419c2e0928b..8ca32ea03ab 100644 --- a/code/modules/client/preference_setup/loadout/items/toy.dm +++ b/code/modules/client/preference_setup/loadout/items/toy.dm @@ -112,3 +112,9 @@ for(var/obj/item/toy/mech/mecha as anything in subtypesof(/obj/item/toy/mech)) mechas[initial(mecha.name)] = mecha gear_tweaks += new /datum/gear_tweak/path(mechas) + +/datum/gear/toy/stressball + display_name = "stress ball" + description = "A small, squishy stress ball. This one has a squeaker inside." + path = /obj/item/toy/stressball + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION diff --git a/html/changelogs/llywelwyn-stressballs.yml b/html/changelogs/llywelwyn-stressballs.yml new file mode 100644 index 00000000000..1714126d005 --- /dev/null +++ b/html/changelogs/llywelwyn-stressballs.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Llywelwyn + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added colourable stress balls to the loadout." + - rscadd: "Added a box of stress balls to the psychiatrist's locker." diff --git a/icons/mob/items/lefthand_toy.dmi b/icons/mob/items/lefthand_toy.dmi index 8d14d4bcd4b..befc93b4f09 100644 Binary files a/icons/mob/items/lefthand_toy.dmi and b/icons/mob/items/lefthand_toy.dmi differ diff --git a/icons/mob/items/righthand_toy.dmi b/icons/mob/items/righthand_toy.dmi index 43d78331542..c27dce9c308 100644 Binary files a/icons/mob/items/righthand_toy.dmi and b/icons/mob/items/righthand_toy.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 553d2cf2711..a3e562e3c56 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ