cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-09 15:05:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes skeletons being immortal + removes brain damage oldcode (#7690)

Browse Source
This commit is contained in:
Matt Atlas
2019-12-15 18:59:51 +01:00
committed by Erki
parent db32abe966
commit 391c806dfa
5 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
-34
View File
@@ -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, "<span class='warning'>It becomes hard to see for some reason.</span>")
eye_blurry = 10
if(bloss >= 35)
if(7 <= rn && rn <= 9) if(get_active_hand())
to_chat(src, "<span class='danger'>Your hand won't respond properly, you drop what you're holding!</span>")
drop_item()
if(bloss >= 45)
if(10 <= rn && rn <= 12)
if(prob(50))
to_chat(src, "<span class='danger'>You suddenly black out!</span>")
Paralyse(10)
else if(!lying)
to_chat(src, "<span class='danger'>Your legs won't respond properly, you fall down!</span>")
Weaken(10)
/mob/living/carbon/human/proc/handle_stasis_bag()
// Handle side effects from stasis bag
code/modules/mob/living/carbon/human/say.dm
-10
View File
@@ -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
code/modules/mob/living/carbon/human/species/outsider/undead.dm
+5
View File
@@ -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")
code/modules/mob/living/carbon/human/whisper.dm
+2 -5
View File
@@ -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]