diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
index c4baca2a50..0ec876dc92 100644
--- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
@@ -195,31 +195,6 @@
textlist += "HONOR RATVAR "
textlist += ""
else
- var/servants = 0
- var/production_time = SLAB_PRODUCTION_TIME
- for(var/mob/living/M in GLOB.living_mob_list)
- if(is_servant_of_ratvar(M) && (ishuman(M) || issilicon(M)))
- servants++
- if(servants > SCRIPT_SERVANT_REQ)
- servants -= SCRIPT_SERVANT_REQ
- production_time += min(SLAB_SERVANT_SLOWDOWN * servants, SLAB_SLOWDOWN_MAXIMUM)
- var/production_text_addon = ""
- if(production_time != SLAB_PRODUCTION_TIME+SLAB_SLOWDOWN_MAXIMUM)
- production_text_addon = ", which increases for each human or silicon Servant above [SCRIPT_SERVANT_REQ]"
- production_time = production_time/600
- var/list/production_text
- if(round(production_time))
- production_text = list("[round(production_time)] minute\s")
- if(production_time != round(production_time))
- production_time -= round(production_time)
- production_time *= 60
- if(!LAZYLEN(production_text))
- production_text = list("[round(production_time, 1)] second\s")
- else
- production_text += " and [round(production_time, 1)] second\s"
- production_text += ""
- production_text += production_text_addon
- production_text = production_text.Join()
textlist = list("
[text2ratvar("Purge all untruths and honor Engine.")]
\
\
NOTICE: This information is out of date. Read the Ark & You primer in your backpack or read the wiki page for current info.
\
@@ -312,44 +287,12 @@
dat += "Transmission: Drains and stores power for clockwork structures. Feeding it brass sheets will create additional power.
"
dat += "-=-=-=-=-=-"
if("Components")
-<<<<<<< HEAD
- var/servants = 0 //Calculate the current production time for slab components
- var/production_time = SLAB_PRODUCTION_TIME
- for(var/mob/living/M in GLOB.living_mob_list)
- if(is_servant_of_ratvar(M) && (ishuman(M) || issilicon(M)))
- servants++
- if(servants > SCRIPT_SERVANT_REQ)
- servants -= SCRIPT_SERVANT_REQ
- production_time += min(SLAB_SERVANT_SLOWDOWN * servants, SLAB_SLOWDOWN_MAXIMUM)
- var/production_text_addon = ""
- if(production_time != SLAB_PRODUCTION_TIME+SLAB_SLOWDOWN_MAXIMUM)
- production_text_addon = ", which increases for each human or silicon Servant above [SCRIPT_SERVANT_REQ]"
- production_time = production_time/600
- var/list/production_text
- if(round(production_time))
- production_text = list("[round(production_time)] minute\s")
- if(production_time != round(production_time))
- production_time -= round(production_time)
- production_time *= 60
- if(!LAZYLEN(production_text))
- production_text = list("[round(production_time, 1)] second\s")
- else
- production_text += " and [round(production_time, 1)] second\s"
- production_text += ""
- production_text += production_text_addon
- production_text = production_text.Join()
-=======
->>>>>>> b7e7779... (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
dat += "Components & Their Uses
"
dat += "Components are your primary resource as a Servant. There are five types of component, with each one being used in different roles:
"
dat += "Although this is a good rule of thumb, their effects become much more nuanced when used together. For instance, a turret might have both belligerent eyes and \
vanguard cogwheels as construction requirements, because it defends its allies by harming its enemies.
"
dat += "Components' primary use is fueling scripture (covered in its own section), and they can be created through various ways. This clockwork slab, for instance, \
-<<<<<<< HEAD
- will make a random component of every type - or a specific one, if you choose a target component from the interface - every [production_text]. This number will increase \
-=======
will make a random component of every type - or a specific one, if you choose a target component from the interface - every remove me already. This number will increase \
->>>>>>> b7e7779... (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
as the amount of Servants in the covenant increase; additionally, slabs can only produce components when held by a Servant, and holding more than one slab will cause both \
of them to halt progress until one of them is removed from their person.
"
dat += "Your slab has an internal storage of components, but it isn't meant to be the main one. Instead, there's a global storage of components that can be \