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

Merge pull request #11052 from Fox-McCloud/goon-smoke

Browse Source 
[Goonchem] Implements Goon Smoke
This commit is contained in:
variableundefined
2019-03-22 17:45:11 +08:00
committed by GitHub
parent 58599fedc1 ea752e7191
commit eee376ba0d
10 changed files with 134 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/vent_clog.dm
+1 -1
View File
@@ -29,7 +29,7 @@
R.add_reagent(pick(gunk), 50)
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, rand(1, 2), 0, vent, 0, silent = 1)
smoke.set_up(R, vent, TRUE)
playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start(3)
qdel(R)
code/modules/hydroponics/plant_genes.dm
+1 -2
View File
@@ -409,8 +409,7 @@
var/datum/effect_system/smoke_spread/chem/S = new
var/splat_location = get_turf(target)
var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1)
S.attach(splat_location)
S.set_up(G.reagents, 2, 0, splat_location)
S.set_up(G.reagents, splat_location)
S.start(smoke_amount)
if(G && G.reagents)
G.reagents.clear_reagents()
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+2 -4
View File
@@ -233,14 +233,12 @@ 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
S.attach(location)
playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
if(S)
S.set_up(holder, 10, 0, location)
S.set_up(holder, location)
if(created_volume < 5)
S.start(1)
if(created_volume >=5 && created_volume < 10)
code/modules/research/experimentor.dm
+3 -3
View File
@@ -318,7 +318,7 @@
R.add_reagent(chosenchem , 15)
investigate_log("Experimentor has released [chosenchem] smoke.", "experimentor")
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
smoke.set_up(R, src, TRUE)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
qdel(R)
@@ -330,7 +330,7 @@
R.my_atom = src
R.add_reagent(chosenchem , 15)
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
smoke.set_up(R, src, TRUE)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
qdel(R)
@@ -417,7 +417,7 @@
R.add_reagent("frostoil" , 15)
investigate_log("Experimentor has released frostoil gas.", "experimentor")
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
smoke.set_up(R, src, TRUE)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
qdel(R)