cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement psy-resist block (and fix some naughty remoteview behavior).

Browse Source
This commit is contained in:
Rob Nelson
2014-01-21 00:13:24 -08:00
committed by ZomgPonies
parent 57dc0ddd50
commit 32c6268b59
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+2
View File
@@ -1083,6 +1083,8 @@
var/turf/temp_turf = get_turf(h)
if((temp_turf.z != 1 && temp_turf.z != 5) || h.stat!=CONSCIOUS) //Not on mining or the station. Or dead
continue
if(M_PSY_RESIST in h.mutations)
continue
creatures += h
var/mob/target = input ("Who do you want to project your mind to ?") as mob in creatures
code/modules/mob/living/carbon/human/life.dm
+16 -2
View File
@@ -1439,8 +1439,22 @@
else
var/isRemoteObserve = 0
if((mRemote in mutations) && remoteview_target)
if(remoteview_target.stat==CONSCIOUS)
isRemoteObserve = 1
isRemoteObserve = 1
// Is he unconscious or dead?
if(remoteview_target.stat!=CONSCIOUS)
src << "\red Your psy-connection grows too faint to maintain!"
isRemoteObserve = 0
// Does he have psy resist?
if(M_PSY_RESIST in remoteview_target.mutations)
src << "\red Your mind is shut out!"
isRemoteObserve = 0
// Not on the station or mining?
var/turf/temp_turf = get_turf(remoteview_target)
if((temp_turf.z != 1 && temp_turf.z != 5) || remoteview_target.stat!=CONSCIOUS)
src << "\red Your psy-connection grows too faint to maintain!"
isRemoteObserve = 0
if(!isRemoteObserve && client && !client.adminobs)
remoteview_target = null
reset_view(null)