(Ready) Clockwork Cult Rework: Proof-of-concept

code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm

@@ -0,0 +1,50 @@
+//These spawn across the station when the Ark activates. Anyone can walk through one to teleport to Reebe.
+/obj/effect/clockwork/city_of_cogs_rift
+	name = "celestial rift"
+	desc = "A stable bluespace rip. You're not sure it where leads."
+	clockwork_desc = "A one-way rift to the City of Cogs. Because it's linked to the Ark, it can't be closed."
+	icon_state = "city_of_cogs_rift"
+	resistance_flags = INDESTRUCTIBLE
+	density = TRUE
+	light_range = 2
+	light_power = 3
+	light_color = "#6A4D2F"
+
+/obj/effect/clockwork/city_of_cogs_rift/Initialize()
+	. = ..()
+	visible_message("<span class='warning'>The air above [loc] shimmers and pops as a [name] forms there!</span>")
+	for(var/mob/M in GLOB.player_list)
+		if(M.z == z)
+			if(get_dist(src, M) >= 7)
+				M.playsound_local(src, 'sound/magic/blink.ogg', 10, FALSE, falloff = 10)
+			else
+				M.playsound_local(src, 'sound/magic/blink.ogg', 50, FALSE)
+
+/obj/effect/clockwork/city_of_cogs_rift/Destroy()
+	visible_message("<span class='warning'>[src] cracks as it destabilizes and breaks apart!</span>")
+	return ..()
+
+/obj/effect/clockwork/city_of_cogs_rift/attackby(obj/item/I, mob/living/user, params)
+	if(istype(I, /obj/item/nullrod))
+		to_chat(user, "<span class='warning'>Your [I.name] seems to have no effect on [src]!</span>")
+		return
+	. = ..()
+
+/obj/effect/clockwork/city_of_cogs_rift/attack_hand(atom/movable/AM)
+	beckon(AM)
+
+/obj/effect/clockwork/city_of_cogs_rift/CollidedWith(atom/movable/AM)
+	if(!QDELETED(AM))
+		beckon(AM)
+
+/obj/effect/clockwork/city_of_cogs_rift/proc/beckon(atom/movable/AM)
+	AM.visible_message("<span class='danger'>[AM] passes through [src]!</span>", ignore_mob = AM)
+	AM.forceMove(pick(!is_servant_of_ratvar(AM) ? GLOB.city_of_cogs_spawns : GLOB.servant_spawns))
+	AM.visible_message("<span class='danger'>[AM] materializes from the air!</span>", \
+	"<span class='boldannounce'>You pass through [src] and appear [is_servant_of_ratvar(AM) ? "back at the City of Cogs" : "somewhere unfamiliar. Looks like it was a one-way trip.."].</span>")
+	do_sparks(5, TRUE, src)
+	do_sparks(5, TRUE, AM)
+	if(isliving(AM))
+		var/mob/living/L = AM
+		L.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
+		L.clear_fullscreen("flash", 5)

code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm

@@ -11,21 +11,11 @@
 	var/stat_affected = CONSCIOUS
 	var/sigil_name = "Sigil"
 	var/resist_string = "glows blinding white" //string for when a null rod blocks its effects, "glows [resist_string]"
-	var/list/component_refund = list()
 
 /obj/effect/clockwork/sigil/attackby(obj/item/I, mob/living/user, params)
-	if(is_servant_of_ratvar(user))
-		if(istype(I, /obj/item/clockwork/slab))
-			user.visible_message("<span class='warning'>[user] starts to dispel [src]...</span>", "<span class='danger'>You start to dispel [src]...</span>")
-			if(do_after(user, 20, target = src))
-				user.visible_message("<span class='warning'>[user] dispels [src]!</span>", "<span class='danger'>You dispel [src]!</span>")
-				for(var/i in component_refund)
-					if(component_refund[i])
-						for(var/r in 1 to component_refund[i])
-							generate_cache_component(i, src)
-					qdel(src)
-			return 1
-	else if(I.force)
+	if(I.force)
+		if(is_servant_of_ratvar(user) && user.a_intent != INTENT_HARM)
+			return ..()
 		user.visible_message("<span class='warning'>[user] scatters [src] with [I]!</span>", "<span class='danger'>You scatter [src] with [I]!</span>")
 		qdel(src)
 		return 1
@@ -35,7 +25,9 @@
 	return //you can't tk stomp sigils, but you can hit them with something
 
 /obj/effect/clockwork/sigil/attack_hand(mob/user)
