Overhauls and 2/28 sync (#244)

* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures

* lazy fix for bleeding edgy (#252)

* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures

code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm

@@ -1,6 +1,6 @@
 //The gateway to Reebe, from which Ratvar emerges.
 /obj/structure/destructible/clockwork/massive/celestial_gateway
-	name = "Gateway to the Celestial Derelict"
+	name = "gateway to the Celestial Derelict"
 	desc = "A massive, thrumming rip in spacetime."
 	clockwork_desc = "A portal to the Celestial Derelict. Massive and intimidating, it is the only thing that can both transport Ratvar and withstand the massive amount of energy he emits."
 	obj_integrity = 500
@@ -12,14 +12,17 @@
 	invisibility = INVISIBILITY_MAXIMUM
 	resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
 	can_be_repaired = FALSE
+	immune_to_servant_attacks = TRUE
 	var/progress_in_seconds = 0 //Once this reaches GATEWAY_RATVAR_ARRIVAL, it's game over
 	var/purpose_fulfilled = FALSE
 	var/first_sound_played = FALSE
 	var/second_sound_played = FALSE
 	var/third_sound_played = FALSE
+	var/fourth_sound_played = FALSE
 	var/ratvar_portal = TRUE //if the gateway actually summons ratvar or just produces a hugeass conversion burst
 	var/obj/effect/clockwork/overlay/gateway_glow/glow
 	var/obj/effect/countdown/clockworkgate/countdown
+	var/list/required_components = list(BELLIGERENT_EYE = 7, VANGUARD_COGWHEEL = 7, GEIS_CAPACITOR = 7, REPLICANT_ALLOY = 7, HIEROPHANT_ANSIBLE = 7)
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/New()
 	..()
@@ -85,7 +88,7 @@
 		send_to_playing_players(sound(null, 0, channel = 8))
 	var/was_stranded = SSshuttle.emergency.mode == SHUTTLE_STRANDED
 	SSshuttle.clearHostileEnvironment(src)
-	if(!was_stranded && !purpose_fulfilled && second_sound_played)
+	if(!was_stranded && !purpose_fulfilled)
 		priority_announce("Massive energy anomaly no longer on short-range scanners.","Anomaly Alert")
 	if(glow)
 		qdel(glow)
@@ -100,7 +103,7 @@
 		if(!disassembled)
 			resistance_flags |= INDESTRUCTIBLE
 			countdown.stop()
-			visible_message("<span class='userdanger'>The [src] begins to pulse uncontrollably... you might want to run!</span>")
+			visible_message("<span class='userdanger'>[src] begins to pulse uncontrollably... you might want to run!</span>")
 			send_to_playing_players(sound('sound/effects/clockcult_gateway_disrupted.ogg', 0, channel = 8, volume = 50))
 			make_glow()
 			glow.icon_state = "clockwork_gateway_disrupted"
@@ -118,6 +121,45 @@
 	var/damage = max((obj_integrity * 0.70) / severity, 100) //requires multiple bombs to take down
 	take_damage(damage, BRUTE, "bomb", 0)
 
+/obj/structure/destructible/clockwork/massive/celestial_gateway/attackby(obj/item/I, mob/living/user, params) //add components directly to the ark
+	if(!is_servant_of_ratvar(user) || !still_needs_components())
+		return ..()
+	if(istype(I, /obj/item/clockwork/component))
+		var/obj/item/clockwork/component/C = I
+		if(required_components[C.component_id])
+			required_components[C.component_id]--
+			user << "<span class='notice'>You add [C] to [src].</span>"
+			user.drop_item()
+			qdel(C)
+		else
+			user << "<span class='notice'>[src] has enough [get_component_name(C.component_id)][C.component_id != REPLICANT_ALLOY ? "s":""].</span>"
+		return 1
+	else if(istype(I, /obj/item/clockwork/slab))
+		var/obj/item/clockwork/slab/S = I
+		var/used_components = FALSE
+		var/used_all = TRUE
+		for(var/i in S.stored_components)
+			if(required_components[i])
+				var/to_use = min(S.stored_components[i], required_components[i])
+				required_components[i] -= to_use
+				S.stored_components[i] -= to_use
+				if(to_use)
+					used_components = TRUE
+				if(S.stored_components[i])
+					used_all = FALSE
+		if(used_components)
+			update_slab_info(S)
+			user.visible_message("<span class='notice'>[user][used_all ? "":" partially"] empties [S] into [src].</span>", \
+			"<span class='notice'>You offload [used_all ? "all":"some"] of your slab's components into [src].</span>")
+		return 1
+	else
+		return ..()
+
+/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/still_needs_components()
+	for(var/i in required_components)
+		if(required_components[i])
+			return TRUE
+
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_text(s_on_time)
 	. = "IMMINENT"
 	if(!obj_integrity)
@@ -130,14 +172,21 @@
 	..()
 	icon_state = initial(icon_state)
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		user << "<span class='big'><b>Seconds until [ratvar_portal ? "Ratvar's arrival":"Proselytization"]:</b> [get_arrival_text(TRUE)]</span>"
-		switch(progress_in_seconds)
-			if(-INFINITY to GATEWAY_REEBE_FOUND)
-				user << "<span class='heavy_brass'>It's still opening.</span>"
-			if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING)
-				user << "<span class='heavy_brass'>It's reached the Celestial Derelict and is drawing power from it.</span>"
-			if(GATEWAY_RATVAR_COMING to INFINITY)
-				user << "<span class='heavy_brass'>[ratvar_portal ? "Ratvar is coming through the gateway":"The gateway is glowing with massed power"]!</span>"
+		if(still_needs_components())
+			user << "<span class='big'><b>Components required until activation:</b></span>"
+			for(var/i in required_components)
+				if(required_components[i])
+					user << "<span class='[get_component_span(i)]'>[get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]:</span> \
+					<span class='[get_component_span(i)]_large'>[required_components[i]]</span>"
+		else
+			user << "<span class='big'><b>Seconds until [ratvar_portal ? "Ratvar's arrival":"Proselytization"]:</b> [get_arrival_text(TRUE)]</span>"
+			switch(progress_in_seconds)
+				if(-INFINITY to GATEWAY_REEBE_FOUND)
+					user << "<span class='heavy_brass'>It's still opening.</span>"
+				if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING)
+					user << "<span class='heavy_brass'>It's reached the Celestial Derelict and is drawing power from it.</span>"
+				if(GATEWAY_RATVAR_COMING to INFINITY)
+					user << "<span class='heavy_brass'>[ratvar_portal ? "Ratvar is coming through the gateway":"The gateway is glowing with massed power"]!</span>"
 	else
 		switch(progress_in_seconds)
 			if(-INFINITY to GATEWAY_REEBE_FOUND)
