cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some runtime errors.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@944 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2011-02-03 02:37:10 +00:00
parent bd30d5c263
commit e78f6c0d50
9 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Chemistry-Holder.dm
+25 -6
View File
@@ -173,17 +173,36 @@ datum
return 0
reaction(var/atom/A, var/method=TOUCH, var/volume_modifier=0)
switch(method)
if(TOUCH)
for(var/datum/reagent/R in reagent_list)
if(ismob(A)) spawn(0) R.reaction_mob(A, TOUCH, R.volume+volume_modifier)
if(isturf(A)) spawn(0) R.reaction_turf(A, R.volume+volume_modifier)
if(isobj(A)) spawn(0) R.reaction_obj(A, R.volume+volume_modifier)
if(ismob(A))
spawn(0)
if(!R) return
else R.reaction_mob(A, TOUCH, R.volume+volume_modifier)
if(isturf(A))
spawn(0)
if(!R) return
else R.reaction_turf(A, R.volume+volume_modifier)
if(isobj(A))
spawn(0)
if(!R) return
else R.reaction_obj(A, R.volume+volume_modifier)
if(INGEST)
for(var/datum/reagent/R in reagent_list)
if(ismob(A) && R) spawn(0) R.reaction_mob(A, INGEST, R.volume+volume_modifier)
if(isturf(A) && R) spawn(0) R.reaction_turf(A, R.volume+volume_modifier)
if(isobj(A) && R) spawn(0) R.reaction_obj(A, R.volume+volume_modifier)
if(ismob(A) && R)
spawn(0)
if(!R) return
else R.reaction_mob(A, INGEST, R.volume+volume_modifier)
if(isturf(A) && R)
spawn(0)
if(!R) return
else R.reaction_turf(A, R.volume+volume_modifier)
if(isobj(A) && R)
spawn(0)
if(!R) return
else R.reaction_obj(A, R.volume+volume_modifier)
return
add_reagent(var/reagent, var/amount, var/data=null)
code/WorkInProgress/Chemistry-Reagents.dm
+10 -10
View File
@@ -166,6 +166,7 @@ datum
reagent_state = LIQUID
reaction_turf(var/turf/T, var/volume)
if (istype(T, /turf/space)) return
src = null
if(volume >= 3)
if(T:wet >= 1) return
@@ -210,16 +211,15 @@ datum
reagent_state = LIQUID
reaction_turf(var/turf/T, var/volume)
if (!istype(T, /turf/space))
src = null
if(T:wet >= 2) return
T:wet = 2
spawn(800)
T:wet = 0
if(T:wet_overlay)
T:overlays -= T:wet_overlay
T:wet_overlay = null
if (istype(T, /turf/space)) return
src = null
if(T:wet >= 2) return
T:wet = 2
spawn(800)
T:wet = 0
if(T:wet_overlay)
T:overlays -= T:wet_overlay
T:wet_overlay = null
return
bilk
code/WorkInProgress/Chemistry-Tools.dm
+2 -1
View File
@@ -254,6 +254,7 @@
playsound(user.loc, 'syringeproj.ogg', 50, 1)
for(var/i=0, i<6, i++)
if(!D) break
if(D.loc == trg) break
step_towards(D,trg)
@@ -273,7 +274,7 @@
sleep(1)
spawn(10) del(D)
if (D) spawn(10) del(D)
return