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

Fixes Static Anomalies #2897

Merged
merged 3 commits into from
Apr 19, 2024
Merged

Fixes Static Anomalies #2897

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e90023a
gzz pbbzz kzzt bzz
Sun-Soaked Apr 14, 2024
b799385
whoopsie doodle
Sun-Soaked Apr 14, 2024
94e7d8f
yeah
Sun-Soaked Apr 14, 2024
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
9 changes: 6 additions & 3 deletions code/game/objects/effects/anomalies/anomalies_static.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
var/mob/living/carbon/victim = looking
var/obj/effect/anomaly/tvstatic/planetary/expansion
expansion = new(get_turf(victim))
visible_message("<span class='warning'> The static overtakes [victim], [expansion] taking their place!</span>")
visible_message("<span class='warning'> The static overtakes [victim], taking their place!</span>")
Sun-Soaked marked this conversation as resolved.
Show resolved Hide resolved
victim.death()
expansion.stored_mob = victim
victim.forceMove(expansion)
Expand Down Expand Up @@ -122,8 +122,11 @@
immobile = TRUE

/obj/effect/anomaly/tvstatic/planetary/Initialize(mapload)
if(prob(25))
stored_mob = /obj/effect/mob_spawn/human/corpse/damaged
if(prob(25) & !stored_mob)
var/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/vicspawner = new (src)
var/mob/living/carbon/victim = (vicspawner.spawned_mob_ref)?.resolve()
src.stored_mob = victim
victim.forceMove(src)
. = ..()

/obj/effect/particle_effect/staticball
Expand Down
4 changes: 4 additions & 0 deletions code/modules/awaymissions/corpse.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
var/show_flavour = TRUE
var/banType = ROLE_LAVALAND
var/ghost_usable = TRUE
/// Weakref to the mob this spawner created - just if you needed to do something with it.
var/datum/weakref/spawned_mob_ref

//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/effect/mob_spawn/attack_ghost(mob/user)
Expand Down Expand Up @@ -128,6 +130,7 @@
MM.name = M.real_name
if(uses > 0)
uses--
spawned_mob_ref = WEAKREF(M)
if(!permanent && !uses)
qdel(src)
return M
Expand Down Expand Up @@ -220,6 +223,7 @@
if(istype(C))
C.sensor_mode = NO_SENSORS


var/obj/item/card/id/W = H.wear_id
if(W)
if(H.age)
Expand Down
Loading