From 531164cd5e09a5a12d8bc186e3c6ac3e40578584 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 5 Oct 2025 18:16:35 +0200 Subject: [PATCH] jones --- .../objects/effects/effect_system/smoke.dm | 7 +++++++ .../crates_lockers/closets/coffin.dm | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index b2da80e40706..77f411c05941 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -636,6 +636,10 @@ to_chat(moob, SPAN_DANGER(msg)) return TRUE +/obj/effect/particle_effect/smoke/xeno_weak/transparent + alpha = 120 + color = "#cc3333" + /obj/effect/particle_effect/smoke/xeno_weak_fire time_to_live = 16 color = "#b33e1e" @@ -825,6 +829,9 @@ /datum/effect_system/smoke_spread/xeno_weaken smoke_type = /obj/effect/particle_effect/smoke/xeno_weak +/datum/effect_system/smoke_spread/xeno_weaken/transparent + smoke_type = /obj/effect/particle_effect/smoke/xeno_weak/transparent + /datum/effect_system/smoke_spread/xeno_extinguish_fire smoke_type = /obj/effect/particle_effect/smoke/xeno_weak_fire diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index 7601a060e859..fe440a022f72 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -60,6 +60,26 @@ icon_closed = "ancient_coffin_deco" icon_opened = "ancient_coffin_mumified_deco_open" +/obj/structure/closet/coffin/predator/ancient_stone/mummy/deco/gas + var/gas_triggered = FALSE + var/radius = 4 + var/datum/effect_system/smoke_spread/gas_holder + +/obj/structure/closet/coffin/predator/ancient_stone/mummy/deco/gas/attack_alien(mob/living/carbon/xenomorph/M) + if(!gas_triggered) + return //we do not want xenos to trigger it but also for it to not be place to hide for humans + . = .. () + +/obj/structure/closet/coffin/predator/ancient_stone/mummy/deco/gas/toggle(mob/living/user) + . = ..() + if(gas_triggered) + return + + gas_triggered = TRUE + gas_holder = new /datum/effect_system/smoke_spread/xeno_weaken/transparent + gas_holder.set_up(radius, 0, get_turf(src), null, 10) + gas_holder.start() + /obj/structure/closet/coffin/woodencrate //Subtyped here so Req doesn't sell them name = "wooden crate" desc = "A wooden crate. Shoddily assembled, spacious and worthless on the ASRS"