cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revenants no longer make noise walking into gibs (#81420)

Browse Source 
## About The Pull Request

Turns the hardcoded sound that plays when you walk into some gibs into
an Element and adds a check for flying to avoid playing the sound,
fixing Revenants, Holoparasites, and other mobs that fly from making
noise when "walking" into a pool of blood.

## Why It's Good For The Game

I was observing a revenant and heard them making noise from walking over
blood, thought it was kinda f*cked up

## Changelog

🆑
fix: Revenants (and other flying mobs) will not make noise when walking
into pools of gibs,
/🆑

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
(cherry picked from commit d604a87b06)
This commit is contained in:
John Willard
2024-02-20 03:48:33 -05:00
committed by nevimer
parent b85d0cabc0
commit 118e9470e2
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/ELEMENT_TEMPLATE.md
+2 -2
View File
@@ -5,8 +5,8 @@ See _element.dm for detailed explanations
```dm
/datum/element/myelement
element_flags = ELEMENT_BESPOKE | ELEMENT_COMPLEX_DETACH | ELEMENT_DETACH_ON_HOST_DESTROY | ELEMENT_NOTAREALFLAG // code/__DEFINES/dcs/flags.dm
//argument_hash_start_idx = 2 // Use with ELEMENT_BESPOKE
element_flags = ELEMENT_BESPOKE | ELEMENT_COMPLEX_DETACH | ELEMENT_DETACH_ON_HOST_DESTROY | ELEMENT_NOTAREALFLAG // code/__DEFINES/dcs/flags.dm
//argument_hash_start_idx = 2 // Use with ELEMENT_BESPOKE
var/list/myvar = list()
/datum/element/myelement/Attach(datum/target)
code/datums/elements/squish_sound.dm
+27
View File
@@ -0,0 +1,27 @@
///Plays a sound when walked into, lower sounding if the person walking into it has light stepping.
/datum/element/squish_sound
element_flags = ELEMENT_BESPOKE
argument_hash_start_idx = 2
///The sound to play when something holding this element is entered.
var/sound_to_play
/datum/element/squish_sound/Attach(
datum/target,
sound = 'sound/effects/footstep/gib_step.ogg',
)
. = ..()
sound_to_play = sound
RegisterSignal(target, COMSIG_MOVABLE_CROSS, PROC_REF(on_cross))
///Plays the set sound upon being entered, as long as the person walking into it can actually walk.
/datum/element/squish_sound/proc/on_cross(atom/movable/source, atom/movable/crossed)
SIGNAL_HANDLER
if(!isliving(crossed) || (crossed.movement_type & MOVETYPES_NOT_TOUCHING_GROUND) || crossed.throwing)
return
playsound(
source = source,
soundin = sound_to_play,
vol = HAS_TRAIT(crossed, TRAIT_LIGHT_STEP) ? 20 : 50,
vary = TRUE,
)
code/game/objects/effects/decals/cleanable/humans.dm
+1 -5
View File
@@ -115,6 +115,7 @@
/obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases)
. = ..()
AddElement(/datum/element/squish_sound)
RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, PROC_REF(on_pipe_eject))
/obj/effect/decal/cleanable/blood/gibs/Destroy()
@@ -133,11 +134,6 @@
/obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
return FALSE
/obj/effect/decal/cleanable/blood/gibs/on_entered(datum/source, atom/movable/L)
if(isliving(L) && has_gravity(loc))
playsound(loc, 'sound/effects/footstep/gib_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 20 : 50, TRUE)
return ..()
/obj/effect/decal/cleanable/blood/gibs/proc/on_pipe_eject(atom/source, direction)
SIGNAL_HANDLER
tgstation.dme
+1
View File
@@ -1571,6 +1571,7 @@
#include "code\datums\elements\soft_landing.dm"
#include "code\datums\elements\spooky.dm"
#include "code\datums\elements\squish.dm"
#include "code\datums\elements\squish_sound.dm"
#include "code\datums\elements\sticker.dm"
#include "code\datums\elements\strippable.dm"
#include "code\datums\elements\structure_repair.dm"