-	if(iscarbon(user) && !user.stat && !is_servant_of_ratvar(user))
+	if(iscarbon(user) && !user.stat)
+		if(is_servant_of_ratvar(user) && user.a_intent != INTENT_HARM)
+			return ..()
 		user.visible_message("<span class='warning'>[user] stamps out [src]!</span>", "<span class='danger'>You stomp on [src], scattering it into thousands of particles.</span>")
 		qdel(src)
 		return 1
@@ -75,7 +67,6 @@
 	light_power = 1
 	light_color = "#FAE48C"
 	sigil_name = "Sigil of Transgression"
-	component_refund = list(HIEROPHANT_ANSIBLE = 1)
 
 /obj/effect/clockwork/sigil/transgression/sigil_effects(mob/living/L)
 	var/target_flashed = L.flash_act()
@@ -85,10 +76,11 @@
 	if(iscultist(L))
 		to_chat(L, "<span class='heavy_brass'>\"Watch your step, wretch.\"</span>")
 		L.adjustBruteLoss(10)
-		L.Knockdown(140, FALSE)
+		L.Knockdown(80, FALSE)
 	L.visible_message("<span class='warning'>[src] appears around [L] in a burst of light!</span>", \
 	"<span class='userdanger'>[target_flashed ? "An unseen force":"The glowing sigil around you"] holds you in place!</span>")
-	L.Stun(100)
+	L.Stun(40)
+	L.apply_status_effect(STATUS_EFFECT_BELLIGERENT)
 	new /obj/effect/temp_visual/ratvar/sigil/transgression(get_turf(src))
 	qdel(src)
 
@@ -107,18 +99,23 @@
 	light_color = "#FAE48C"
 	stat_affected = UNCONSCIOUS
 	resist_string = "glows faintly yellow"
-	sigil_name = "Sigil of Submission"
-	component_refund = list(GEIS_CAPACITOR = 1)
 	var/convert_time = 80
 	var/delete_on_finish = TRUE
+	sigil_name = "Sigil of Submission"
 	var/glow_type = /obj/effect/temp_visual/ratvar/sigil/submission
 
 /obj/effect/clockwork/sigil/submission/sigil_effects(mob/living/L)
-	if(istype(L.buckled, /obj/structure/destructible/clockwork/geis_binding))
-		if(is_servant_of_ratvar(L.pulledby))
-			L.pulledby.stop_pulling()
-		if(is_servant_of_ratvar(L.buckled.pulledby))
-			L.buckled.pulledby.stop_pulling()
+	var/turf/T = get_turf(src)
+	var/has_sigil = FALSE
+	var/has_servant = FALSE
+	if(locate(/obj/effect/clockwork/sigil/transgression) in T)
+		has_sigil = TRUE
+	for(var/mob/living/M in range(3, src))
+		if(is_servant_of_ratvar(M) && !M.stat)
+			has_servant = TRUE
+	if(!has_sigil && !has_servant)
+		visible_message("<span class='danger'>[src] strains into a gentle violet color, but quietly fades...</span>")
+		return
 	L.visible_message("<span class='warning'>[src] begins to glow a piercing magenta!</span>", "<span class='sevtug'>You feel something start to invade your mind...</span>")
 	var/oldcolor = color
 	animate(src, color = "#AF0AAF", time = convert_time, flags = ANIMATION_END_NOW)
@@ -127,10 +124,10 @@
 		glow = new glow_type(get_turf(src))
 		animate(glow, alpha = 255, time = convert_time)
 	var/I = 0
-	while(I < convert_time && !QDELETED(L) && get_turf(L) == get_turf(src))
+	while(I < convert_time && get_turf(L) == get_turf(src))
 		I++
 		sleep(1)
-	if(QDELETED(L) || get_turf(L) != get_turf(src))
+	if(get_turf(L) != get_turf(src))
 		if(glow)
 			qdel(glow)
 		animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW)
@@ -139,6 +136,9 @@
 		return
 	if(is_eligible_servant(L))
 		to_chat(L, "<span class='heavy_brass'>\"You belong to me now.\"</span>")
+		if(!GLOB.application_scripture_unlocked)
+			GLOB.application_scripture_unlocked = TRUE
+			hierophant_message("<span class='large_brass bold'>With the conversion of a new servant the Ark's power grows. Application scriptures are now available.</span>")
 	if(add_servant_of_ratvar(L))
 		L.log_message("<font color=#BE8700>Conversion was done with a [sigil_name].</font>", INDIVIDUAL_ATTACK_LOG)
 	L.Knockdown(50) //Completely defenseless for five seconds - mainly to give them time to read over the information they've just been presented with
@@ -160,29 +160,26 @@
 	visible_message("<span class='warning'>[src] slowly stops glowing!</span>")
 
 
-//Sigil of Transmission: Stores power for clockwork machinery, serving as a battery.
+//Sigil of Transmission: Serves as an access point for powered structures.
 /obj/effect/clockwork/sigil/transmission
 	name = "suspicious sigil"
 	desc = "A glowing orange sigil. The air around it feels staticky."
