From 391c806dfae6ba0080098f5f62c346fb83f1b329 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 15 Dec 2019 18:59:51 +0100 Subject: [PATCH] Fixes skeletons being immortal + removes brain damage oldcode (#7690) --- code/modules/mob/living/carbon/human/life.dm | 34 --------------- code/modules/mob/living/carbon/human/say.dm | 10 ----- .../carbon/human/species/outsider/undead.dm | 5 +++ .../mob/living/carbon/human/whisper.dm | 7 +--- html/changelogs/mattatlas-brainfix.yml | 42 +++++++++++++++++++ 5 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 html/changelogs/mattatlas-brainfix.yml diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 714ae584921..40b4eb324c6 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -222,40 +222,6 @@ speech_problem_flag = 1 if (prob(10)) stuttering = max(10, stuttering) - // No. -- cib - /*if (getBrainLoss() >= 60 && stat != 2) - if (prob(3)) - switch(pick(1,2,3)) - if(1) - say(pick("IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "CAPTAINS A COMDOM", "[pick("", "that meatball traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!", "can u give me [pick("telikesis","halk","eppilapse")]?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", "I WANNA PET TEH monkeyS", "stop grifing me!!!!", "SOTP IT#")) - if(2) - say(pick("FUS RO DAH","fucking 4rries!", "stat me", ">my face", "roll it easy!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom", "PACKETS!!!")) - if(3) - emote("drool") - */ - - if(stat != DEAD) - var/rn = rand(0, 200) - var/bloss = getBrainLoss() - if(bloss >= 5) - if(0 <= rn && rn <= 3) - custom_pain("Your head feels numb and painful.") - if(bloss >= 15) - if(4 <= rn && rn <= 6) if(eye_blurry <= 0) - to_chat(src, "It becomes hard to see for some reason.") - eye_blurry = 10 - if(bloss >= 35) - if(7 <= rn && rn <= 9) if(get_active_hand()) - to_chat(src, "Your hand won't respond properly, you drop what you're holding!") - drop_item() - if(bloss >= 45) - if(10 <= rn && rn <= 12) - if(prob(50)) - to_chat(src, "You suddenly black out!") - Paralyse(10) - else if(!lying) - to_chat(src, "Your legs won't respond properly, you fall down!") - Weaken(10) /mob/living/carbon/human/proc/handle_stasis_bag() // Handle side effects from stasis bag diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 6cc6798532e..5e86d425a8e 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -147,16 +147,6 @@ if(parent[3]) speech_problem_flag = 1 - var/braindam = getBrainLoss() - if(braindam >= 60) - speech_problem_flag = 1 - if(prob(braindam/4)) - message = get_stuttered_message(message) - verb = pick("stammers", "stutters") - if(prob(braindam)) - message = uppertext(message) - verb = "yells loudly" - var/list/returns[4] returns[1] = message returns[2] = verb diff --git a/code/modules/mob/living/carbon/human/species/outsider/undead.dm b/code/modules/mob/living/carbon/human/species/outsider/undead.dm index 295d069c60d..ba535e5c46d 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/undead.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/undead.dm @@ -82,6 +82,11 @@ hud_type = /datum/hud_data/construct +/datum/species/skeleton/handle_death_check(var/mob/living/carbon/human/H) + if(H.get_total_health() <= config.health_threshold_dead) + return TRUE + return FALSE + /mob/living/carbon/human/apparition/Initialize(mapload) . = ..(mapload, "Apparition") diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index 5efd5259af4..d3cab3bd6e5 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -58,11 +58,8 @@ var/list/handle_r = handle_speech_problems(message) message = handle_r[1] verb = handle_r[2] - if(verb == "yells loudly") - verb = "slurs emphatically" - else - var/adverb = pick("quietly", "softly") - verb = "[verb] [adverb]" + var/adverb = pick("quietly", "softly") + verb = "[verb] [adverb]" speech_problem_flag = handle_r[3] diff --git a/html/changelogs/mattatlas-brainfix.yml b/html/changelogs/mattatlas-brainfix.yml new file mode 100644 index 00000000000..c787fc9f443 --- /dev/null +++ b/html/changelogs/mattatlas-brainfix.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Skeletons are no longer immortal." + - rscdel: "Removed leftover brain damage effects."