cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the sleep damage eye blur effect

Browse Source 
woo! yippie
(also renamed some of my older comments)
This commit is contained in:
Sonoida
2023-04-06 20:55:08 +02:00
parent 090cf0780b
commit f303300f6e
15 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/carbon/carbon_defines.dm
View File

@@ -64,4 +64,3 @@
var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects
var/burpyness = 0 // GS13 - dumb name, I know. Trying to keep it closely related to "drunkenness"

2
code/modules/mob/living/carbon/human/human.dm
View File

@@ -812,7 +812,7 @@
remove_all_embedded_objects()
set_heartattack(FALSE)
drunkenness = 0
burpyness = 0 //GS13 - lil GS13 addition
burpslurring = 0 //GS13
for(var/datum/mutation/human/HM in dna.mutations)
if(HM.quality != POSITIVE)
dna.remove_mutation(HM.name)

6
code/modules/mob/living/damage_procs.dm
View File

@@ -94,8 +94,6 @@
radiation += max(effect * hit_percent, 0)
if(EFFECT_SLUR)
slurring = max(slurring,(effect * hit_percent))
if(EFFECT_BURPSLUR)
burpslurring = max(burpslurring,(effect * hit_percent)) //GS13
if(EFFECT_STUTTER)
if((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) // stun is usually associated with stutter
stuttering = max(stuttering,(effect * hit_percent))
@@ -109,7 +107,7 @@
return 1
/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, burpslur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax)
/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax)
if(blocked >= 100)
return 0
if(stun)
@@ -122,8 +120,6 @@
apply_effect(irradiate, EFFECT_IRRADIATE, blocked)
if(slur)
apply_effect(slur, EFFECT_SLUR, blocked)
if(burpslur)
apply_effect(burpslur, EFFECT_BURPSLUR, blocked) //GS13
if(stutter)
apply_effect(stutter, EFFECT_STUTTER, blocked)
if(eyeblur)