-	clockwork_desc = "A sigil that serves as power generation and a battery for clockwork structures."
+	clockwork_desc = "A sigil that serves as power generation and a battery for clockwork structures, linked to all other sigils of its type."
 	icon_state = "sigiltransmission"
 	alpha = 50
 	color = "#EC8A2D"
 	light_color = "#EC8A2D"
 	resist_string = "glows faintly"
 	sigil_name = "Sigil of Transmission"
-	component_refund = list(HIEROPHANT_ANSIBLE = 1)
 	affects_servants = TRUE
-	var/power_charge = 0 //starts with no power
-	var/drain_range = 14
 
 /obj/effect/clockwork/sigil/transmission/Initialize()
 	. = ..()
-	update_glow()
+	update_icon()
 
 /obj/effect/clockwork/sigil/transmission/ex_act(severity)
 	if(severity == 3)
-		modify_charge(-500)
+		adjust_clockwork_power(500) //Light explosions charge the network!
 		visible_message("<span class='warning'>[src] flares a brilliant orange!</span>")
 	else
 		..()
@@ -193,70 +190,26 @@
 		var/structure_number = 0
 		for(var/obj/structure/destructible/clockwork/powered/P in range(SIGIL_ACCESS_RANGE, src))
 			structure_number++
-		to_chat(user, "<span class='[power_charge ? "brass":"alloy"]'>It is storing <b>[GLOB.ratvar_awakens ? "INFINITE</b>":"[DisplayPower(power_charge)]</b> of"] power, \
-		and <b>[structure_number]</b> Clockwork Structure[structure_number == 1 ? " is":"s are"] in range.</span>")
-		to_chat(user, "<span class='brass'>While active, it will gradually drain power from nearby electronics. It is currently [isprocessing ? "active":"disabled"].</span>")
+		to_chat(user, "<span class='[get_clockwork_power() ? "brass":"alloy"]'>It is storing <b>[DisplayPower(get_clockwork_power())]</b> of shared power, \
+		and <b>[structure_number]</b> clockwork structure[structure_number == 1 ? " is":"s are"] in range.</span>")
 		if(iscyborg(user))
 			to_chat(user, "<span class='brass'>You can recharge from the [sigil_name] by crossing it.</span>")
-		else if(!GLOB.ratvar_awakens)
-			to_chat(user, "<span class='brass'>Hitting the [sigil_name] with brass sheets will convert them to power at a rate of <b>1</b> brass sheet to <b>[DisplayPower(POWER_FLOOR)]</b> power.</span>")
-		if(!GLOB.ratvar_awakens)
-			to_chat(user, "<span class='brass'>You can recharge Replica Fabricators from the [sigil_name].</span>")
-
-/obj/effect/clockwork/sigil/transmission/attackby(obj/item/I, mob/living/user, params)
-	if(is_servant_of_ratvar(user) && istype(I, /obj/item/stack/tile/brass) && !GLOB.ratvar_awakens)
-		var/obj/item/stack/tile/brass/B = I
-		user.visible_message("<span class='warning'>[user] places [B] on [src], causing it to disintegrate into glowing orange energy!</span>", \
-		"<span class='brass'>You charge the [sigil_name] with [B], providing it with <b>[DisplayPower(B.amount * POWER_FLOOR)]</b> of power.</span>")
-		modify_charge(-(B.amount * POWER_FLOOR))
-		playsound(src, 'sound/effects/light_flicker.ogg', (B.amount * POWER_FLOOR) * 0.01, 1)
-		qdel(B)
-		return TRUE
-	return ..()
-
-/obj/effect/clockwork/sigil/transmission/attack_ai(mob/user)
-	if(is_servant_of_ratvar(user))
-		attack_hand(user)
-
-/obj/effect/clockwork/sigil/transmission/attack_hand(mob/user)
-	if(is_servant_of_ratvar(user))
-		visible_message("<span class='notice'>[user] [isprocessing ? "de":""]activates [src].</span>", "<span class='brass'>You [isprocessing ? "de":""]activate the [sigil_name].</span>")
-		if(isprocessing)
-			STOP_PROCESSING(SSobj, src)
-		else
-			START_PROCESSING(SSobj, src)
-	else
-		return ..()
 
 /obj/effect/clockwork/sigil/transmission/sigil_effects(mob/living/L)
 	if(is_servant_of_ratvar(L))
 		if(iscyborg(L))
 			charge_cyborg(L)
-	else if(power_charge)
+	else if(get_clockwork_power())
 		to_chat(L, "<span class='brass'>You feel a slight, static shock.</span>")
 
