modifies the ark to not immediately activate and purges some todos

Tin
This commit is contained in:
DeltaFire
2020-07-26 23:00:29 +02:00
parent 5fb64c38e8
commit 93672ea1e4
3 changed files with 14 additions and 4 deletions
@@ -251,7 +251,6 @@
/obj/effect/clockwork/spatial_gateway/stable
name = "stable gateway"
is_stable = TRUE
//TODO: Icon for the gateway that looks a bit different
/obj/effect/clockwork/spatial_gateway/stable/ex_act(severity)
if(severity == 1)
@@ -275,7 +274,7 @@
busy = FALSE
linked_gateway.busy = FALSE
return TRUE
//TODO: Add effect for this, maybe reuse the void blaster one from that PR?
//Not too fancy, but this'll do.. for now.
/obj/effect/clockwork/spatial_gateway/stable/proc/start_shutdown()
@@ -39,7 +39,18 @@
glow = new(get_turf(src))
if(!GLOB.ark_of_the_clockwork_justiciar)
GLOB.ark_of_the_clockwork_justiciar = src
START_PROCESSING(SSprocessing, src)
/obj/structure/destructible/clockwork/massive/celestial_gateway/attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
. = ..()
if(.)
return
if(!active && is_servant_of_ratvar(user) && user.canUseTopic(src, !issilicon(user), NO_DEXTERY))
var/choice = alert(user,"Enabling the ark", "Are you sure you want to activate the ark? Once enabled, there will be no turning back.", "Activate!", "Cancel")
switch(choice)
if("Activate!")
START_PROCESSING(SSprocessing, src)
else
to_chat(user, "<span class='brass'>You decide against activating the ark.. for now.</span>")
/obj/structure/destructible/clockwork/massive/celestial_gateway/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
. = ..()
@@ -53,7 +53,7 @@
if(!is_servant_of_ratvar(user) || !can_access_clockwork_power(src, hierophant_cost) || !anchored)
to_chat(user, "<span class='warning'>You place your hand on [src], but it doesn't react.</span>")
return
var/choice = alert(user,"You place your hand on [src]...",,"Hierophant Broadcast","Spatial Gateway","Cancel") //TODO: Find a good way to do this because choice / alert does only support up to six args, not seven as needed
var/choice = alert(user,"You place your hand on [src]...",,"Hierophant Broadcast","Spatial Gateway","Cancel") //Will create a stable gateway instead if between two obelisks one of which is onstation and the other on reebe
switch(choice)
if("Hierophant Broadcast")
if(active)