cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix to sky's reagent effects changes

Browse Source
This commit is contained in:
Tastyfish
2012-02-10 00:07:29 -05:00
parent 1332516180
commit bd6fbb5fe8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/effect_system.dm
View File

@@ -410,6 +410,7 @@ steam.start() -- spawns the effect
..() ..()
var/obj/R = new /obj() var/obj/R = new /obj()
R.reagents = new/datum/reagents(500) R.reagents = new/datum/reagents(500)
R.reagents.my_atom = R
reagents.trans_to(R, reagents.total_volume/divisor) reagents.trans_to(R, reagents.total_volume/divisor)
for(var/atom/A in view(1, src)) for(var/atom/A in view(1, src))
R.reagents.reaction(A) R.reagents.reaction(A)
@@ -421,6 +422,7 @@ steam.start() -- spawns the effect
..() ..()
var/obj/R = new /obj() var/obj/R = new /obj()
R.reagents = new/datum/reagents(500) R.reagents = new/datum/reagents(500)
R.reagents.my_atom = R
reagents.trans_to(R, reagents.total_volume/divisor) reagents.trans_to(R, reagents.total_volume/divisor)
R.reagents.reaction(M) R.reagents.reaction(M)
del(R) del(R)

4
code/modules/assembly/signaler.dm
View File

@@ -125,8 +125,8 @@
A.pulse(src.airlock_wire) A.pulse(src.airlock_wire)
else if(holder) else if(holder)
holder.process_activation(src, 1, 0) holder.process_activation(src, 1, 0)
else else
..() ..()
return 1 return 1