-/obj/effect/clockwork/sigil/transmission/process()
-	var/power_drained = 0
-
-	for(var/t in spiral_range_turfs(drain_range, src))
-		var/turf/T = t
-		for(var/M in T)
-			var/atom/movable/A = M
-			power_drained += A.power_drain(TRUE)
-
-		CHECK_TICK
-
-	modify_charge(-Floor(power_drained, MIN_CLOCKCULT_POWER))
-	new /obj/effect/temp_visual/ratvar/sigil/transmission(loc, 1 + (power_drained * 0.0035))
-
 /obj/effect/clockwork/sigil/transmission/proc/charge_cyborg(mob/living/silicon/robot/cyborg)
 	if(!cyborg_checks(cyborg))
 		return
 	to_chat(cyborg, "<span class='brass'>You start to charge from the [sigil_name]...</span>")
 	if(!do_after(cyborg, 50, target = src, extra_checks = CALLBACK(src, .proc/cyborg_checks, cyborg, TRUE)))
 		return
-	var/giving_power = min(Floor(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), power_charge) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER
-	if(modify_charge(giving_power))
+	var/giving_power = min(Floor(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), get_clockwork_power()) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER
+	if(adjust_clockwork_power(-giving_power))
 		cyborg.visible_message("<span class='warning'>[cyborg] glows a brilliant orange!</span>")
 		var/previous_color = cyborg.color
 		cyborg.color = list("#EC8A2D", "#EC8A2D", "#EC8A2D", rgb(0,0,0))
@@ -269,9 +222,9 @@
 		if(!silent)
 			to_chat(cyborg, "<span class='warning'>You have no cell!</span>")
 		return FALSE
-	if(!power_charge)
+	if(!get_clockwork_power())
 		if(!silent)
-			to_chat(cyborg, "<span class='warning'>The [sigil_name] has no stored power!</span>")
+			to_chat(cyborg, "<span class='warning'>There is no power available across sigils!</span>")
 		return FALSE
 	if(cyborg.cell.charge > cyborg.cell.maxcharge - MIN_CLOCKCULT_POWER)
 		if(!silent)
@@ -283,25 +236,15 @@
 		return FALSE
 	return TRUE
 
-/obj/effect/clockwork/sigil/transmission/proc/modify_charge(amount)
-	if(GLOB.ratvar_awakens)
-		update_glow()
-		return TRUE
-	if(power_charge - amount < 0)
-		return FALSE
-	power_charge -= amount
-	update_glow()
-	return TRUE
-
-/obj/effect/clockwork/sigil/transmission/proc/update_glow()
+/obj/effect/clockwork/sigil/transmission/update_icon()
 	if(GLOB.ratvar_awakens)
 		alpha = 255
-	else
-		alpha = min(initial(alpha) + power_charge*0.02, 255)
+	var/power_charge = get_clockwork_power()
+	alpha = min(initial(alpha) + power_charge * 0.02, 255)
 	if(!power_charge)
 		set_light(0)
 	else
-		set_light(max(alpha*0.02, 1.4), max(alpha*0.01, 0.1))
+		set_light(max(alpha * 0.02, 1.4), max(alpha * 0.01, 0.1))
 
 //Vitality Matrix: Drains health from non-servants to heal or even revive servants.
 /obj/effect/clockwork/sigil/vitality
@@ -316,7 +259,6 @@
 	stat_affected = DEAD
 	resist_string = "glows shimmering yellow"
 	sigil_name = "Vitality Matrix"
-	component_refund = list(VANGUARD_COGWHEEL = 1)
 	var/revive_cost = 150
 	var/sigil_active = FALSE
 	var/animation_number = 3 //each cycle increments this by 1, at 4 it produces an animation and resets

code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm

@@ -0,0 +1,20 @@
+//Marks the point at which "no man's land" begins on Reebe. Servants can't pass beyond this point in any way.
+/obj/effect/clockwork/servant_blocker
+	name = "glowing arrow"
+	desc = "A faintly glowing image of an arrow on the ground. Convenient!"
+	icon_state = "servant_blocker"
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	density = TRUE
+
+/obj/effect/clockwork/servant_blocker/Destroy(force)
+	if(!force)
+		return
+	. = ..()
+
+/obj/effect/clockwork/servant_blocker/CanPass(atom/movable/M, turf/target)
+	var/list/target_contents = M.GetAllContents() + M
+	for(var/mob/living/L in target_contents)
+		if(is_servant_of_ratvar(L) && get_dir(M, src) != dir) //Unless we're on the side the arrow is pointing directly away from, no-go
+			to_chat(L, "<span class='danger'>The space beyond here can't be accessed by you or other servants.</span>")
+			return
+	return TRUE