cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

do the rest of the pull request

Browse Source
This commit is contained in:
Sinestia
2022-08-07 00:06:23 -05:00
parent 72fe904948
commit 42baeececd
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/status_procs.dm
+3 -2
View File
@@ -545,13 +545,14 @@ moving up or down retains their old lying angle
return S.duration - world.time
return 0
/mob/living/proc/Stun(amount, ignore_canstun = FALSE) //Can't go below remaining duration
/// Takes a time, whether it ignores stun immunity, and whether it replaces instead of adding to already-existing stuns.
/mob/living/proc/Stun(amount, ignore_canstun = FALSE, superceding = FALSE) //Can't go below remaining duration
if(IS_STUN_IMMUNE(src, ignore_canstun))
return
if(absorb_stun(amount, ignore_canstun))
return
var/datum/status_effect/incapacitating/stun/S = IsStunned()
if(S)
if(S && !superceding)
S.duration = max(world.time + amount, S.duration)
else if(amount > 0)
S = apply_status_effect(STATUS_EFFECT_STUN, amount)
code/modules/mob/mob_grab.dm
+1 -1
View File
@@ -145,7 +145,7 @@
var/breathing_tube = affecting.get_organ_slot("breathing_tube")
if(state >= GRAB_NECK)
affecting.Stun(3 SECONDS)
affecting.Stun(3 SECONDS,,TRUE)
if(isliving(affecting) && !breathing_tube) //It will hamper your breathing, being choked and all.
var/mob/living/L = affecting
L.adjustOxyLoss(1)