Skip to content

Commit

Permalink
Spatial Gateways will last twice as long (tgstation#18808)
Browse files Browse the repository at this point in the history
* Spatial Gateways will last slightly longer

* no slabs
  • Loading branch information
ChangelingRain authored and KorPhaeron committed Jun 22, 2016
1 parent 494afdc commit 8c87be8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions code/game/gamemodes/clock_cult/clock_scripture.dm
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed
descname = "Teleport Gate"
name = "Spatial Gateway"
desc = "Tears open a miniaturized gateway in spacetime to any conscious servant that can transport objects or creatures to its destination. \
Each servant assisting in the invocation adds uses and duration to the gateway. Lasts for ten or more seconds or until it is out of uses."
Each servant assisting in the invocation adds one additional use and four additional seconds to the gateway's uses and duration."
invocations = list("Gryrcbegre...", "...pbzva evtug-hc!")
channel_time = 80
required_components = list("replicant_alloy" = 1, "hierophant_ansible" = 1)
Expand Down Expand Up @@ -684,10 +684,10 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed
for(var/mob/living/L in range(1, invoker))
if(!L.stat && is_servant_of_ratvar(L))
portal_uses++
duration += 20 //2 seconds
duration += 40 //4 seconds
if(ratvar_awakens)
portal_uses = max(portal_uses, 100) //Very powerful if Ratvar has been summoned
duration = max(duration, 30)
duration = max(duration, 100)
return invoker.procure_gateway(invoker, duration, portal_uses)


Expand Down
3 changes: 3 additions & 0 deletions code/game/gamemodes/clock_cult/clock_structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,9 @@
qdel(linked_gateway)
qdel(src)
return 1
if(istype(I, /obj/item/clockwork/slab))
user << "<span class='heavy_brass'>\"I don't think you want to drop your slab into that\".\n\"If you really want to, try throwing it.\"</span>"
return 1
if(user.drop_item())
user.visible_message("<span class='warning'>[user] drops [I] into [src]!</span>", "<span class='danger'>You drop [I] into [src]!</span>")
pass_through_gateway(I)
Expand Down
4 changes: 2 additions & 2 deletions code/game/gamemodes/clock_cult/clock_unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
time_duration *= 2
invoker.visible_message("<span class='warning'>The air in front of [invoker] ripples before suddenly tearing open!</span>", \
"<span class='brass'>With a word, you rip open a [two_way ? "two-way":"one-way"] rift to [input_target_key]. It will last for [time_duration / 10] seconds and has [gateway_uses] use[gateway_uses > 1 ? "s" : ""].</span>")
var/obj/effect/clockwork/spatial_gateway/S1 = new(istype(src, /obj/structure/clockwork/powered/clockwork_obelisk) ? src.loc : get_step(invoker, invoker.dir))
var/obj/effect/clockwork/spatial_gateway/S2 = new(istargetobelisk ? target.loc : get_step(target, target.dir))
var/obj/effect/clockwork/spatial_gateway/S1 = new(istype(src, /obj/structure/clockwork/powered/clockwork_obelisk) ? get_turf(src) : get_step(get_turf(invoker), invoker.dir))
var/obj/effect/clockwork/spatial_gateway/S2 = new(istargetobelisk ? get_turf(target) : get_step(get_turf(target), target.dir))

//Set up the portals now that they've spawned
S1.setup_gateway(S2, time_duration, gateway_uses, two_way)
Expand Down

0 comments on commit 8c87be8

Please sign in to comment.