shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-10 18:10:42 -05:00
committed by kevinz000
parent 5cdd069136
commit 1b70c06474
74 changed files with 113 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chem_splash.dm
+2 -2
View File
@@ -42,7 +42,7 @@
for(var/turf/T in (orange(i, epicenter) - orange(i-1, epicenter)))
turflist |= T
for(var/turf/T in turflist)
if( !(get_dir(T,epicenter) in GLOB.cardinal) && (abs(T.x - epicenter.x) == abs(T.y - epicenter.y) ))
if(!(get_dir(T,epicenter) in GLOB.cardinals) && (abs(T.x - epicenter.x) == abs(T.y - epicenter.y) ))
turflist.Remove(T)
turflist.Add(T) // we move the purely diagonal turfs to the end of the list.
for(var/turf/T in turflist)
@@ -52,7 +52,7 @@
var/turf/NT = thing
if(!(NT in accessible))
continue
if(!(get_dir(T,NT) in GLOB.cardinal))
if(!(get_dir(T,NT) in GLOB.cardinals))
continue
accessible[T] = 1
break
code/modules/reagents/chemistry/reagents/drug_reagents.dm
+11 -11
View File
@@ -15,7 +15,7 @@
M.set_drugginess(15)
if(isturf(M.loc) && !isspaceturf(M.loc))
if(M.canmove)
if(prob(10)) step(M, pick(GLOB.cardinal))
if(prob(10)) step(M, pick(GLOB.cardinals))
if(prob(7))
M.emote(pick("twitch","drool","moan","giggle"))
..()
@@ -184,7 +184,7 @@
/datum/reagent/drug/methamphetamine/overdose_process(mob/living/M)
if(M.canmove && !ismovableatom(M.loc))
for(var/i in 1 to 4)
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
if(prob(20))
M.emote("laugh")
if(prob(33))
@@ -213,7 +213,7 @@
/datum/reagent/drug/methamphetamine/addiction_act_stage3(mob/living/M)
if(M.canmove && !ismovableatom(M.loc))
for(var/i = 0, i < 4, i++)
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
M.Jitter(15)
M.Dizzy(15)
if(prob(40))
@@ -223,7 +223,7 @@
/datum/reagent/drug/methamphetamine/addiction_act_stage4(mob/living/carbon/human/M)
if(M.canmove && !ismovableatom(M.loc))
for(var/i = 0, i < 8, i++)
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
M.Jitter(20)
M.Dizzy(20)
M.adjustToxLoss(5, 0)
@@ -255,8 +255,8 @@
M.adjustToxLoss(0.1, 0)
M.hallucination += 10
if(M.canmove && !ismovableatom(M.loc))
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
step(M, pick(GLOB.cardinals))
..()
. = 1
@@ -264,7 +264,7 @@
M.hallucination += 10
if(M.canmove && !ismovableatom(M.loc))
for(var/i in 1 to 8)
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
if(prob(20))
M.emote(pick("twitch","drool","moan"))
if(prob(33))
@@ -277,7 +277,7 @@
M.hallucination += 10
if(M.canmove && !ismovableatom(M.loc))
for(var/i = 0, i < 8, i++)
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
M.Jitter(5)
M.adjustBrainLoss(10)
if(prob(20))
@@ -288,7 +288,7 @@
M.hallucination += 20
if(M.canmove && !ismovableatom(M.loc))
for(var/i = 0, i < 8, i++)
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
M.Jitter(10)
M.Dizzy(10)
M.adjustBrainLoss(10)
@@ -300,7 +300,7 @@
M.hallucination += 30
if(M.canmove && !ismovableatom(M.loc))
for(var/i = 0, i < 12, i++)
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
M.Jitter(15)
M.Dizzy(15)
M.adjustBrainLoss(10)
@@ -312,7 +312,7 @@
M.hallucination += 40
if(M.canmove && !ismovableatom(M.loc))
for(var/i = 0, i < 16, i++)
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
M.Jitter(50)
M.Dizzy(50)
M.adjustToxLoss(5, 0)
code/modules/reagents/chemistry/reagents/other_reagents.dm
+2 -2
View File
@@ -669,7 +669,7 @@
/datum/reagent/mercury/on_mob_life(mob/living/M)
if(M.canmove && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
if(prob(5))
M.emote(pick("twitch","drool","moan"))
M.adjustBrainLoss(2)
@@ -749,7 +749,7 @@
/datum/reagent/lithium/on_mob_life(mob/living/M)
if(M.canmove && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinal))
step(M, pick(GLOB.cardinals))
if(prob(5))
M.emote(pick("twitch","drool","moan"))
..()