@@ -148,7 +197,7 @@
 				user << "<span class='boldwarning'>[ratvar_portal ? "Something is coming through":"It's glowing brightly"]!</span>"
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/process()
-	if(!progress_in_seconds || prob(7))
+	if(!first_sound_played || prob(7))
 		for(var/M in player_list)
 			if(M && !isnewplayer(M))
 				M << "<span class='warning'><b>You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...</span>"
@@ -168,6 +217,25 @@
 		var/dist = cheap_hypotenuse(T.x, T.y, x, y)
 		if(dist < convert_dist)
 			T.ratvar_act(FALSE, TRUE, 3)
+	if(still_needs_components())
+		if(!first_sound_played)
+			priority_announce("Massive energy anomaly detected on short-range scanners. Attempting to triangulate location...", "Anomaly Alert")
+			send_to_playing_players(sound('sound/effects/clockcult_gateway_charging.ogg', 1, channel = 8, volume = 10))
+			first_sound_played = TRUE
+		make_glow()
+		glow.icon_state = "clockwork_gateway_components"
+		var/used_components = FALSE
+		for(var/i in required_components)
+			if(required_components[i])
+				var/to_use = min(clockwork_component_cache[i], required_components[i])
+				required_components[i] -= to_use
+				clockwork_component_cache[i] -= to_use
+				if(to_use)
+					used_components = TRUE
+		if(used_components)
+			update_slab_info()
+		if(still_needs_components())
+			return
 	for(var/obj/O in orange(1, src))
 		if(!O.pulledby && !istype(O, /obj/effect) && O.density)
 			if(!step_away(O, src, 2) || get_dist(O, src) < 2)
