Changes the holo-fan to the holo-firelock, other minor changes and fixes

This commit is contained in:
Ergovisavi
2017-06-19 20:52:36 -07:00
parent 9f30277c2d
commit e1bdd83020
4 changed files with 45 additions and 32 deletions

View File

@@ -1,5 +1,9 @@
// Foam
// Similar to smoke, but slower and mobs absorb its reagent through their exposed skin.
#define ALUMINUM_FOAM 1
#define IRON_FOAM 2
#define RESIN_FOAM 3
/obj/effect/particle_effect/foam
name = "foam"
@@ -22,16 +26,16 @@
/obj/effect/particle_effect/foam/metal
name = "aluminium foam"
metal = 1
metal = ALUMINUM_FOAM
icon_state = "mfoam"
/obj/effect/particle_effect/foam/metal/iron
name = "iron foam"
metal = 2
metal = IRON_FOAM
/obj/effect/particle_effect/foam/metal/resin
name = "resin foam"
metal = 3
metal = RESIN_FOAM
/obj/effect/particle_effect/foam/New(loc)
@@ -48,12 +52,12 @@
/obj/effect/particle_effect/foam/proc/kill_foam()
STOP_PROCESSING(SSfastprocess, src)
switch(metal)
if(1)
new /obj/structure/foamedmetal(src.loc)
if(2)
new /obj/structure/foamedmetal/iron(src.loc)
if(3)
new /obj/structure/foamedmetal/resin(src.loc)
if(ALUMINUM_FOAM)
new /obj/structure/foamedmetal(get_turf(src))
if(IRON_FOAM)
new /obj/structure/foamedmetal/iron(get_turf(src))
if(RESIN_FOAM)
new /obj/structure/foamedmetal/resin(get_turf(src))
flick("[icon_state]-disolve", src)
QDEL_IN(src, 5)
@@ -240,13 +244,15 @@
/obj/structure/foamedmetal/resin
name = "ATMOS Resin"
desc = "A lightweight, transparent resin used to suffocate fires, scrub the air of toxins, and restore the air to a safe temperature"
opacity = 0
opacity = FALSE
icon_state = "atmos_resin"
alpha = 120
obj_integrity = 10
max_integrity = 10
layer = EDGED_TURF_LAYER
/obj/structure/foamedmetal/resin/New()
/obj/structure/foamedmetal/resin/Initialize()
. = ..()
if(isopenturf(loc))
var/turf/open/O = loc
if(O.air)
@@ -256,17 +262,21 @@
qdel(H)
var/list/G_gases = G.gases
for(var/I in G_gases)
if(I != "o2")
if(I != "o2" && I != "n2")
G.gases[I][MOLES] = 0
G.garbage_collect()
O.air_update_turf()
for(var/obj/machinery/atmospherics/components/unary/U in O)
if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber.
U.welded = 1
if(!U.welded)
U.welded = TRUE
U.update_icon()
U.visible_message("<span class='danger'>[U] sealed shut!</span>")
for(var/mob/living/L in O)
L.ExtinguishMob()
for(var/obj/item/Item in O)
Item.extinguish()
..()
#undef ALUMINUM_FOAM
#undef IRON_FOAM
#undef RESIN_FOAM