addresses code suggestions from Deltafire

2021-03-07 20:47:07 -05:00
parent 60b4aa58cd
commit e29606e5f3
11 changed files with 23 additions and 22 deletions
@@ -232,9 +232,11 @@
 	. = ..()
 	if(!.)
 		return FALSE
+	if(isclockworkgolem(target))
+		return FALSE
 	target.visible_message("<span class='warning'>The robotic parts magnetize to [target], the new frame's eyes glowing in a brilliant yellow!</span>")
 	var/mob/living/silicon/robot/R = target.Robotize()
-	R.cell = new /obj/item/stock_parts/cell/upgraded/plus(R)
+	R.cell = new /obj/item/stock_parts/cell/super(R)//takes one to use the rite to begin with
 	new /obj/effect/temp_visual/ratvar/sigil/transmission(T,2)

 /datum/clockwork_rite/golem_transform
@@ -5,7 +5,7 @@
 	name = "clock-themed arm-mounted implant"
 	var/clockwork_desc = "According to Ratvar, this really shouldn't exist. Tell Him about this immediately."
 	syndicate_implant = TRUE
-	icon_state = "clock_arm_implant"
+	icon_state = "toolkit_implant"

 /obj/item/organ/cyberimp/arm/clockwork/ui_action_click()
 	if(is_servant_of_ratvar(owner) || (obj_flags & EMAGGED)) //If you somehow manage to steal a clockie's implant AND have an emag AND manage to get it implanted for yourself, good on ya!
@@ -1,14 +1,14 @@
 //Clockwork guardian: Slow but with high damage, resides inside of a servant. Created via the Memory Allocation scripture.
 /mob/living/simple_animal/hostile/clockwork/guardian
 	name = "clockwork guardian"
-	desc = "A stalwart apparition of a soldier, blazing with magenta flames. It's armed with a gladius and shield and stands ready by its master."
-	icon_state = "clockwork_marauder"
+	desc = "A slow, armored clockwork machine, blazing with magenta flames. It's armed with a gladius and shield, and stands ready by its master."
+	icon_state = "clockwork_guardian"
 	health = 300
 	maxHealth = 300
 	speed = 1
 	obj_damage = 40
-	melee_damage_lower = 12
-	melee_damage_upper = 12
+	melee_damage_lower = 20//ranged attacks are the way to go for fighting these
+	melee_damage_upper = 20
 	attack_verb_continuous = "slashes"
 	attack_verb_simple = "slash"
 	attack_sound = 'sound/weapons/bladeslice.ogg'
@@ -16,9 +16,6 @@ Judgement 80k power or nine converts
 	var/chanting = FALSE //If the invocation's words are being spoken
 	var/channel_time = 10 //In deciseconds, how long a ritual takes to chant
 	var/power_cost = 5 //In watts, how much a scripture takes to invoke
-	var/vitality_cost = 0 //how much vitality a scripture requires to be used
-	var/special_vitality_text//if the scripture can use additional vitality to have a unique function, use this; put
-	var/special_vitality_cost
 	var/special_power_text //If the scripture can use additional power to have a unique function, use this; put POWERCOST here to display the special power cost.
 	var/special_power_cost //This should be a define in __DEFINES/clockcult.dm, such as ABSCOND_ABDUCTION_COST
 	var/obj/item/clockwork/slab/slab //The parent clockwork slab
@@ -18,7 +18,7 @@
 	tier = SCRIPTURE_APPLICATION
 	one_per_tile = TRUE
 	primary_component = HIEROPHANT_ANSIBLE
-	sort_priority = 1
+	sort_priority = 2
 	important = TRUE
 	quickbind = TRUE
 	quickbind_desc = "Creates a Sigil of Transmission, which can drain and will store power for clockwork structures."
@@ -72,7 +72,7 @@
 	tier = SCRIPTURE_APPLICATION
 	one_per_tile = TRUE
 	primary_component = HIEROPHANT_ANSIBLE
-	sort_priority = 2
+	sort_priority = 5
 	quickbind = TRUE
 	quickbind_desc = "Creates a Mania Motor, which causes minor damage and negative mental effects in non-Servants."
 	requires_full_power = TRUE
@@ -112,7 +112,7 @@
 	usage_tip = "Guardians are useful as personal bodyguards and frontline warriors."
 	tier = SCRIPTURE_APPLICATION
 	primary_component = GEIS_CAPACITOR
-	sort_priority = 5
+	sort_priority = 6

 /datum/clockwork_scripture/memory_allocation/check_special_requirements()
 	for(var/mob/living/simple_animal/hostile/clockwork/guardian/M in GLOB.all_clockwork_mobs)
