there

code/__DEFINES/MONKESTATION_DEFINES/traits.dm → code/__DEFINES/~monkestation/traits.dm

@@ -6,3 +6,5 @@
 #define TRAIT_STARGAZED "stargazed"
 /// Trait source for the stargazer
 #define STARGAZER_TRAIT "stargazer"
+/// Prevents the invocation of clockwork scriptures
+#define TRAIT_NO_SLAB_INVOKE "no_slab_invoke"

code/modules/antagonists/heretic/status_effects/ghoul.dm

@@ -63,6 +63,7 @@
 	ADD_TRAIT(human_target, TRAIT_FAKEDEATH, REF(src))
 	human_target.become_husk(MAGIC_TRAIT)
 	human_target.faction |= FACTION_HERETIC
+	ADD_TRAIT(human_target, TRAIT_NO_SLAB_INVOKE, REF(src)) //monkestation edit
 
 	if(human_target.mind)
 		var/datum/antagonist/heretic_monster/heretic_monster = human_target.mind.add_antag_datum(/datum/antagonist/heretic_monster)
@@ -92,6 +93,7 @@
 	human_target.cure_husk(MAGIC_TRAIT)
 	human_target.faction -= FACTION_HERETIC
 	human_target.mind?.remove_antag_datum(/datum/antagonist/heretic_monster)
+	REMOVE_TRAIT(human_target, TRAIT_NO_SLAB_INVOKE, REF(src)) //monkestation edit
 
 	UnregisterSignal(human_target, COMSIG_LIVING_DEATH)
 	if(!QDELETED(src))

code/modules/mob/living/silicon/robot/robot_defense.dm

@@ -352,6 +352,12 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
 		to_chat(connected_ai, span_danger("ALERT: Cyborg unit \[[src]\] successfully defended against subversion."))
 		log_silicon("EMAG: [key_name(user)] attempted to emag cyborg [key_name(src)], but they were slaved to traitor AI [connected_ai].")
 		return
+//monkestation edit start
+	if(IS_CLOCK(src)) //cant emag clock borgs
+		to_chat(src, span_brass("The light of Rat'var protects you from subversion!"))
+		log_silicon("EMAG: [key_name(user)] attempted to emag cyborg [key_name(src)], but they were a clockwork borg.")
+		return
+//monkestation edit end
 
 	if(shell) //AI shells cannot be emagged, so we try to make it look like a standard reset. Smart players may see through this, however.
 		to_chat(user, span_danger("[src] is remotely controlled! Your emag attempt has triggered a system reset instead!"))

monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cultist.dm

@@ -6,7 +6,7 @@
 	antag_moodlet = /datum/mood_event/cult
 	suicide_cry = ",r For Ratvar!!!"
 	ui_name = "AntagInfoClock"
-	show_to_ghosts = TRUE //to make testing easier
+	show_to_ghosts = TRUE
 	antag_hud_name = "clockwork"
 	/// Ref to the cultist's communication ability
 	var/datum/action/innate/clockcult/comm/communicate = new

monkestation/code/modules/antagonists/clock_cult/items/weaponry.dm

@@ -17,6 +17,7 @@
 	attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "gores")
 	attack_verb_simple = list("attack", "poke", "jab", "tear", "gore")
 	sharpness = SHARP_EDGED
+	wound_bonus = -10 //wounds are really strong for clock cult, so im making their weapons slightly worse then normal at wounding
 	/// Typecache of valid turfs to have the weapon's special effect on
 	var/static/list/effect_turf_typecache = typecacheof(list(/turf/open/floor/bronze, /turf/open/indestructible/reebe_flooring))
 
@@ -150,7 +151,7 @@
 	attack_verb_simple = list("bash", "hammer", "attack", "smash")
 	attack_verb_continuous = list("bashes", "hammers", "attacks", "smashes")
 	clockwork_desc = "Enemies hit by this will be flung back while you are on bronze tiles."
-	sharpness = 0
+	sharpness = FALSE
 	hitsound = 'sound/weapons/smash.ogg'
 	block_chance = 10
 
