cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standardize XRAY.

Browse Source
This commit is contained in:
Rob Nelson
2014-01-21 13:48:35 -08:00
parent f00823e395
commit da9b61b4e1
15 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/Cib/amorph/life.dm
View File

@@ -396,7 +396,7 @@
handle_regular_hud_updates() handle_regular_hud_updates()
if (src.stat == 2 || (XRAY in mutations)) if (src.stat == 2 || (M_XRAY in mutations))
src.sight |= SEE_TURFS src.sight |= SEE_TURFS
src.sight |= SEE_MOBS src.sight |= SEE_MOBS
src.sight |= SEE_OBJS src.sight |= SEE_OBJS

4
code/game/dna/dna2_domutcheck.dm
View File

@@ -150,12 +150,12 @@
M.disabilities |= TOURETTES M.disabilities |= TOURETTES
M << "\red You twitch." M << "\red You twitch."
if (M.dna.GetSEState(XRAYBLOCK)) if (M.dna.GetSEState(XRAYBLOCK))
if(forced || probinj(30,inj) || (XRAY in old_mutations)) if(forced || probinj(30,inj) || (M_XRAY in old_mutations))
M << "\blue The walls suddenly disappear." M << "\blue The walls suddenly disappear."
// M.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) // M.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
// M.see_in_dark = 8 // M.see_in_dark = 8
// M.see_invisible = 2 // M.see_invisible = 2
M.mutations.Add(XRAY) M.mutations.Add(M_XRAY)
if (M.dna.GetSEState(NERVOUSBLOCK)) if (M.dna.GetSEState(NERVOUSBLOCK))
M.disabilities |= NERVOUS M.disabilities |= NERVOUS
M << "\red You feel nervous." M << "\red You feel nervous."

2
code/game/dna/genes/powers.dm
View File

@@ -167,7 +167,7 @@
/datum/dna/gene/basic/xray /datum/dna/gene/basic/xray
name="X-Ray Vision" name="X-Ray Vision"
activation_messages=list("The walls suddenly disappear.") activation_messages=list("The walls suddenly disappear.")
mutation=XRAY mutation=M_XRAY
New() New()
block=XRAYBLOCK block=XRAYBLOCK

4
code/game/machinery/wishgranter.dm
View File

@@ -42,8 +42,8 @@
if (!(LASER in user.mutations)) if (!(LASER in user.mutations))
user.mutations.Add(LASER) user.mutations.Add(LASER)
if (!(XRAY in user.mutations)) if (!(M_XRAY in user.mutations))
user.mutations.Add(XRAY) user.mutations.Add(M_XRAY)
user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
user.see_in_dark = 8 user.see_in_dark = 8
user.see_invisible = SEE_INVISIBLE_LEVEL_TWO user.see_invisible = SEE_INVISIBLE_LEVEL_TWO

2
code/game/objects/items/devices/flashlight.dm
View File

@@ -77,7 +77,7 @@
if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey)) //robots and aliens are unaffected if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey)) //robots and aliens are unaffected
if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind
user << "<span class='notice'>[M] pupils does not react to the light!</span>" user << "<span class='notice'>[M] pupils does not react to the light!</span>"
else if(XRAY in M.mutations) //mob has X-RAY vision else if(M_XRAY in M.mutations) //mob has X-RAY vision
flick("flash", M.flash) //Yes, you can still get flashed wit X-Ray. flick("flash", M.flash) //Yes, you can still get flashed wit X-Ray.
user << "<span class='notice'>[M] pupils give an eerie glow!</span>" user << "<span class='notice'>[M] pupils give an eerie glow!</span>"
else //they're okay! else //they're okay!

2
code/modules/mob/living/carbon/alien/humanoid/life.dm
View File

@@ -378,7 +378,7 @@
proc/handle_regular_hud_updates() proc/handle_regular_hud_updates()
if (stat == 2 || (XRAY in mutations)) if (stat == 2 || (M_XRAY in mutations))
sight |= SEE_TURFS sight |= SEE_TURFS
sight |= SEE_MOBS sight |= SEE_MOBS
sight |= SEE_OBJS sight |= SEE_OBJS

