Add pool noodles. (#31664)

* Add pool noodles.

* Apply suggestions from code review

These are proper pool noodles now.

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add hit sound. Allow zero-damage hit sounds.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Alan
2026-03-13 15:33:54 -04:00
committed by GitHub
parent 00d714f155
commit 2b680e4eb0
8 changed files with 38 additions and 2 deletions
+1 -1
View File
@@ -178,7 +178,7 @@
to_chat(user, SPAN_WARNING("You don't want to harm other living beings!"))
return FALSE
if(!force)
if(!force && !("zero_damage_hitsound" in vars))
playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), TRUE, -1)
else
SEND_SIGNAL(target, COMSIG_ATTACK)
+1 -1
View File
@@ -729,7 +729,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
var/mob/living/L = hit_atom
L.IgniteMob()
var/volume = get_volume_by_throwforce_and_or_w_class()
if(throwforce > 0)
if(throwforce > 0 || ("zero_damage_hitsound" in vars))
if(mob_throw_hit_sound)
SSthrowing.playsound_capped(hit_atom, mob_throw_hit_sound, volume, TRUE, -1)
else if(hitsound)
+33
View File
@@ -2089,3 +2089,36 @@
desc = "Rumor has it that microscopic space life makes its home in these crevices."
icon_state = "shell_red"
dye_color = DYE_LIGHTRED
/obj/item/toy/pool_noodle
name = "boring pool noodle"
desc = ABSTRACT_TYPE_DESC
icon = 'icons/obj/toy.dmi'
icon_state = "pool_noodle"
attack_verb = list("bopped", "splatted", "smacked", "thwapped", "slapped")
hitsound = 'sound/items/pool_noodle_hit.ogg'
// Having this var at all should play hitsound even if damage is zero
var/zero_damage_hitsound = TRUE
w_class = WEIGHT_CLASS_BULKY
/obj/item/toy/pool_noodle/Initialize(mapload)
if(!color)
return ..()
name = "pool noodle"
desc = "A damp, flexible tube for unrestrained summer fun."
return ..()
/obj/item/toy/pool_noodle/pink
color = COLOR_PINK
/obj/item/toy/pool_noodle/lime
color = COLOR_LIME
/obj/item/toy/pool_noodle/aqua
color = COLOR_CYAN
/obj/item/toy/pool_noodle/violet
color = COLOR_VIOLET
/obj/item/toy/pool_noodle/orange
color = COLOR_ORANGE
Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 98 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 85 KiB

+3
View File
@@ -29,3 +29,6 @@ effects/mob_effects/flap.ogg and effects/mob_effects/angryflap.ogg were taken fr
effects/mob_effects/flutter.ogg was taken from https://freesound.org/people/Godowan/sounds/240476/ under CC0
items/beach_chair_hit_1.ogg was compressed to ogg from "screen door open 1.wav" in https://filmcow.itch.io/filmcow-sfx 's "FilmCow Recorded SFX.zip" under their FilmCow Royalty Free SFX Library License Agreement
items/pool_noodle_hit.ogg was compressed to ogg from "cardboard box hit 28.wav" in https://filmcow.itch.io/filmcow-sfx-4 's "Hits & Crunches 48kHz.zip" under their FilmCow Royalty Free SFX Library License Agreement
Binary file not shown.