Skip to content

jones #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zenith00000 merged 1 commit into from
Oct 7, 2025
Merged

jones #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions code/game/objects/effects/effect_system/smoke.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down
20 changes: 20 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/coffin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down