cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Quite a few brainmed changes + fixes. (#9015)

Browse Source
This commit is contained in:
Matt Atlas
2020-06-05 20:54:17 +02:00
committed by GitHub
parent 7e0a96a264
commit 76fec1fea2
7 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+2 -3
View File
@@ -227,11 +227,10 @@
// Handle side effects from stasis bag
if(in_stasis)
// First off, there's no oxygen supply, so the mob will slowly take brain damage
adjustOxyLoss(0.1)
adjustOxyLoss(5)
// Next, the method to induce stasis has some adverse side-effects, manifesting
// as cloneloss
adjustCloneLoss(0.1)
adjustCloneLoss(2)
if(stat != DEAD)
blinded = TRUE
stat = UNCONSCIOUS
code/modules/mob/living/living_defense.dm
+5 -3
View File
@@ -90,9 +90,11 @@
//Armor
var/absorb = run_armor_check(def_zone, P.check_armour, P.armor_penetration)
var/damaged
if ((P.damage_flags & DAM_SHARP || P.damage_flags & DAM_SHARP) && prob(absorb))
P.damage_flags &= ~DAM_SHARP
P.damage_flags &= ~DAM_EDGE
if(prob(absorb))
if(P.damage_flags & DAM_SHARP || P.damage_flags & DAM_SHARP || P.damage_flags & DAM_LASER)
P.damage_flags &= ~DAM_SHARP
P.damage_flags &= ~DAM_EDGE
P.damage_flags &= ~DAM_LASER
if(!P.nodamage)
damaged = apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, damage_flags = P.damage_flags, used_weapon = "\a [P.name]")