@@ -176,23 +244,23 @@
 	progress_in_seconds += GATEWAY_SUMMON_RATE
 	switch(progress_in_seconds)
 		if(-INFINITY to GATEWAY_REEBE_FOUND)
-			if(!first_sound_played)
+			if(!second_sound_played)
 				send_to_playing_players(sound('sound/effects/clockcult_gateway_charging.ogg', 1, channel = 8, volume = 30))
-				first_sound_played = TRUE
+				second_sound_played = TRUE
 			make_glow()
 			glow.icon_state = "clockwork_gateway_charging"
 		if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING)
-			if(!second_sound_played)
+			if(!third_sound_played)
 				var/area/gate_area = get_area(src)
-				priority_announce("Massive energy anomaly detected on short-range scanners. Location: [gate_area.map_name].", "Anomaly Alert")
+				priority_announce("Location of massive energy anomaly has been triangulated. Location: [gate_area.map_name].", "Anomaly Alert")
 				send_to_playing_players(sound('sound/effects/clockcult_gateway_active.ogg', 1, channel = 8, volume = 35))
-				second_sound_played = TRUE
+				third_sound_played = TRUE
 			make_glow()
 			glow.icon_state = "clockwork_gateway_active"
 		if(GATEWAY_RATVAR_COMING to GATEWAY_RATVAR_ARRIVAL)
-			if(!third_sound_played)
+			if(!fourth_sound_played)
 				send_to_playing_players(sound('sound/effects/clockcult_gateway_closing.ogg', 1, channel = 8, volume = 40))
-				third_sound_played = TRUE
+				fourth_sound_played = TRUE
 			make_glow()
 			glow.icon_state = "clockwork_gateway_closing"
 		if(GATEWAY_RATVAR_ARRIVAL to INFINITY)

code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm

@@ -5,7 +5,8 @@
 	clockwork_desc = "A binding ring around a target, preventing them from taking action while they're being converted."
 	max_integrity = 25
 	obj_integrity = 25
-	density = 0
+	density = FALSE
+	immune_to_servant_attacks = TRUE
 	icon = 'icons/effects/clockwork_effects.dmi'
 	icon_state = "geisbinding_full"
 	break_message = null

code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm

@@ -50,6 +50,9 @@
 	if(ratvar_awakens)
 		damage_per_tick = 10
 		sight_range = 6
+	else if(nezbere_invoked)
+		damage_per_tick = 5
+		sight_range = 5
 	else
 		damage_per_tick = initial(damage_per_tick)
 		sight_range = initial(sight_range)
@@ -114,9 +117,20 @@
 			for(var/obj/item/weapon/storage/book/bible/BI in L.GetAllContents())
 				if(!(BI.resistance_flags & ON_FIRE))
 					BI.fire_act()
-		else if(!is_servant_of_ratvar(L) && !L.stat && L.mind && !L.restrained() && !(L.buckled && (L.lying || istype(L.buckled, /obj/structure/destructible/clockwork/geis_binding))) && \
-		!(L.disabilities & BLIND) && !L.null_rod_check())
-			. += L
+			continue
+		if(is_servant_of_ratvar(L) || (L.disabilities & BLIND) || L.null_rod_check())
+			continue
+		if(L.stat || L.restrained() || L.buckled || L.lying || istype(L.buckled, /obj/structure/destructible/clockwork/geis_binding))
+			continue
+		if(ishostile(L))
+			var/mob/living/simple_animal/hostile/H = L
+			if(ismegafauna(H) || (!H.mind && H.AIStatus == AI_OFF))
+				continue
+			if(("ratvar" in H.faction) || ("neutral" in H.faction))
+				continue
+		else if(!L.mind)
+			continue
+		. += L
 	for(var/N in mechas_list)
 		var/obj/mecha/M = N
 		if(get_dist(M, src) <= sight_range && M.occupant && !is_servant_of_ratvar(M.occupant) && (M in view(sight_range, src)))