@@ -171,7 +171,7 @@
 	tier = SCRIPTURE_APPLICATION
 	one_per_tile = TRUE
 	primary_component = BELLIGERENT_EYE
-	sort_priority = 6
+	sort_priority = 7
 	quickbind = TRUE
 	quickbind_desc = "Creates a clockwork marauder, used for frontline combat."
 	object_path = /obj/item/clockwork/construct_chassis/clockwork_marauder
@@ -223,7 +223,7 @@
 	object_path = /obj/mecha/combat/neovgre
 	tier = SCRIPTURE_APPLICATION
 	primary_component = BELLIGERENT_EYE
-	sort_priority = 7
+	sort_priority = 8
 	creator_message = "<span class='brass'>Neovgre, the Anima Bulwark towers over you... your enemies reckoning has come.</span>"

 /datum/clockwork_scripture/create_object/summon_arbiter/check_special_requirements()
@@ -81,7 +81,7 @@
 	priority_announce("Massive [Gibberish("bluespace", 100)] anomaly detected on all frequencies. All crew are directed to \
 	@!$, [text2ratvar("PURGE ALL UNTRUTHS")] <&. the anomalies and destroy their source to prevent further damage to corporate property. This is \
 	not a drill.", "Central Command Higher Dimensional Affairs", 'sound/magic/clockwork/ark_activation_sequence.ogg')
-	set_security_level("red")
+	set_security_level("Delta")
 	for(var/V in SSticker.mode.servants_of_ratvar)
 		var/datum/mind/M = V
 		if(!M || !M.current)
@@ -158,12 +158,11 @@
 	sleep(50)
 	priority_announce("Massive energy surge detected. Closest matching threat: Incoming supernova. All crew are advised to evacuate NAN lightyears away from blast zone","Central Command Higher Dimensional Affairs", 'sound/misc/airraid.ogg')
 	sleep(300)
-	priority_announce("Gravitational anomalies detected on the station. Th$%e %o a& ad$&%al d%&-BZZZZZT.","Central Command Higher Dimensional Affairs", 'sound/magic/clockwork/ratvar_announce1.ogg')
+	priority_announce("Gravitational anomalies detected on the station. [Gibberish("There is no additional dat", 100)]-BZZZZZT.","Central Command Higher Dimensional Affairs", 'sound/magic/clockwork/ratvar_announce1.ogg')
 	sleep(80)
 	sound_to_playing_players(sound('sound/magic/clockwork/ratvar_announce2.ogg'))
 	send_to_playing_players("<span class='heavy_brass'><font size=5>\"COME, ALL THOSE FAITHFUL! WITNESS THE RAYS OF JUSTICE CAST UPON THE HERETICS!\"</font></span>")
 	sleep(50)
-	set_security_level("delta")
 	SSshuttle.registerHostileEnvironment(src)
 	SSshuttle.lockdown = TRUE
 	sleep(250)
@@ -182,5 +181,5 @@
 			var/mob/living/L = M
 			L.fire_stacks = INFINITY
 			L.IgniteMob()
-		sleep(50)
+	sleep(50)
 	SSticker.force_ending = 1
@@ -625,7 +625,7 @@
 	say_mod = "clicks"
 	limbs_id = "clockgolem"
 	info_text = "<span class='bold alloy'>As a </span><span class='bold brass'>Clockwork Golem</span><span class='bold alloy'>, you are faster than other types of golems, and are capable of using guns. On death, you will break down into scrap.</span>"
-	species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYES,NOGENITALS,NOAROUSAL)
+	species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYES,NOGENITALS,NOAROUSAL,ROBOTIC_LIMBS)
 	inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
 	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
 	inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
@@ -514,7 +514,7 @@
 /mob/living/ratvar_act()
 	if(status_flags & GODMODE)
 		return
-	if(is_servant_of_ratvar(src))
+	if(stat != DEAD && !is_servant_of_ratvar(src))
 		return
 	if (is_eligible_servant(src))
 		add_servant_of_ratvar(src)
@@ -525,8 +525,10 @@
 		adjustFireLoss(35)
 		IgniteMob()
 	if(iscultist(src))
-		to_chat(src, "<span class='ratvar'>\"[text2ratvar("DIE, BLOODSLAVE!")]\"</span>")
-		dust()
+		to_chat(src, "<span class='userdanger'>You resist Ratvar's influence... but not all of it! <i>Run!</i></span>")
+		adjustFireLoss(35)
+		if(src && reagents)
+			reagents.add_reagent(/datum/reagent/fuel/holyoil, 5)
 		return FALSE