From 8bfb7e1c301e7b42476104514ab2b20cf3cfa20e Mon Sep 17 00:00:00 2001 From: GremlingSS Date: Sat, 30 Dec 2023 12:01:08 +0000 Subject: [PATCH] Last minute polishing --- .../code/datums/components/fattening_door.dm | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/GainStation13/code/datums/components/fattening_door.dm b/GainStation13/code/datums/components/fattening_door.dm index 7a548786..940028a4 100644 --- a/GainStation13/code/datums/components/fattening_door.dm +++ b/GainStation13/code/datums/components/fattening_door.dm @@ -8,39 +8,37 @@ RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED), .proc/Fatten) - /datum/component/fattening_door/proc/Fatten() //GS13 var/stuck_delay = 0 var/turf/T = get_turf(parent) for(var/mob/living/carbon/M in T) + var/vis_message_self = "" + var/vis_message_others = "" // determine if mob should get stuck and be fattened if(M.fatness >= FATNESS_LEVEL_FAT) fatten = TRUE if(!M.AmountFatStunned()) stuck_delay = 5 - M.visible_message( - "[M]'s sides briefly brush against the doorway.", - "You feel your sides briefly brush against the doorway!") + vis_message_self = "You feel your sides briefly brush against the doorway!" + vis_message_others = "[M]'s sides briefly brush against the doorway." // Scales depending on this switch. switch(M.fatness) if(FATNESS_LEVEL_BARELYMOBILE to INFINITY) stuck_delay = 120 - M.visible_message( - "[M] gets stuck in the doorway!", - "You feel yourself get stuck in the doorway!") + vis_message_self = "You feel yourself get stuck in the doorway!" + vis_message_others = "[M] gets stuck in the doorway!" if((FATNESS_LEVEL_FATTER+1) to FATNESS_LEVEL_MORBIDLY_OBESE) stuck_delay = 50 - M.visible_message( - "[M] barely squeezes through the doorway!", - "You feel your sides barely squeeze through the doorway!") + vis_message_self ="You feel your sides barely squeeze through the doorway!" + vis_message_others = "[M] barely squeezes through the doorway!" if((FATNESS_LEVEL_FAT+1) to FATNESS_LEVEL_FATTER) stuck_delay = 15 - M.visible_message( - "[M]'s sides briefly smush against the doorway.", - "You feel your sides smush against the doorway!.") + vis_message_self = "You feel your sides smush against the doorway!." + vis_message_others = "[M]'s sides briefly smush against the doorway." // Apply the fatstun if(fatten) + M.visible_message("[vis_message_others]", "[vis_message_self]") M.FatStun(stuck_delay, fatAmount = fat_to_add)