Tg port 2 15 (#230)

* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings

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

@@ -51,8 +51,10 @@
 	name = "dull sigil"
 	desc = "A dull, barely-visible golden sigil. It's as though light was carved into the ground."
 	icon = 'icons/effects/clockwork_effects.dmi'
-	clockwork_desc = "A sigil that will stun the first non-servant to cross it. Nar-Sie's dogs will be knocked down."
+	clockwork_desc = "A sigil that will stun the next non-Servant to cross it."
 	icon_state = "sigildull"
+	layer = HIGH_SIGIL_LAYER
+	alpha = 60
 	color = "#FAE48C"
 	sigil_name = "Sigil of Transgression"
 
@@ -78,8 +80,9 @@
 	desc = "A luminous golden sigil. Something about it really bothers you."
 	clockwork_desc = "A sigil that will enslave the first person to cross it, provided they remain on it for seven seconds."
 	icon_state = "sigilsubmission"
-	color = "#FAE48C"
+	layer = LOW_SIGIL_LAYER
 	alpha = 125
+	color = "#FAE48C"
 	stat_affected = UNCONSCIOUS
 	resist_string = "glows faintly yellow"
 	var/convert_time = 70
@@ -148,8 +151,8 @@
 	clockwork_desc = "A sigil that will enslave any person who crosses it, provided they remain on it for seven seconds. \n\
 	It can convert a mindshielded target once before disppearing, but can convert any number of non-implanted targets."
 	icon_state = "sigiltransgression"
-	color = "#A97F1B"
 	alpha = 200
+	color = "#A97F1B"
 	glow_light = 4 //bright light
 	glow_falloff = 3
 	delete_on_finish = FALSE
@@ -172,8 +175,8 @@
 	desc = "A glowing orange sigil. The air around it feels staticky."
 	clockwork_desc = "A sigil that will serve as a battery for clockwork structures."
 	icon_state = "sigiltransmission"
-	color = "#EC8A2D"
 	alpha = 50
+	color = "#EC8A2D"
 	resist_string = "glows faintly"
 	sigil_name = "Sigil of Transmission"
 	affects_servants = TRUE
@@ -189,7 +192,11 @@
 /obj/effect/clockwork/sigil/transmission/examine(mob/user)
 	..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		user << "<span class='[power_charge ? "brass":"alloy"]'>It is storing <b>[ratvar_awakens ? "INFINITY":"[power_charge]"]W</b> of power.</span>"
+		var/structure_number = 0
+		for(var/obj/structure/destructible/clockwork/powered/P in range(SIGIL_ACCESS_RANGE, src))
+			structure_number++
+		user << "<span class='[power_charge ? "brass":"alloy"]'>It is storing <b>[ratvar_awakens ? "INFINITY":"[power_charge]"]W</b> of power, \
+		and <b>[structure_number]</b> Clockwork Structure[structure_number == 1 ? "":"s"] [structure_number == 1 ? "is":"are"] in range.</span>"
 		if(iscyborg(user))
 			user << "<span class='brass'>You can recharge from the [sigil_name] by crossing it.</span>"
 
@@ -264,8 +271,9 @@
 	desc = "A faint blue sigil. Looking at it makes you feel protected."
 	clockwork_desc = "A sigil that will drain non-Servants that remain on it. Servants that remain on it will be healed if it has any vitality drained."
 	icon_state = "sigilvitality"
-	color = "#123456"
+	layer = SIGIL_LAYER
 	alpha = 75
+	color = "#123456"
 	affects_servants = TRUE
 	stat_affected = DEAD
 	resist_string = "glows shimmering yellow"

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

@@ -27,7 +27,7 @@
 	name = "Nezbere, the Brass Eidolon"
 	desc = "A towering colossus clad in nigh-impenetrable brass armor. Its gaze is stern yet benevolent, even upon you."
 	clockwork_desc = "One of Ratvar's four generals. Nezbere is responsible for the design, testing, and creation of everything in Ratvar's domain, and his loyalty to Ratvar knows no bounds. \
-	It is said that Ratvar once asked him to destroy the plans for a weapon Nezbere had made that could have harmed him and Nezbere responded by not only destroying the plans, \
+	It is said that Ratvar once asked him to destroy the plans for a weapon Nezbere had made that could have harmed him, and Nezbere responded by not only destroying the plans, \
 	but by taking his own life so that the device could never be replicated. Nezbere's zealotry is unmatched."
 	icon = 'icons/effects/340x428.dmi'
 	icon_state = "nezbere"
@@ -47,7 +47,7 @@
 
 /obj/effect/clockwork/general_marker/nzcrentr
 	name = "Nzcrentr, the Eternal Thunderbolt"
-	desc = "A terrifying spiked construct crackling with limitless energy."
+	desc = "A terrifying spiked construct crackling with perpetual lightning."
 	clockwork_desc = "One of Ratvar's four generals. Before becoming one of Ratvar's generals, Nzcrentr sook out any and all sentient life to slaughter it for sport. \
 	Nzcrentr was coerced by Ratvar into entering a shell constructed by Nezbere, ostensibly made to grant Nzcrentr more power. In reality, the shell was made to trap and control it. \
 	Nzcrentr now serves loyally, though even one of Nezbere's finest creations was not enough to totally eliminate its will."