From c99a35c7e8570e71f893ee4665bb21e232a22416 Mon Sep 17 00:00:00 2001 From: KabKebab Date: Tue, 26 Oct 2021 20:57:19 +0200 Subject: [PATCH] Blob immobility trait + examine text + new emote --- GainStation13/code/modules/mob/living/emote.dm | 17 +++++++++++++++++ GainStation13/sound/voice/funnycat.ogg | Bin 0 -> 18592 bytes code/__DEFINES/traits.dm | 1 + code/datums/traits/neutral.dm | 8 ++++++++ .../modules/mob/living/carbon/human/examine.dm | 4 +++- .../modules/mob/living/carbon/human/species.dm | 2 ++ code/modules/mob/mob_movement.dm | 4 ++-- 7 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 GainStation13/sound/voice/funnycat.ogg diff --git a/GainStation13/code/modules/mob/living/emote.dm b/GainStation13/code/modules/mob/living/emote.dm index 1362084c..511a2d53 100644 --- a/GainStation13/code/modules/mob/living/emote.dm +++ b/GainStation13/code/modules/mob/living/emote.dm @@ -18,3 +18,20 @@ if(ishuman(user)) playsound(user, 'GainStation13/sound/voice/burp1.ogg', 50, 1, -1) . = ..() + +/datum/emote/living/fart + key = "fart" + key_third_person = "farts" + message = " farts" + emote_type = EMOTE_AUDIBLE + +//Shhh... It's a secret! Don't tell or I'll steal your legs +/datum/emote/living/burunyu + key = "burunyu" + key_third_person = "burunyues" + message = " emits a strange feline sound" + emote_type = EMOTE_AUDIBLE + +/datum/emote/living/burunyu/run_emote(mob/living/user, params) + playsound(user, 'GainStation13/sound/voice/funnycat.ogg', 50, 1, -1) + . = ..() diff --git a/GainStation13/sound/voice/funnycat.ogg b/GainStation13/sound/voice/funnycat.ogg new file mode 100644 index 0000000000000000000000000000000000000000..18d61cb7bf5134eb768a27b5548b9ba5007dba07 GIT binary patch literal 18592 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 FATNESS_LEVEL_IMMOBILE) + if(fatness >= FATNESS_LEVEL_BLOB) + msg += "[t_He] [t_is] completely engulfed in rolls upon rolls of flab. [t_His] head is poking out on top of [t_His] body, akin to a marble on top of a hill.\n" + else if(fatness >= FATNESS_LEVEL_IMMOBILE) msg += "[t_His] body is buried in an overflowing surplus of adipose, and [t_His] legs are completely buried beneath layers of meaty, obese flesh.\n" else if(fatness >= FATNESS_LEVEL_MORBIDLY_OBESE) msg += "[t_He] [t_is] utterly stuffed with abundant lard, [t_He] doesn't seem to be able to move much.\n" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 747b3898..74570991 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1540,6 +1540,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) . += (2 - flight) if(HAS_TRAIT(H, TRAIT_IMMOBILE)) . += 3 // No wings are going to lift that much off the ground + if(HAS_TRAIT(H, TRAIT_BLOB)) + . += 4 if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD)) . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR return . diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index e02957b3..0c83178a 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -85,8 +85,8 @@ if(!mob.Process_Spacemove(direct)) return FALSE - //if(HAS_TRAIT(mob,TRAIT_BLOB)) // GS13 are we too fat to move? (it was a bad idea) - // return FALSE + if(HAS_TRAIT(mob,TRAIT_BLOB) && HAS_TRAIT(mob,TRAIT_WEAKLEGS)) // GS13 are we too fat to move? + return FALSE //We are now going to move var/add_delay = mob.movement_delay() mob.set_glide_size(DELAY_TO_GLIDE_SIZE(add_delay * (((direct & 3) && (direct & 12)) ? 2 : 1))) // set it now in case of pulled objects