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

Fix airlock related hallucination affecting ipcs and dionae (#2261)

Browse Source 
This may fix dionae and ipcs touching airlocks while suffering from sm's hallucination, SOMEHOW, and being "shocked" by them.
This commit is contained in:
Alberyk
2017-05-14 13:22:02 +03:00
committed by skull132
parent 462f428d5c
commit 2e2a92b39a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+1 -1
View File
@@ -414,7 +414,7 @@ About the new airlock wires panel:
return
else /*if(src.justzap)*/
return
else if(user.hallucination > 50 && prob(10) && src.operating == 0)
else if(user.hallucination > 50 && prob(10) && src.operating == 0 && !user.is_diona() && !user.isSynthetic())
user << "<span class='danger'>You feel a powerful shock course through your body!</span>"
user.halloss += 10
user.stunned += 10
code/modules/supermatter/supermatter.dm
+1 -1
View File
@@ -263,7 +263,7 @@
env.merge(removed)
for(var/mob/living/carbon/human/l in view(src, min(7, round(sqrt(power/6))))) // If they can see it without mesons on. Bad on them.
if(!istype(l.glasses, /obj/item/clothing/glasses/meson) && !l.is_diona())
if(!istype(l.glasses, /obj/item/clothing/glasses/meson) && !l.is_diona() && !l.isSynthetic())
l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) )
//adjusted range so that a power of 170 (pretty high) results in 9 tiles, roughly the distance from the core to the engine monitoring room.