Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Darkspawn ascension quieter and removes abilities properly #18151

Merged
Bibby0110 merged 2 commits into from
Mar 5, 2023
Merged

Darkspawn ascension quieter and removes abilities properly #18151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b9f047
dspawnpatch4
ynot01 Mar 1, 2023
b6b112a
Update darkspawn.dm
ynot01 Mar 1, 2023
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
19 changes: 12 additions & 7 deletions yogstation/code/modules/antagonists/darkspawn/darkspawn.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,9 @@
var/datum/action/innate/darkspawn/D = abilities[id]
if(!silent)
to_chat(owner.current, span_velvet("You have lost the <b>[D.name]</b> ability."))
QDEL_NULL(abilities[id])
abilities -= abilities[id]
D.Remove(owner.current)
abilities -= D
QDEL_NULL(D)
return TRUE

/datum/antagonist/darkspawn/proc/has_upgrade(id)
Expand Down Expand Up @@ -358,16 +359,20 @@

/datum/antagonist/darkspawn/proc/sacrament()
var/mob/living/carbon/human/user = owner.current
var/mob/living/simple_animal/hostile/darkspawn_progenitor/progenitor = new(get_turf(user))
user.status_flags |= GODMODE
user.mind.transfer_to(progenitor)
progenitor.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/progenitor_curse(null))
if(!SSticker.mode.sacrament_done)
set_security_level(SEC_LEVEL_GAMMA)
addtimer(CALLBACK(src, .proc/sacrament_shuttle_call), 50)
for(var/V in abilities)
remove_ability(abilities[V], TRUE)
sound_to_playing_players('yogstation/sound/magic/sacrament_complete.ogg', 70, FALSE, pressure_affected = FALSE)
for(var/datum/action/innate/darkspawn/leftover_ability in user.actions)
leftover_ability.Remove(user)
QDEL_NULL(leftover_ability)
// Spawn the cosmic progenitor
var/mob/living/simple_animal/hostile/darkspawn_progenitor/progenitor = new(get_turf(user))
user.status_flags |= GODMODE
user.mind.transfer_to(progenitor)
progenitor.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/progenitor_curse(null))
sound_to_playing_players('yogstation/sound/magic/sacrament_complete.ogg', 50, FALSE, pressure_affected = FALSE)
psi = 9999
psi_cap = 9999
psi_regen = 9999
Expand Down
4 changes: 2 additions & 2 deletions yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@
return TRUE

/mob/living/simple_animal/hostile/darkspawn_progenitor/proc/roar()
playsound(src, 'yogstation/sound/creatures/progenitor_roar.ogg', 100, TRUE)
playsound(src, 'yogstation/sound/creatures/progenitor_roar.ogg', 50, TRUE)
for(var/mob/M in GLOB.player_list)
if(get_dist(M, src) > 7)
M.playsound_local(src, 'yogstation/sound/creatures/progenitor_distant.ogg', 75, FALSE, falloff = 5)
M.playsound_local(src, 'yogstation/sound/creatures/progenitor_distant.ogg', 25, FALSE, falloff = 5)
else if(isliving(M))
var/mob/living/L = M
if(L != src) //OH GOD OH FUCK I'M SCARING MYSELF
Expand Down