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

Fix shower causing mood and status effects to non-carbon mobs (#93149)

Browse Source 
## About The Pull Request
- Fixes #93147

Borgs and silicons were able to get mood effects and status effects from
being in the shower.

## Why It's Good For The Game
Not intended.

## Changelog
🆑
fix: Fix shower causing mood and status effects to non-carbon mobs
/🆑
This commit is contained in:
Tim
2025-09-28 21:09:50 +02:00
committed by GitHub
parent 3d3bb2449e
commit 8516d44fe1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/shower.dm
+5 -4
View File
@@ -252,7 +252,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
/obj/machinery/shower/proc/on_exited(datum/source, atom/movable/exiter)
SIGNAL_HANDLER
if(!isliving(exiter))
if(!iscarbon(exiter))
return
var/obj/machinery/shower/locate_new_shower = locate() in get_turf(exiter)
@@ -274,8 +274,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
var/mob/living/living_target = target
check_heat(living_target)
living_target.apply_status_effect(/datum/status_effect/washing_regen, shower_reagent)
living_target.add_mood_event("shower", /datum/mood_event/shower, shower_reagent)
if(iscarbon(living_target))
living_target.apply_status_effect(/datum/status_effect/washing_regen, shower_reagent)
living_target.add_mood_event("shower", /datum/mood_event/shower, shower_reagent)
/**
* Toggle whether shower is actually on and outputting water.
@@ -306,7 +307,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
if(isopenturf(loc))
var/turf/open/tile = loc
tile.MakeSlippery(TURF_WET_WATER, min_wet_time = 5 SECONDS, wet_time_to_add = 1 SECONDS)
for(var/mob/living/showerer in loc)
for(var/mob/living/carbon/showerer in loc)
showerer.remove_status_effect(/datum/status_effect/washing_regen)
return TRUE