Skip to content
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

[MIRROR] Adds dynamic blob/obsession to ghost popups, removes third rail popup, tweaks supply pod popup #2581

Merged
merged 1 commit into from
Mar 27, 2024
Merged

[MIRROR] Adds dynamic blob/obsession to ghost popups, removes third rail popup, tweaks supply pod popup #2581

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
10 changes: 10 additions & 0 deletions code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,11 @@
var/mob/living/carbon/human/blob_antag = pick_n_take(candidates)
assigned += blob_antag.mind
blob_antag.mind.special_role = antag_flag
notify_ghosts(
"[blob_antag] has become a blob host!",
source = blob_antag,
header = "So Bulbous...",
)
return ..()

/// Midround Xenomorph Ruleset (From Ghosts)
Expand Down Expand Up @@ -859,6 +864,11 @@
obsessed.gain_trauma(/datum/brain_trauma/special/obsessed)
message_admins("[ADMIN_LOOKUPFLW(obsessed)] has been made Obsessed by the midround ruleset.")
log_game("[key_name(obsessed)] was made Obsessed by the midround ruleset.")
notify_ghosts(
"[obsessed] has developed an obsession with someone!",
source = obsessed,
header = "Love Can Bloom",
)
return TRUE

/// Midround Space Changeling Ruleset (From Ghosts)
Expand Down
5 changes: 0 additions & 5 deletions code/datums/components/energized.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@
return FALSE

// Finally the interesting part where they ACTUALLY get hit!
notify_ghosts(
"[future_tram_victim] has fallen in the path of an oncoming tram!",
source = future_tram_victim,
header = "Electrifying!",
)
do_sparks(4, FALSE, source)
playsound(parent, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
source.audible_message(span_danger("[parent] makes a loud electric crackle!"))
Expand Down
3 changes: 2 additions & 1 deletion code/modules/events/stray_cargo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
crate.update_appearance()
var/obj/structure/closet/supplypod/pod = make_pod()
var/obj/effect/pod_landingzone/landing_marker = new(landing_zone, pod, crate)
announce_to_ghosts(landing_marker)
var/static/mutable_appearance/target_appearance = mutable_appearance('icons/obj/supplypods_32x32.dmi', "LZ")
notify_ghosts("[control.name] has summoned a supply crate!", source = get_turf(landing_marker), header = "Cargo Inbound", alert_overlay = target_appearance)

///Handles the creation of the pod, in case it needs to be modified beforehand
/datum/round_event/stray_cargo/proc/make_pod()
Expand Down
Loading