Fluffy-Frontier · Saukykouko · Mar 31, 2026 · Mar 31, 2026 · Mar 31, 2026 · Mar 31, 2026
diff --git a/_maps/fluffy_frontier/templates/reebe.dmm b/_maps/fluffy_frontier/templates/reebe.dmm
diff --git a/code/__DEFINES/~ff_defines/clockwork.dm b/code/__DEFINES/~ff_defines/clockwork.dm
@@ -0,0 +1,119 @@
+///check if a z level is reebe
+#define is_reebe_level(z) SSmapping.level_trait(z, ZTRAIT_REEBE)
+/// is something a cogscarab
+#define iscogscarab(checked) (istype(checked, /mob/living/basic/drone/cogscarab))
+/// is something an eminence
+#define iseminence(checked) (istype(checked, /mob/living/eminence))
+/// is something a clockgolem
+#define isclockgolem(A) (is_species(A, /datum/species/clockwork_golem))
+
+#define is_safe_level(z) SSmapping.level_trait(z, ZTRAIT_FORCED_SAFETY)
+///Set weakref_var to null if it fails to give a resolve() value, resolver should be set to the var looking to resolve the weakref
+#define WEAKREF_NULL_IF_UNRESOLVED(weakref_var, resolver) weakref_var?.resolve();\
+	if(!##resolver) { \
+		##weakref_var = null;\
+	}
+#define IS_SAFE_NUM(a) IS_FINITE(a)
+// traits
+// boolean - marks a level as having that property if present
+#define ZTRAIT_REEBE "Reebe"
+/// Marks a level as being "safe", even if it is a station z level.
+/// Nukes will not kill players on such levels.
+#define ZTRAIT_FORCED_SAFETY "Forced Safety"
+///List of ztraits the reebe Z level has
+#define ZTRAITS_REEBE list(ZTRAIT_REEBE = TRUE, \
+						ZTRAIT_NOPHASE = TRUE, \
+						ZTRAIT_BOMBCAP_MULTIPLIER = 0.5, \
+						ZTRAIT_RESERVED = TRUE, \
+						ZTRAIT_BASETURF = /turf/open/indestructible/reebe_flooring)
+//clockwork wall deconstruction
+#define COVER_COG_REMOVED 1
+#define TRANSMISSION_COGS_REMOVED 2
+#define GEARS_UNBOLTED 3
+#define INNER_PANEL_REMOVED 4
+#define GEARS_UNWOUND 5
+/// maximum amount of cogscarabs the clock cult can have
+#define MAXIMUM_COGSCARABS 6
+
+#define CLOCK_PASSIVE_POWER_PER_COG 3
+
+#define CLOCK_MAX_POWER_PER_COG STANDARD_CELL_CHARGE * 0.05
+
+#define MAX_CLOCK_VITALITY 400
+/// Clockwork Golem Species
+#define SPECIES_GOLEM_CLOCKWORK "clockgolem"
+///base state the ark is created in, any state besides this will be a hostile environment
+#define ARK_STATE_BASE 0
+///state for the grace period after the cult has reached its member count max and have enough activing anchoring crystals to summon
+#define ARK_STATE_CHARGING 1
+///state for after the cult has been annouced and are preparing for the portals to open
+#define ARK_STATE_GRACE 2
+///state for the first half of the assault
+#define ARK_STATE_ACTIVE 3
+///state for the halfway point of ark activation
+#define ARK_STATE_SUMMONING 4
+///the ark has either finished opening or been destroyed in this state
+#define ARK_STATE_FINAL 5
+
+///max damage taken per hit by "important" clock structures
+#define MAX_IMPORTANT_CLOCK_DAMAGE 30
+
+#define CHANNEL_SOUND_EFFECTS 1010
+///how many anchoring crystals need to be active before the ark can open
+#define ANCHORING_CRYSTALS_TO_SUMMON 2
+
+///the map path of the reebe map
+#define REEBE_MAP_PATH "_maps/fluffy_frontier/templates/reebe.dmm"
+
+///how long in seconds do anchoring crystals take to charge after being placed, 6 minutes
+#define ANCHORING_CRYSTAL_CHARGE_DURATION 360 SECONDS
+
+///how long between uses of the anchoring crystal scripture, also how long the hostile environment lasts if the crystal is not destroyed
+#define ANCHORING_CRYSTAL_COOLDOWN ANCHORING_CRYSTAL_CHARGE_DURATION + 1 MINUTES
+
+///up to how many tiles away will the ark stop certain things from breaking turfs
+#define ARK_TURF_DESTRUCTION_BLOCK_RANGE 10
+
+///how many clockwork airlocks is the cult allowed to create on reebe
+#define MAXIMUM_REEBE_AIRLOCKS 50
+
+///called when /datum/element/turf_checker detects a new state on constant checking (new_state) TRUE for a valid turf FALSE for an invalid
+#define COMSIG_TURF_CHECKER_UPDATE_STATE "turf_checker_update_state"
+#define COMPONENT_CHECKER_VALID_TURF (1<<0)
+#define COMPONENT_CHECKER_INVALID_TURF (2<<0)
+/// from base of atom/ratvar_act()
+#define COMSIG_ATOM_RATVAR_ACT "atom_ratvar_act"
+
+/// from base of atom/eminence_act() : (mob/living/eminence/user)
+#define COMSIG_ATOM_EMINENCE_ACT "atom_eminence_act"
+/// Used to externally force /datum/element/light_eater to handle eating a light without physical contact. Used by nightmares. (food, eater, silent)
+#define COMSIG_LIGHT_EATER_EAT "light_eater_eat"
+
+/// the comsig for clockwork items checking turf
+#define COMSIG_CHECK_TURF_CLOCKWORK "check_turf_clockwork"
+///sent by the ark SS whenever an anchoring crystal charges (/obj/structure/destructible/clockwork/anchoring_crystal/charged_crystal)
+#define COMSIG_ANCHORING_CRYSTAL_CHARGED "anchoring_crystal_charged"
+
+#define COMSIG_ATOM_SLAB_ACT			"atom_slab_act"
+
+///sent by the ark SS whenever an anchoring crystal is created (/obj/structure/destructible/clockwork/anchoring_crystal/charged_crystal)
+#define COMSIG_ANCHORING_CRYSTAL_CREATED "anchoring_crystal_created"
+// Traits related directly to Clockwork Cult
+#define TRAIT_BRONZE_TURF			"bronze_turf"
+/// Given to Clockwork Golems, gives them a reduction on invoke time for certain scriptures.
+#define TRAIT_FASTER_SLAB_INVOKE	"faster_slab_invoke"
+/// Prevents the invocation of clockwork scriptures.
+#define TRAIT_NO_SLAB_INVOKE		"no_slab_invoke"
+/// Has an item been enchanted by a clock cult Stargazer?
+#define TRAIT_STARGAZED				"stargazed"
+/// Soul consumed by sigil of vitality
+#define TRAIT_NO_SOUL_BY_VITALITY	"no_soul_by_vitality"
+// Traits Sources
+#define STARGAZER_TRAIT 			"stargazer_trait"
+/// Trait source for the vanguard scripture
+#define VANGUARD_TRAIT 				"vanguard_trait"
+/// Trait source from the clockwork sigil
+#define SIGIL_TRAIT					"sigil_trait"
+// Roles
+#define ROLE_ROUNDSTART_CLOCK_CULTIST "Roundstart Clockwork Cultist"
+#define ROLE_MIDROUND_CLOCK_CULTIST "Midround Clockwork Cultist"
diff --git a/code/__DEFINES/~nova_defines/security_alerts.dm b/code/__DEFINES/~nova_defines/security_alerts.dm
@@ -9,3 +9,7 @@
 #define SEC_LEVEL_EPSILON 7 // CENTCOM IS ANGY!!!
 #define SEC_LEVEL_GAMMA 8 // Oh shit bois
 #define SEC_LEVEL_FEDERAL 9 // THE FUCKING FEDS ARE HERE!!!
