Merge branch 'master' into CultMasterAttempt2

code/game/objects/effects/countdown.dm

@@ -97,21 +97,6 @@
 		var/completion = round(C.get_completion())
 		return completion
 
-/obj/effect/countdown/dominator
-	name = "dominator countdown"
-	text_size = 1
-	color = "#ff00ff" // Overwritten when the dominator starts
-
-/obj/effect/countdown/dominator/get_value()
-	var/obj/machinery/dominator/D = attached_to
-	if(!istype(D))
-		return
-	else if(D.gang && D.gang.is_dominating)
-		var/timer = D.gang.domination_time_remaining()
-		return timer
-	else
-		return "OFFLINE"
-
 /obj/effect/countdown/clockworkgate
 	name = "gateway countdown"
 	text_size = 1

code/game/objects/effects/decals/crayon.dm

@@ -8,11 +8,14 @@
 
 /obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0, var/alt_icon = null)
 	..()
-	
+
 	name = e_name
 	desc = "A [name] vandalizing the station."
+
+	var/static/list/gang_name_pool = list("Clandestine", "Prima", "Zero-G", "Max", "Blasto", "Waffle", "North", "Omni", "Newton", "Cyber", "Donk", "Gene", "Gib", "Tunnel", "Diablo", "Psyke", "Osiron", "Sirius", "Sleeping Carp")
 	if(type == "poseur tag")
-		type = pick(GLOB.gang_name_pool)
+		type = pick(gang_name_pool)
+
 
 	if(alt_icon)
 		icon = alt_icon
@@ -23,31 +26,4 @@
 		M.Turn(rotation)
 		src.transform = M
 
-	add_atom_colour(main, FIXED_COLOUR_PRIORITY)
-
-
-/obj/effect/decal/cleanable/crayon/gang
-	layer = HIGH_OBJ_LAYER //Harder to hide
-	do_icon_rotate = FALSE //These are designed to always face south, so no rotation please.
-	var/datum/gang/gang
-
-/obj/effect/decal/cleanable/crayon/gang/Initialize(mapload, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0)
-	if(!type || !G)
-		qdel(src)
-
-	var/area/territory = get_area(src)
-	gang = G
-	var/newcolor = G.color_hex
-	icon_state = G.name
-	G.territory_new |= list(territory.type = territory.name)
-
-	..(mapload, newcolor, icon_state, e_name, rotation)
-
-/obj/effect/decal/cleanable/crayon/gang/Destroy()
-	var/area/territory = get_area(src)
-
-	if(gang)
-		gang.territory -= territory.type
-		gang.territory_new -= territory.type
-		gang.territory_lost |= list(territory.type = territory.name)
-	return ..()
+	add_atom_colour(main, FIXED_COLOUR_PRIORITY)

code/game/objects/effects/landmarks.dm

@@ -94,7 +94,7 @@
 	name = "Head of Personnel"
 
 /obj/effect/landmark/start/librarian
-	name = "Librarian"
+	name = "Curator"
 
 /obj/effect/landmark/start/lawyer
 	name = "Lawyer"