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

Cleaned the fuck out of smoke.

Browse Source 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/organs/organ_external.dm
This commit is contained in:
Chinsky
2014-04-03 18:18:04 +02:00
committed by alex-gh
parent 01b7f673c2
commit 7f4388c5a3
24 changed files with 184 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+1 -1
View File
@@ -39,7 +39,7 @@ datum
var/datum/reagent/self = src
src = null //of the reagent to the mob on TOUCHING it.
if(!istype(self.holder.my_atom, /obj/effect/effect/chem_smoke))
if(!istype(self.holder.my_atom, /obj/effect/effect/smoke/chem))
// If the chemicals are in a smoke cloud, do not try to let the chemicals "penetrate" into the mob's system (balance station 13) -- Doohl
if(method == TOUCH)
code/modules/reagents/Chemistry-Recipes.dm
+1 -1
View File
@@ -448,7 +448,7 @@ datum
secondary = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/chem_smoke_spread/S = new /datum/effect/effect/system/chem_smoke_spread
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(location)
S.set_up(holder, 10, 0, location)
playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)