[MIRROR] Converts the atmos senstive component over to connect_loc (#5376)

* Converts the atmos senstive component over to connect_loc (#58266)

* Makes all uses of atmos_senstive pass in mapload as context

* Converts atmos senstive to connect_loc, does some general cleanup to the element, and makes it check the state of the tile the thing is on assuming creation didn't happen as a part of map loading

* Updates connect loc to match the new arg list

* Converts the atmos senstive component over to connect_loc

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-05-01 09:44:09 +01:00
committed by GitHub
co-authored by LemonInTheDark
parent c38ebd6f6d
commit 7f083e7cb6
25 changed files with 68 additions and 96 deletions
@@ -31,8 +31,8 @@
slippery_foam = FALSE
var/absorbed_plasma = 0
/obj/effect/particle_effect/foam/firefighting/ComponentInitialize()
..()
/obj/effect/particle_effect/foam/firefighting/Initialize(mapload)
. = ..()
RemoveElement(/datum/element/atmos_sensitive)
/obj/effect/particle_effect/foam/firefighting/process()
@@ -89,15 +89,12 @@
/obj/effect/particle_effect/foam/long_life
lifetime = 150
/obj/effect/particle_effect/foam/Initialize()
/obj/effect/particle_effect/foam/Initialize(mapload)
. = ..()
create_reagents(1000, REAGENT_HOLDER_INSTANT_REACT) //limited by the size of the reagent holder anyway. Works without instant possibly edit in future
START_PROCESSING(SSfastprocess, src)
playsound(src, 'sound/effects/bubbles2.ogg', 80, TRUE, -3)
/obj/effect/particle_effect/foam/ComponentInitialize()
. = ..()
AddElement(/datum/element/atmos_sensitive)
AddElement(/datum/element/atmos_sensitive, mapload)
/obj/effect/particle_effect/foam/ComponentInitialize()
. = ..()
+1 -4
View File
@@ -98,6 +98,7 @@
else //if on the floor, glowshroom on-floor sprite
icon_state = base_icon_state
AddElement(/datum/element/atmos_sensitive, mapload)
COOLDOWN_START(src, spread_cooldown, rand(min_delay_spread, max_delay_spread))
START_PROCESSING(SSobj, src)
@@ -107,10 +108,6 @@
GLOB.glowshrooms--
STOP_PROCESSING(SSobj, src)
/obj/structure/glowshroom/ComponentInitialize()
. = ..()
AddElement(/datum/element/atmos_sensitive)
/**
* Causes glowshroom spreading across the floor/walls.
*/
+2 -2
View File
@@ -7,9 +7,9 @@
density = FALSE
max_integrity = 15
/obj/structure/spider/ComponentInitialize()
/obj/structure/spider/Initialize(mapload)
. = ..()
AddElement(/datum/element/atmos_sensitive)
AddElement(/datum/element/atmos_sensitive, mapload)
/obj/structure/spider/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
if(damage_type == BURN)//the stickiness of the web mutes all attack sounds except fire damage type