cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8233 from Iamgoofball/patch-44

Browse Source 
Meth no longer breaks the space time continuum.
This commit is contained in:
Jordie
2015-03-21 17:23:55 +11:00
parent d496fe241f 61e1abafc6
commit c4f7ee6196
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
+9 -9
View File
@@ -169,7 +169,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
return
/datum/reagent/methamphetamine/overdose_process(var/mob/living/M as mob)
if(M.canmove && !istype(M.loc, /turf/space))
if(M.canmove && !istype(M.loc, /atom/movable))
for(var/i = 0, i < 4, i++)
step(M, pick(cardinal))
if(prob(20))
@@ -199,7 +199,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
..()
return
/datum/reagent/methamphetamine/addiction_act_stage3(var/mob/living/M as mob)
if(M.canmove && !istype(M.loc, /turf/space))
if(M.canmove && !istype(M.loc, /atom/movable))
for(var/i = 0, i < 4, i++)
step(M, pick(cardinal))
M.Jitter(15)
@@ -209,7 +209,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
..()
return
/datum/reagent/methamphetamine/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
if(M.canmove && !istype(M.loc, /turf/space))
if(M.canmove && !istype(M.loc, /atom/movable))
for(var/i = 0, i < 8, i++)
step(M, pick(cardinal))
M.Jitter(20)
@@ -317,7 +317,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
M.adjustBrainLoss(1)
M.adjustToxLoss(0.1)
M.hallucination += 10
if(M.canmove && !istype(M.loc, /turf/space))
if(M.canmove && !istype(M.loc, /atom/movable))
step(M, pick(cardinal))
step(M, pick(cardinal))
..()
@@ -333,7 +333,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
/datum/reagent/bath_salts/overdose_process(var/mob/living/M as mob)
M.hallucination += 10
if(M.canmove && !istype(M.loc, /turf/space))
if(M.canmove && !istype(M.loc, /atom/movable))
for(var/i = 0, i < 8, i++)
step(M, pick(cardinal))
if(prob(20))
@@ -347,7 +347,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
/datum/reagent/bath_salts/addiction_act_stage1(var/mob/living/M as mob)
M.hallucination += 10
if(M.canmove && !istype(M.loc, /turf/space))
if(M.canmove && !istype(M.loc, /atom/movable))
for(var/i = 0, i < 8, i++)
step(M, pick(cardinal))
M.Jitter(5)
@@ -358,7 +358,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
return
/datum/reagent/bath_salts/addiction_act_stage2(var/mob/living/M as mob)
M.hallucination += 20
if(M.canmove && !istype(M.loc, /turf/space))
if(M.canmove && !istype(M.loc, /atom/movable))
for(var/i = 0, i < 8, i++)
step(M, pick(cardinal))
M.Jitter(10)
@@ -370,7 +370,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
return
/datum/reagent/bath_salts/addiction_act_stage3(var/mob/living/M as mob)
M.hallucination += 30
if(M.canmove && !istype(M.loc, /turf/space))
if(M.canmove && !istype(M.loc, /atom/movable))
for(var/i = 0, i < 12, i++)
step(M, pick(cardinal))
M.Jitter(15)
@@ -382,7 +382,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
return
/datum/reagent/bath_salts/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
M.hallucination += 40
if(M.canmove && !istype(M.loc, /turf/space))
if(M.canmove && !istype(M.loc, /atom/movable))
for(var/i = 0, i < 16, i++)
step(M, pick(cardinal))
M.Jitter(50)