+// TFF ADDITION START
+/// Security level is lambda. (oh god eldtrich beings won the video game)
+#define SEC_LEVEL_LAMBDA	7
+// TFF ADDITION END
diff --git a/code/datums/mind/antag.dm b/code/datums/mind/antag.dm
@@ -73,7 +73,7 @@
 /// Remove the antagonists that should not persist when being borged
 /datum/mind/proc/remove_antags_for_borging()
 	remove_antag_datum(/datum/antagonist/cult)
-
+	remove_antag_datum(/datum/antagonist/clock_cultist)
 	var/datum/antagonist/rev/revolutionary = has_antag_datum(/datum/antagonist/rev)
 	revolutionary?.remove_revolutionary()
 

diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
@@ -336,7 +336,6 @@
 				to_chat(O, span_warning("Error: Servo motors unresponsive."))
 
 			O.equip_outfit_and_loadout(equipping_job = SSjob.get_job_type(/datum/job/cyborg)) // NOVA EDIT ADDITION - Cyborg loadout hats
-
 		else
 			to_chat(user, span_warning("The MMI must go in after everything else!"))
 

diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
@@ -191,6 +191,13 @@
 	icon_state = "clockwork_floor"
 	floor_tile = /obj/item/stack/tile/bronze
 
+// TFF ADDITION START
+/turf/open/floor/bronze/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_BRONZE_TURF, TURF_TRAIT)
+
+// TFF ADDITION END
+
 /turf/open/floor/bronze/flat
 	icon_state = "reebe"
 	floor_tile = /obj/item/stack/tile/bronze/flat

