cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Standardize XRAY.

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	maps/RandomZLevels/wildwest.dm
This commit is contained in:
Rob Nelson
2014-01-21 22:37:37 -05:00
committed by ZomgPonies
parent 95cc6a27b5
commit dd8c8c12ab
15 changed files with 196 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/humanoid/life.dm
+1 -1
View File
@@ -380,7 +380,7 @@
proc/handle_regular_hud_updates()
if (stat == 2 || (XRAY in mutations))
if (stat == 2 || (M_XRAY in mutations))
sight |= SEE_TURFS
sight |= SEE_MOBS
sight |= SEE_OBJS
code/modules/mob/living/carbon/alien/larva/life.dm
+1 -1
View File
@@ -293,7 +293,7 @@
proc/handle_regular_hud_updates()
if (stat == 2 || (XRAY in mutations))
if (stat == 2 || (M_XRAY in mutations))
sight |= SEE_TURFS
sight |= SEE_MOBS
sight |= SEE_OBJS
code/modules/mob/living/carbon/brain/life.dm
+1 -1
View File
@@ -206,7 +206,7 @@
proc/handle_regular_hud_updates()
if (stat == 2 || (XRAY in src.mutations))
if (stat == 2 || (M_XRAY in src.mutations))
sight |= SEE_TURFS
sight |= SEE_MOBS
sight |= SEE_OBJS
code/modules/mob/living/carbon/human/life.dm
+2 -2
View File
@@ -1283,8 +1283,8 @@
if((VAMP_FULL in mind.vampire.powers))
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO
if(XRAY in mutations)
if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO
if(M_XRAY in mutations)
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO
code/modules/mob/living/carbon/monkey/life.dm
+1 -1
View File
@@ -571,7 +571,7 @@
proc/handle_regular_hud_updates()
if (stat == 2 || (XRAY in mutations))
if (stat == 2 || (M_XRAY in mutations))
sight |= SEE_TURFS
sight |= SEE_MOBS
sight |= SEE_OBJS
code/modules/mob/living/silicon/mommi/life.dm
+1 -1
View File
@@ -133,7 +133,7 @@
/
/mob/living/silicon/robot/mommi/handle_regular_hud_updates()
if (src.stat == 2 || XRAY in mutations || src.sight_mode & BORGXRAY)
if (src.stat == 2 || M_XRAY in mutations || src.sight_mode & BORGXRAY)
src.sight |= SEE_TURFS
src.sight |= SEE_MOBS
src.sight |= SEE_OBJS
code/modules/mob/living/silicon/robot/life.dm
+1 -1
View File
@@ -140,7 +140,7 @@
/mob/living/silicon/robot/proc/handle_regular_hud_updates()
if (src.stat == 2 || XRAY in mutations || src.sight_mode & BORGXRAY)
if (src.stat == 2 || M_XRAY in mutations || src.sight_mode & BORGXRAY)
src.sight |= SEE_TURFS
src.sight |= SEE_MOBS
src.sight |= SEE_OBJS