@@ -315,7 +316,7 @@
 	name = "energy bolt"
 	icon = 'monkestation/icons/obj/clock_cult/projectiles.dmi'
 	icon_state = "arrow_energy"
-	damage = 30
+	damage = 25
 	damage_type = BURN
 
 #undef HAMMER_FLING_DISTANCE

monkestation/code/modules/antagonists/clock_cult/scriptures/_scripture.dm

@@ -145,6 +145,10 @@ GLOBAL_LIST_EMPTY(clock_scriptures_by_type)
 		to_chat(invoker, span_brass("You fail to invoke [name]."))
 		return FALSE
 
+	if(HAS_TRAIT(invoker, TRAIT_NO_SLAB_INVOKE))
+		to_chat(invoker, span_warning("Something blocks you from invoking scriptures."))
+		return FALSE
+
 	var/invokers = 0
 	if(locate(/obj/item/toy/plush/ratplush) in range(1, invoker)) //ratvar plushies count as an invoker
 		invokers++

monkestation/code/modules/antagonists/clock_cult/scriptures/servitude/kindle.dm

@@ -60,6 +60,17 @@
 		playsound(invoker, 'sound/magic/mm_hit.ogg', 50, TRUE)
 		return TRUE
 
+	if(IS_HERETIC(hit_mob))
+		to_chat(invoker, span_warning("Some force greater than you intervenes! [hit_mob] is protected by the Forgotten Gods!"))
+		to_chat(hit_mob, span_warning("You are protected by your faith to the Forgotten Gods."))
+		var/old_color = hit_mob.color
+		hit_mob.color = rgb(0, 128, 0)
+		animate(hit_mob, color = old_color, time = 1 SECONDS, easing = EASE_IN)
+		hit_mob.adjust_stutter(15 SECONDS)
+		hit_mob.adjust_jitter(15 SECONDS)
+		playsound(invoker, 'sound/magic/mm_hit.ogg', 50, TRUE)
+		return TRUE
+
 	//Successful Invokation
 	invoker.mob_light(_color = LIGHT_COLOR_CLOCKWORK, _range = 2, _duration = 1 SECONDS)
 

tgstation.dme

@@ -350,26 +350,26 @@
 #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_main.dm"
 #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_silicon.dm"
 #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_simple.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\access.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\antagonists.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\clock_cult.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\colors.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\combat.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\construction.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\cooldowns.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\DNA.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\factions.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\level_traits.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\maps.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\mecha.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\span.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\status_effects.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\traits.dm"
-#include "code\__DEFINES\MONKESTATION_DEFINES\dcs\signals\signals_atom.dm"
 #include "code\__DEFINES\research\anomalies.dm"
 #include "code\__DEFINES\research\research_categories.dm"
+#include "code\__DEFINES\~monkestation\access.dm"
+#include "code\__DEFINES\~monkestation\antagonists.dm"
+#include "code\__DEFINES\~monkestation\clock_cult.dm"
+#include "code\__DEFINES\~monkestation\colors.dm"
+#include "code\__DEFINES\~monkestation\combat.dm"
+#include "code\__DEFINES\~monkestation\construction.dm"
+#include "code\__DEFINES\~monkestation\cooldowns.dm"
+#include "code\__DEFINES\~monkestation\DNA.dm"
+#include "code\__DEFINES\~monkestation\factions.dm"
+#include "code\__DEFINES\~monkestation\level_traits.dm"
+#include "code\__DEFINES\~monkestation\maps.dm"
+#include "code\__DEFINES\~monkestation\mecha.dm"
 #include "code\__DEFINES\~monkestation\mobs.dm"
 #include "code\__DEFINES\~monkestation\smoothing.dm"
+#include "code\__DEFINES\~monkestation\span.dm"
+#include "code\__DEFINES\~monkestation\status_effects.dm"
+#include "code\__DEFINES\~monkestation\traits.dm"
+#include "code\__DEFINES\~monkestation\dcs\signals\signals_atom.dm"
 #include "code\__HELPERS\_auxtools_api.dm"
 #include "code\__HELPERS\_lists.dm"
 #include "code\__HELPERS\_planes.dm"