code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm

@@ -0,0 +1,62 @@
+//Used by the Taunting Tirade scripture as a trail.
+/obj/structure/destructible/clockwork/taunting_trail
+	name = "strange smoke"
+	desc = "A cloud of purple smoke."
+	clockwork_desc = "A cloud of purple smoke that confuses and weakens non-Servants that enter it."
+	gender = PLURAL
+	max_integrity = 5
+	obj_integrity = 5
+	density = 1
+	color = list("#AF0AAF", "#AF0AAF", "#AF0AAF", rgb(0,0,0))
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "smoke"
+	break_message = null
+	break_sound = 'sound/magic/Teleport_app.ogg'
+	debris = list()
+	var/timerid
+
+/obj/structure/destructible/clockwork/taunting_trail/New()
+	..()
+	timerid = QDEL_IN(src, 15)
+	var/obj/structure/destructible/clockwork/taunting_trail/Tt = locate(/obj/structure/destructible/clockwork/taunting_trail) in loc
+	if(Tt && Tt != src)
+		if(!step(src, pick(alldirs)))
+			qdel(Tt)
+		else
+			for(var/obj/structure/destructible/clockwork/taunting_trail/TT in loc)
+				if(TT != src)
+					qdel(TT)
+	setDir(pick(cardinal))
+	transform = matrix()*1.25
+	animate(src, alpha = 100, time = 15)
+
+/obj/structure/destructible/clockwork/taunting_trail/Destroy()
+	deltimer(timerid)
+	return ..()
+
+/obj/structure/destructible/clockwork/taunting_trail/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	playsound(src, 'sound/items/Welder.ogg', 50, 1)
+
+/obj/structure/destructible/clockwork/taunting_trail/CanPass(atom/movable/mover, turf/target, height=0)
+	return TRUE
+
+/obj/structure/destructible/clockwork/taunting_trail/Crossed(atom/movable/AM)
+	affect_mob(AM)
+	return ..()
+
+/obj/structure/destructible/clockwork/taunting_trail/Bumped(atom/movable/AM)
+	affect_mob(AM)
+	return ..()
+
+/obj/structure/destructible/clockwork/taunting_trail/Bump(atom/movable/AM)
+	affect_mob(AM)
+	return ..()
+
+/obj/structure/destructible/clockwork/taunting_trail/proc/affect_mob(mob/living/L)
+	if(istype(L) && !is_servant_of_ratvar(L))
+		if(!L.null_rod_check())
+			L.confused = min(L.confused + 15, 50)
+			L.dizziness = min(L.dizziness + 15, 50)
+			if(L.confused >= 25)
+				L.Weaken(Floor(L.confused * 0.04))
+		take_damage(max_integrity)

code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm

@@ -81,7 +81,8 @@
 	if(is_servant_of_ratvar(user))
 		if(linkedwall)
 			if(wall_generation_cooldown > world.time)
-				user << "<span class='alloy'>[src] will produce a component in <b>[(world.time - wall_generation_cooldown) * 0.1]</b> seconds.</span>"
+				var/temp_time = (wall_generation_cooldown - world.time) * 0.1
+				user << "<span class='alloy'>[src] will produce a component in <b>[temp_time]</b> second[temp_time == 1 ? "":"s"].</span>"
 			else
 				user << "<span class='brass'>[src] is about to produce a component!</span>"
 		else if(anchored)

code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm

@@ -28,6 +28,16 @@
 	clockwork_daemons--
 	return ..()
 
+/obj/structure/destructible/clockwork/powered/tinkerers_daemon/ratvar_act()
+	..()
+	if(nezbere_invoked)
+		production_time = 0
+		production_cooldown = initial(production_cooldown) * 0.5
+		if(!active)
+			toggle(0)
+	else
+		production_cooldown = initial(production_cooldown)
+
 /obj/structure/destructible/clockwork/powered/tinkerers_daemon/examine(mob/user)
 	..()
 	if(is_servant_of_ratvar(user) || isobserver(user))