2
code/modules/mob/living/carbon/alien/larva/life.dm
View File

@@ -293,7 +293,7 @@
proc/handle_regular_hud_updates() proc/handle_regular_hud_updates()
if (stat == 2 || (XRAY in mutations)) if (stat == 2 || (M_XRAY in mutations))
sight |= SEE_TURFS sight |= SEE_TURFS
sight |= SEE_MOBS sight |= SEE_MOBS
sight |= SEE_OBJS sight |= SEE_OBJS

2
code/modules/mob/living/carbon/brain/life.dm
View File

@@ -205,7 +205,7 @@
proc/handle_regular_hud_updates() 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_TURFS
sight |= SEE_MOBS sight |= SEE_MOBS
sight |= SEE_OBJS sight |= SEE_OBJS

2
code/modules/mob/living/carbon/human/life.dm
View File

@@ -1259,7 +1259,7 @@
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8 see_in_dark = 8
if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO
if(XRAY in mutations) if(M_XRAY in mutations)
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8 see_in_dark = 8
if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO

2
code/modules/mob/living/carbon/monkey/life.dm
View File

@@ -565,7 +565,7 @@
proc/handle_regular_hud_updates() proc/handle_regular_hud_updates()
if (stat == 2 || (XRAY in mutations)) if (stat == 2 || (M_XRAY in mutations))
sight |= SEE_TURFS sight |= SEE_TURFS
sight |= SEE_MOBS sight |= SEE_MOBS
sight |= SEE_OBJS sight |= SEE_OBJS

2
code/modules/mob/living/silicon/mommi/life.dm
View File

@@ -132,7 +132,7 @@
/ /
/mob/living/silicon/robot/mommi/handle_regular_hud_updates() /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_TURFS
src.sight |= SEE_MOBS src.sight |= SEE_MOBS
src.sight |= SEE_OBJS src.sight |= SEE_OBJS

2
code/modules/mob/living/silicon/robot/life.dm
View File

@@ -142,7 +142,7 @@
/mob/living/silicon/robot/proc/handle_regular_hud_updates() /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_TURFS
src.sight |= SEE_MOBS src.sight |= SEE_MOBS
src.sight |= SEE_OBJS src.sight |= SEE_OBJS

2
code/setup.dm
View File

@@ -321,7 +321,7 @@ var/MAX_EXPLOSION_RANGE = 14
// Generic mutations: // Generic mutations:
#define M_TK 1 #define M_TK 1
#define M_RESIST_COLD 2 #define M_RESIST_COLD 2
#define XRAY 3 #define M_XRAY 3
#define HULK 4 #define HULK 4
#define CLUMSY 5 #define CLUMSY 5
#define FAT 6 #define FAT 6

2
code/unused/hivebot/life.dm
View File

@@ -116,7 +116,7 @@
handle_regular_hud_updates() handle_regular_hud_updates()
if (src.stat == 2 || XRAY in src.mutations) if (src.stat == 2 || M_XRAY in src.mutations)
src.sight |= SEE_TURFS src.sight |= SEE_TURFS
src.sight |= SEE_MOBS src.sight |= SEE_MOBS
src.sight |= SEE_OBJS src.sight |= SEE_OBJS

4
maps/RandomZLevels/wildwest.dm
View File

@@ -55,8 +55,8 @@
if (!(M_RESIST_HEAT in user.mutations)) if (!(M_RESIST_HEAT in user.mutations))
user.mutations.Add(M_RESIST_HEAT) user.mutations.Add(M_RESIST_HEAT)
user << "\blue Your skin feels icy to the touch." user << "\blue Your skin feels icy to the touch."
if (!(XRAY in user.mutations)) if (!(M_XRAY in user.mutations))
user.mutations.Add(XRAY) user.mutations.Add(M_XRAY)
user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
user.see_in_dark = 8 user.see_in_dark = 8
user.see_invisible = SEE_INVISIBLE_LEVEL_TWO user.see_invisible = SEE_INVISIBLE_LEVEL_TWO