cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-25 21:16:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned the fuck out of smoke.

Browse Source
This commit is contained in:
Chinsky
2013-11-05 02:57:23 +04:00
parent 6a235716f8
commit fd928d4b5f
24 changed files with 158 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/trigger.dm
+2 -2
View File
@@ -31,11 +31,11 @@
s.start()
if(entersmoke)
var/datum/effect/effect/system/harmless_smoke_spread/s = new /datum/effect/effect/system/harmless_smoke_spread
var/datum/effect/effect/system/smoke_spread/s = new /datum/effect/effect/system/smoke_spread
s.set_up(4, 1, src, 0)
s.start()
if(exitsmoke)
var/datum/effect/effect/system/harmless_smoke_spread/s = new /datum/effect/effect/system/harmless_smoke_spread
var/datum/effect/effect/system/smoke_spread/s = new /datum/effect/effect/system/smoke_spread
s.set_up(4, 1, dest, 0)
s.start()
code/modules/mob/living/carbon/alien/humanoid/life.dm
+1 -1
View File
@@ -128,7 +128,7 @@
breath = loc.remove_air(breath_moles)
// Handle chem smoke effect -- Doohl
for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
if(smoke.reagents.total_volume)
smoke.reagents.reaction(src, INGEST)
spawn(5)
code/modules/mob/living/carbon/alien/larva/life.dm
+1 -1
View File
@@ -103,7 +103,7 @@
breath = loc.remove_air(breath_moles)
// Handle chem smoke effect -- Doohl
for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
if(smoke.reagents.total_volume)
smoke.reagents.reaction(src, INGEST)
spawn(5)
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -359,7 +359,7 @@
if(!block)
for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
if(smoke.reagents.total_volume)
smoke.reagents.reaction(src, INGEST)
spawn(5)
code/modules/mob/living/carbon/monkey/life.dm
+1 -1
View File
@@ -250,7 +250,7 @@
block = 1
if(!block)
for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
if(smoke.reagents.total_volume)
smoke.reagents.reaction(src, INGEST)
spawn(5)
code/modules/mob/living/simple_animal/bees.dm
+1 -1
View File
@@ -80,7 +80,7 @@
//smoke, water and steam calms us down
var/calming = 0
var/list/calmers = list(/obj/effect/effect/chem_smoke, \
var/list/calmers = list(/obj/effect/effect/smoke/chem, \
/obj/effect/effect/water, \
/obj/effect/effect/foam, \
/obj/effect/effect/steam, \
code/modules/mob/living/simple_animal/hostile/hivebot.dm
+1 -1
View File
@@ -76,7 +76,7 @@
New()
..()
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
smoke.set_up(5, 0, src.loc)
smoke.start()
visible_message("\red <B>The [src] warps in!</B>")
code/modules/organs/organ_external.dm
+1 -1
View File
@@ -418,7 +418,7 @@ This function completely restores a damaged organ to perfect condition.
if(status & ORGAN_DESTROYED)
owner.update_body(1)
else
UpdateDamageIcon(1)
owner.UpdateDamageIcon(1)
return 1
return 0
code/modules/power/apc.dm
+1 -1
View File
@@ -962,7 +962,7 @@
cell.corrupt()
src.malfhack = 1
update_icon()
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()
code/modules/power/smes.dm
+2 -2
View File
@@ -303,7 +303,7 @@
for(var/mob/M in viewers(src))
M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2)
sleep(10*pick(4,5,6,7,10,14))
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()
@@ -321,7 +321,7 @@
emp_act(2)
if(prob(5)) //smoke only
world << "\red SMES smoke in [src.loc.loc]"
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()
code/modules/reagents/Chemistry-Reagents.dm
+1 -1
View File
@@ -31,7 +31,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
@@ -433,7 +433,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)