Upload files

code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm

@@ -72,8 +72,11 @@ drain_amount: How much is drained by default; Influenced by a multiplier on most
 		cell.use(.)
 		spark_system.start()
 
-/obj/mecha/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER)
-	if(!clockcult_user || (occupant && !is_servant_of_ratvar(occupant)))
+/obj/vehicle/sealed/mecha/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER)
+	if(!clockcult_user || LAZYLEN(occupants))
+		for(var/mob/living/MB in occupants)
+			if(is_servant_of_ratvar(MB))
+				return
 		if(recursive)
 			var/succ = 0
 			for(var/atom/movable/target in contents) //Hiding in your mech won't save you.

code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm

@@ -207,20 +207,20 @@
 /datum/clockwork_scripture/create_object/summon_arbiter
 	descname = "Powerful Assault Mech"
 	name = "Summon Neovgre, the Anima Bulwark"
-	desc = "Calls forth the mighty Anima Bulwark, a mech with superior defensive and offensive capabilities. It will \
+	desc = "Calls forth the mighty Anima Bulwark, a two-person mech with superior defensive and offensive capabilities. It will \
 			 steadily regenerate HP and triple its regeneration speed while standing \
 			 on a clockwork tile. It will automatically draw power from nearby sigils of \
 			 transmission should the need arise. Its Arbiter laser cannon can decimate foes \
 			 from a range and is capable of smashing through any barrier presented to it. \
-			 Be warned however, choosing to pilot Neovgre is a lifetime commitment, once you are \
-			 in you cannot leave and when it is destroyed it will explode catastrophically, with you inside."
+			 Be warned however, choosing to pilot or man Neovgre is a lifetime commitment, once you are \
+			 in you cannot leave and when it is destroyed it will explode catastrophically, with everyone inside."
 	invocations = list("By the strength of the alloy...!!", "...call forth the Arbiter!!")
 	channel_time = 200 // This is a strong fucking weapon, 20 seconds channel time is getting off light I tell ya.
 	power_cost = 75000 //75 KW
 	usage_tip = "Neovgre is a powerful mech that will crush your enemies!"
 	invokers_required = 5
 	multiple_invokers_used = TRUE
-	object_path = /obj/mecha/combat/neovgre
+	object_path = /obj/vehicle/sealed/mecha/combat/neovgre
 	tier = SCRIPTURE_APPLICATION
 	primary_component = BELLIGERENT_EYE
 	sort_priority = 8

code/modules/antagonists/clockcult/clock_structure.dm

@@ -72,11 +72,6 @@
 		return FALSE
 	return ..()
 
-/obj/structure/destructible/clockwork/mech_melee_attack(obj/mecha/M)
-	if(M.occupant && is_servant_of_ratvar(M.occupant) && immune_to_servant_attacks)
-		return FALSE
-	return ..()
-
 /obj/structure/destructible/clockwork/proc/get_efficiency_mod()
 	if(GLOB.ratvar_awakens)
 		return 2

code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm

@@ -76,7 +76,7 @@
 						L.adjust_fire_stacks(damage_per_tick)
 						L.IgniteMob()
 			else if(ismecha(target))
-				var/obj/mecha/M = target
+				var/obj/vehicle/sealed/mecha/M = target
 				M.take_damage(damage_per_tick * get_efficiency_mod(), BURN, "melee", 1, get_dir(src, M))
 
 			new /obj/effect/temp_visual/ratvar/ocular_warden(get_turf(target))
@@ -91,8 +91,8 @@
 				var/mob/living/L = target
 				to_chat(L, "<span class='neovgre'>\"I SEE YOU!\"</span>\n<span class='userdanger'>[src]'s gaze [GLOB.ratvar_awakens ? "melts you alive" : "burns you"]!</span>")
 			else if(ismecha(target))
-				var/obj/mecha/M = target
-				to_chat(M.occupant, "<span class='neovgre'>\"I SEE YOU!\"</span>" )
+				var/obj/vehicle/sealed/mecha/M = target
+				to_chat(M.occupants, "<span class='neovgre'>\"I SEE YOU!\"</span>" )
 		else if(prob(0.5)) //Extremely low chance because of how fast the subsystem it uses processes
 			if(prob(50))
 				visible_message("<span class='notice'>[src][pick(idle_messages)]</span>")
@@ -131,8 +131,11 @@
 		. += L
 	var/list/viewcache = list()
 	for(var/N in GLOB.mechas_list)
-		var/obj/mecha/M = N
-		if(get_dist(M, src) <= sight_range && M.occupant && !is_servant_of_ratvar(M.occupant))
+		var/obj/vehicle/sealed/mecha/M = N
+		if(get_dist(M, src) <= sight_range && LAZYLEN(M.occupants))
+			for(var/mob/living/MB in M.occupants)
+				if(is_servant_of_ratvar(MB))
+					return
 			if(!length(viewcache))
 				for (var/obj/Z in view(sight_range, src))
 					viewcache += Z

code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor_mech.dm

@@ -9,12 +9,14 @@
 
 /obj/structure/destructible/clockwork/trap/trigger/pressure_sensor/mech/Crossed(atom/movable/AM)
 	. = ..()
-	if(!istype(AM,/obj/mecha/))
+	if(!istype(AM,/obj/vehicle/sealed/mecha/))
 		return
 
-	var/obj/mecha/M = AM
-	if(M.occupant && is_servant_of_ratvar(M.occupant))
-		return
+	var/obj/vehicle/sealed/mecha/M = AM
+	if(LAZYLEN(M.occupants))
+		for(var/mob/living/MB in M.occupants)
+			if(is_servant_of_ratvar(MB))
+				return
 	audible_message("<i>*click*</i>")
 	playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE)
 	activate()

code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm

@@ -68,7 +68,7 @@
 		mouse_opacity = MOUSE_OPACITY_OPAQUE //So players can interact with the tile it's on to pull them off
 		buckle_mob(squirrel, TRUE)
 	else
-		var/obj/mecha/M = locate() in get_turf(src)
+		var/obj/vehicle/sealed/mecha/M = locate() in get_turf(src)
 		if(M)
 			M.take_damage(50,BRUTE,"melee")
 			M.visible_message("<span class='danger'>A massive brass spike erupts from the ground, penetrating \the [M] and shattering the trap into pieces!</span>")

code/modules/antagonists/eldritch_cult/eldritch_magic.dm

@@ -402,7 +402,7 @@
 		new /obj/effect/hotspot(T)
 		T.hotspot_expose(700,50,1)
 		// deals damage to mechs
-		for(var/obj/mecha/M in T.contents)
+		for(var/obj/vehicle/sealed/mecha/M in T.contents)
 			if(M in hit_list)
 				continue
 			hit_list += M