diff --git a/code/modules/antagonists/cult/cult_other.dm b/code/modules/antagonists/cult/cult_other.dm
@@ -13,7 +13,7 @@
 
 ///Returns whether the given mob is convertable to the blood cult
 /proc/is_convertable_to_cult(mob/living/target, datum/team/cult/specific_cult)
-	if(!istype(target))
+	if(!isliving(target))
 		return FALSE
 	if(isnull(target.mind))
 		return FALSE

diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -76,7 +76,12 @@
 		var/obj/item/new_module = new path(robot)
 		emag_modules += new_module
 		emag_modules -= path
-
+	// TFF ADDITION
+	for(var/path in clock_modules)
+		var/obj/item/new_module = new path(src)
+		clock_modules += new_module
+		clock_modules -= path
+	// TFF ADDITION END
 	if(check_holidays(ICE_CREAM_DAY) && !(locate(/obj/item/borg/lollipop) in basic_modules))
 		basic_modules += new /obj/item/borg/lollipop/ice_cream(robot)
 
@@ -86,6 +91,7 @@
 	modules.Cut()
 	added_modules.Cut()
 	storages.Cut()
+	clock_modules.Cut() // TFF ADDITION START
 	return ..()
 
 /obj/item/robot_model/proc/get_usable_modules()
@@ -144,6 +150,11 @@
 	if(cyborg.emagged)
 		for(var/obj/item/module as anything in emag_modules)
 			add_module(module, FALSE, FALSE)
+	// TFF ADDITION START
+	if(cyborg.clockwork)
+		for(var/obj/item/module in clock_modules)
+			add_module(module, FALSE, FALSE)
+	// TFF ADDITION END
 	for(var/obj/item/module as anything in added_modules)
 		add_module(module, FALSE, FALSE)
 	for(var/obj/item/module as anything in held_modules & modules)

diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
@@ -1107,6 +1107,9 @@
 			else
 				return ALERT_RELEVANCY_WARN
 		// NOVA EDIT ADDITION END
+		// TFF ADDITION START
+		if(SEC_LEVEL_LAMBDA)
+			return ALERT_RELEVANCY_PERTINENT
 
 	return 0
 

diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm
@@ -669,6 +669,8 @@
 			if(cell_percent > APC_CHANNEL_ALARM_TRESHOLD)
 				alarm_manager.clear_alarm(ALARM_POWER)
 
+		// TFF EDIT START:
+		/* ORIGINAL:
 		// NOVA EDIT ADDITION START - CLOCK CULT
 		if(integration_cog)
 			var/power_delta = clamp(cell.charge - 50, 0, 50)
@@ -679,6 +681,11 @@
 			if(cell.charge <= 50)
 				cell.charge = 0
 		// NOVA EDIT ADDITION END
+		*/
+		if(integration_cog && SSthe_ark.clock_power < SSthe_ark.max_clock_power)
+			var/power_delta = clamp(cell.charge - 70, 350, 700)
+			SSthe_ark.adjust_clock_power(power_delta / 70, TRUE)
+		// TFF EDIT END
 	else // no cell, switch everything off
 		charging = APC_NOT_CHARGING
 		equipment = autoset(equipment, AUTOSET_FORCE_OFF)

diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -344,6 +344,8 @@
 
 /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio)
 	. = ..()
+	// TFF EDIT START - ORIGINAL:
+	/*
 	// Microdosing holy water is less effective than just gulping it down
 	data["deciseconds_metabolized"] += seconds_per_tick * 1 SECONDS * metabolization_ratio
 
@@ -388,6 +390,34 @@
 		holder?.remove_reagent(type, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
 	if(need_mob_update)
 		return UPDATE_MOB_HEALTH
+	*/
+	if(affected_mob.blood_volume)
+		affected_mob.blood_volume += 0.1 * REM * seconds_per_tick // water is good for you!
+
+	data["deciseconds_metabolized"] += (seconds_per_tick * 1 SECONDS * REM)
+	affected_mob.adjust_jitter_up_to(2 SECONDS * seconds_per_tick, 20 SECONDS)
+	if(IS_CULTIST(affected_mob) || affected_mob.mind?.has_antag_datum(/datum/antagonist/clock_cultist))
+		if(handle_cultists(affected_mob, seconds_per_tick)) //only returns TRUE on deconversion
+			return
+	holder.remove_reagent(type, 1 * REAGENTS_METABOLISM * seconds_per_tick) //fixed consumption to prevent balancing going out of whack
+
+	var/need_mob_update = FALSE
+
+	if (!HAS_TRAIT(affected_mob, TRAIT_EVIL) || IS_CULTIST(affected_mob) || affected_mob.mind?.holy_role == HOLY_ROLE_PRIEST)
+		return
+	if(data["deciseconds_metabolized"] >= (25 SECONDS)) // 10 units
+		affected_mob.adjust_stutter_up_to(4 SECONDS * REM * seconds_per_tick, 20 SECONDS)
+		affected_mob.set_dizzy_if_lower(10 SECONDS)
+		if(SPT_PROB(25, seconds_per_tick)) //Congratulations, your committment to evil has now made holy water a deadly poison to you!
+			affected_mob.emote("scream")
+			need_mob_update += affected_mob.adjust_fire_loss(3 * REM * seconds_per_tick, updating_health = FALSE)
+	if(data["deciseconds_metabolized"] >= (1 MINUTES)) // 24 units
+		need_mob_update += affected_mob.adjust_fire_loss(10 * REM * seconds_per_tick, updating_health = FALSE)
+		affected_mob.remove_status_effect(/datum/status_effect/jitter)
+		affected_mob.remove_status_effect(/datum/status_effect/speech/stutter)
+		holder?.remove_reagent(type, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
+	return need_mob_update
+	// TFF EDIT END
 
 /datum/reagent/water/holywater/expose_turf(turf/exposed_turf, reac_volume)
 	. = ..()

diff --git a/...ules/unit_tests/screenshots/screenshot_antag_icons_midroundclockworkcultist.png b/...ules/unit_tests/screenshots/screenshot_antag_icons_midroundclockworkcultist.png
diff --git a/...es/unit_tests/screenshots/screenshot_antag_icons_roundstartclockworkcultist.png b/...es/unit_tests/screenshots/screenshot_antag_icons_roundstartclockworkcultist.png
diff --git a/icons/map_icons/items/_item.dmi b/icons/map_icons/items/_item.dmi
diff --git a/modular_nova/modules/alerts/code/security_level_datums.dm b/modular_nova/modules/alerts/code/security_level_datums.dm
@@ -136,4 +136,18 @@
 	looping_sound_interval = 13 SECONDS
 	shuttle_call_time_mod = ALERT_COEFF_NOVA
 
+// TFF ADDITION START
+/datum/security_level/lambda
+	name = "lambda"
+	name_shortform = "λ"
+	announcement_color = "crimson" //Thanking Absolucy for having a bigger brain than me in figuring out colors.
+	number_level = SEC_LEVEL_LAMBDA
+	sound = 'tff_modular/modules/antagonists/clock_cult/sound/lambda.ogg' // Ported over the current (as of this codes time) ss14 gamma alert, renamed because it fits better. Old gamma was better :(
+	elevating_to_configuration_key = /datum/config_entry/string/alert_lambda
+	shuttle_call_time_mod = ALERT_COEFF_NOVA //This is as bad as the nuke going off. Everyone is fucked.
+	disables_mail = TRUE
+
+/datum/config_entry/string/alert_lambda
+	default = "Central Command has detected a large spike of dimensional energy, consistent with the summoning of \[REDACTED\] entities. You are advised to make what little time you have left worthwhile; as no additional assets will be dispatched to %STATION_NAME% at this time."
+// TFF ADDITION END
 #undef ALERT_COEFF_NOVA
diff --git a/modular_nova/modules/clock_cult/code/actions/_action.dm b/modular_nova/modules/clock_cult/code/actions/_action.dm
@@ -1,3 +1,4 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
 /datum/action/innate/clockcult
 	button_icon = 'modular_nova/modules/clock_cult/icons/actions_clock.dmi'
 	background_icon = 'modular_nova/modules/clock_cult/icons/background_clock.dmi'
@@ -58,3 +59,4 @@
 /datum/action/item_action/toggle/clock
 	button_icon = 'modular_nova/modules/clock_cult/icons/background_clock.dmi'
 	background_icon_state = "bg_clock"
+*/
diff --git a/modular_nova/modules/clock_cult/code/actions/recall_slab.dm b/modular_nova/modules/clock_cult/code/actions/recall_slab.dm
@@ -1,3 +1,4 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
 /datum/action/innate/clockcult/recall_slab
 	name = "Recall Slab"
 	desc = "Recall your latest used Clockwork Slab from anywhere in the universe."
@@ -103,3 +104,4 @@
 		item_to_retrieve.loc.visible_message(span_warning("[item_to_retrieve] suddenly appears!"))
 
 	playsound(get_turf(item_to_retrieve), 'sound/effects/magic/summonitems_generic.ogg', 50, TRUE)
+*/
diff --git a/modular_nova/modules/clock_cult/code/actions/whirring_convergence.dm b/modular_nova/modules/clock_cult/code/actions/whirring_convergence.dm
@@ -1,3 +1,4 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
 /*
 *	Whirring Convergence
 *   Communicate a message to all other clock cultists
@@ -56,3 +57,4 @@
 				to_chat(player_mob, "[FOLLOW_LINK(player_mob, user)] [final_message]")
 			else
 				to_chat(player_mob, final_message)
+*/
diff --git a/modular_nova/modules/clock_cult/code/antagonist.dm b/modular_nova/modules/clock_cult/code/antagonist.dm
@@ -1,3 +1,5 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
+
 // This'll take a bit of explaining.
 // Clock cult, the (shitty) gamemode is not coming back, this antagonist datum is for the soon-to-come OPFOR bundle
 // However, the bundle gives `/datum/antagonist/clock_cultist/solo`, which is the same as `/datum/antagonist/clock_cultist`, but lacks conversion.
@@ -72,3 +74,4 @@
 	name = "Clock Cultist (Solo)"
 	show_to_ghosts = FALSE
 	can_convert = FALSE
+*/
diff --git a/modular_nova/modules/clock_cult/code/area.dm b/modular_nova/modules/clock_cult/code/area.dm
@@ -1,3 +1,4 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
 /area/ruin/powered/reebe
 	name = "Outpost of Cogs"
 	ambience_index = AMBIENCE_REEBE
@@ -9,3 +10,4 @@
 	name = "Outpost of Cogs Space"
 	base_lighting_alpha = 255
 
+*/
diff --git a/modular_nova/modules/clock_cult/code/components/brass_spreader.dm b/modular_nova/modules/clock_cult/code/components/brass_spreader.dm
@@ -1,3 +1,4 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
 /// A component that spreads brass to a tile in [range] every [cooldown] seconds, converting everything on it into brass as well.
 /datum/component/brass_spreader
 	/// The range of which to spread brass
@@ -98,3 +99,4 @@
 		return
 
 	COOLDOWN_START(src, turf_conversion_cooldown, cooldown)
+*/
diff --git a/modular_nova/modules/clock_cult/code/components/hint_element.dm b/modular_nova/modules/clock_cult/code/components/hint_element.dm
@@ -1,3 +1,4 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
 /datum/element/clockwork_description
 	element_flags = ELEMENT_BESPOKE | ELEMENT_DETACH_ON_HOST_DESTROY
 	argument_hash_start_idx = 2
@@ -37,3 +38,4 @@
 
 	if(IS_CLOCK(user))
 		examine_texts += span_brass(text_to_add)
+*/
diff --git a/modular_nova/modules/clock_cult/code/components/pickup_element.dm b/modular_nova/modules/clock_cult/code/components/pickup_element.dm
@@ -1,3 +1,4 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
 #define REGULAR_PICKUP_MOD 1
 #define CULTIST_PICKUP_MOD 2
 #define PICKUP_SHOCK_DAMAGE 25
@@ -55,3 +56,4 @@
 #undef REGULAR_PICKUP_MOD
 #undef CULTIST_PICKUP_MOD
 #undef PICKUP_SHOCK_DAMAGE
+*/
diff --git a/modular_nova/modules/clock_cult/code/components/structure_info_element.dm b/modular_nova/modules/clock_cult/code/components/structure_info_element.dm
@@ -1,3 +1,4 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
 /datum/element/clockwork_structure_info
 	element_flags = ELEMENT_DETACH_ON_HOST_DESTROY
 
@@ -61,3 +62,4 @@
 		return
 
 	examine_text += span_brass("You can gain more information by using a <b>Clockwork Slab</b>.")
+*/
diff --git a/modular_nova/modules/clock_cult/code/globals.dm b/modular_nova/modules/clock_cult/code/globals.dm
@@ -1,3 +1,5 @@
+/* // TFF REWORK - SEE /tff_modular/modules/antagonist/clock_cult/...
+
 GLOBAL_VAR_INIT(clock_power, 2500)
 GLOBAL_VAR_INIT(max_clock_power, 2500) // Increases with every APC cogged
 GLOBAL_VAR_INIT(clock_vitality, 0)
@@ -16,3 +18,4 @@ GLOBAL_LIST_EMPTY(clockwork_research_unlocked_scriptures)
 		. += new path
 
 	return .
+*/
-Original file line number
+Diff line change
@@ Expand Up / @@ -336,7 +336,6 @@ @@
     				to_chat(O, span_warning("Error: Servo motors unresponsive."))
     			O.equip_outfit_and_loadout(equipping_job = SSjob.get_job_type(/datum/job/cyborg)) // NOVA EDIT ADDITION - Cyborg loadout hats
     		else
     			to_chat(user, span_warning("The MMI must go in after everything else!"))
@@ Expand Down @@