mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 02:16:05 +00:00
[Cult 4] Upheaval Update Part 2 - Eclipse Update (#36361)
* First Day * you sit right there I'll be back * More UI work * cultist slot * cultist slots finished * actually finished * ritualized soulblades and shit * roles part of the main panel * fixing tooltips and removing rituals * eclipse event * eclipse manager * more eclipse work * rebase and dance platforms * more dancing * more dance and some particles * lots of stuff again * more parallax * pillars and particles * dark devotion * more UI * progress * sqdqsdsqdsqd * almost there * more polish * gradius * Rituals return * Rituaaaals * tests and fixes * first fix * qsdqsd * derp * fix * more fixes * drill cult * more polish * narsie gib and better desc for add_zero_2 * better arg names * polish and fixes * fix pylons * stuck meatblobs no longer spam runtimes * better * thematic * this is way better * finishing touches * we've got one more surprise for you * (and one last fix) * (and another one)
This commit is contained in:
@@ -123,6 +123,10 @@ var/creating_arena = FALSE
|
||||
name = capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
|
||||
real_name = name
|
||||
|
||||
var/datum/faction/bloodcult/cult = find_active_faction_by_type(/datum/faction/bloodcult)
|
||||
if (cult && ((cult.stage == BLOODCULT_STAGE_ECLIPSE) || (cult.stage == BLOODCULT_STAGE_NARSIE)))
|
||||
cultify()
|
||||
|
||||
start_poltergeist_cooldown() //FUCK OFF GHOSTS
|
||||
..()
|
||||
|
||||
@@ -142,15 +146,17 @@ var/creating_arena = FALSE
|
||||
// Legacy Cult stuff
|
||||
if(istype(W,/obj/item/weapon/tome_legacy))
|
||||
cultify()//takes care of making ghosts visible
|
||||
// Big boy modern Cult 3.0 stuff
|
||||
// Big boy modern Cult 3.0 and beyond stuff
|
||||
if (iscultist(user))
|
||||
if(istype(W,/obj/item/weapon/tome))
|
||||
if(invisibility != 0 || icon_state != "ghost-narsie")
|
||||
if(invisibility != 0)
|
||||
cultify()
|
||||
user.visible_message(
|
||||
"<span class='warning'>[user] drags a ghost to our plane of reality!</span>",
|
||||
"<span class='warning'>You drag a ghost to our plane of reality!</span>"
|
||||
)
|
||||
var/datum/role/cultist/C = user.mind.GetRole(CULTIST)
|
||||
C.gain_devotion(50, DEVOTION_TIER_3, "visible_ghost", src)
|
||||
return
|
||||
else if (istype(W,/obj/item/weapon/talisman))
|
||||
var/obj/item/weapon/talisman/T = W
|
||||
@@ -203,9 +209,8 @@ var/creating_arena = FALSE
|
||||
W.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
|
||||
|
||||
if(istype(W,/obj/item/weapon/storage/bible) || isholyweapon(W))
|
||||
var/mob/dead/M = src
|
||||
if(src.invisibility == 0)
|
||||
M.invisibility = 60
|
||||
if(invisibility == 0)
|
||||
decultify()
|
||||
user.visible_message(
|
||||
"<span class='warning'>[user] banishes the ghost from our plane of reality!</span>",
|
||||
"<span class='warning'>You banish the ghost from our plane of reality!</span>"
|
||||
|
||||
@@ -322,10 +322,7 @@
|
||||
if(C && C.members.len > config.cult_ghostwriter_req_cultists)
|
||||
ghosts_can_write = TRUE
|
||||
|
||||
//TODO (UPHEAVAL PART 2): Allow ghosts_can_write during Eclipse
|
||||
//if (veil_thickness >= CULT_ACT_III)
|
||||
// ghosts_can_write = TRUE
|
||||
if (invisibility == 0)
|
||||
if (invisibility == 0)//All ghosts become visible during the Eclipse ritual
|
||||
ghosts_can_write = TRUE
|
||||
|
||||
if(!ghosts_can_write)
|
||||
|
||||
Reference in New Issue
Block a user