cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

safety

Browse Source
This commit is contained in:
Fox McCloud
2019-03-19 03:10:47 -04:00
parent f01af6ae20
commit ea752e7191
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effects_chem_smoke.dm
+3 -4
View File
@@ -49,10 +49,9 @@
/datum/effect_system/smoke_spread/chem/New()
..()
chemholder = new/obj()
var/datum/reagents/R = new/datum/reagents(500)
chemholder.reagents = R
R.my_atom = chemholder
chemholder = new
chemholder.create_reagents(1000)
chemholder.reagents.set_reacting(FALSE) // Just in case
/datum/effect_system/smoke_spread/chem/Destroy()
QDEL_NULL(chemholder)
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+1 -2
View File
@@ -233,8 +233,7 @@ datum/chemical_reaction/flash_powder
/datum/chemical_reaction/smoke/on_reaction(datum/reagents/holder, created_volume)
for(var/f_reagent in forbidden_reagents)
if(holder.has_reagent(f_reagent))
holder.remove_reagent(f_reagent, holder.get_reagent_amount(f_reagent))
holder.del_reagent(f_reagent)
var/location = get_turf(holder.my_atom)
var/datum/effect_system/smoke_spread/chem/S = new
playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)