Merges the Ripley MK-II and Firefighter (#21498)

* it's joever

* Update exosuit_fab.dm

* Update exosuit_fab.dm

Author: SapphicOverload

_maps/RandomRuins/StationRuins/maint/10x5/10x5_tank_heaven.dmm

@@ -55,7 +55,7 @@
 /turf/open/floor/plating,
 /area/template_noop)
 "p" = (
-/obj/structure/mecha_wreckage/ripley/mkii,
+/obj/structure/mecha_wreckage/ripley/firefighter,
 /obj/effect/decal/cleanable/oil,
 /turf/open/floor/plating,
 /area/template_noop)

code/__DEFINES/exosuit_fab.dm

@@ -15,21 +15,19 @@
 #define EXOSUIT_MODULE_RIPLEY		(1<<0)
 /// Module is compatible with Odyseeus Exosuit models
 #define EXOSUIT_MODULE_ODYSSEUS		(1<<1)
-/// Module is compatible with Firefighter Exosuit models
-#define EXOSUIT_MODULE_FIREFIGHTER	(1<<2)
 /// Module is compatible with Gygax Exosuit models
-#define EXOSUIT_MODULE_GYGAX		(1<<3)
+#define EXOSUIT_MODULE_GYGAX		(1<<2)
 /// Module is compatible with Durand Exosuit models
-#define EXOSUIT_MODULE_DURAND		(1<<4)
+#define EXOSUIT_MODULE_DURAND		(1<<3)
 /// Module is compatible with H.O.N.K Exosuit models
-#define EXOSUIT_MODULE_HONK			(1<<5)
+#define EXOSUIT_MODULE_HONK			(1<<4)
 /// Module is compatible with Phazon Exosuit models
-#define EXOSUIT_MODULE_PHAZON		(1<<6)
+#define EXOSUIT_MODULE_PHAZON		(1<<5)
 /// Module is compatible with Sidewinder Exosuit models
-#define EXOSUIT_MODULE_SIDEWINDER	(1<<7)
+#define EXOSUIT_MODULE_SIDEWINDER	(1<<6)
 
 /// Module is compatible with "Working" Exosuit models - Ripley and Firefighter
-#define EXOSUIT_MODULE_WORKING		EXOSUIT_MODULE_RIPLEY | EXOSUIT_MODULE_FIREFIGHTER
+#define EXOSUIT_MODULE_WORKING		EXOSUIT_MODULE_RIPLEY
 /// Module is compatible with "Combat" Exosuit models - Gygax, H.O.N.K, Durand, Phazon, and Sidewinder
 #define EXOSUIT_MODULE_COMBAT		EXOSUIT_MODULE_GYGAX | EXOSUIT_MODULE_HONK | EXOSUIT_MODULE_DURAND | EXOSUIT_MODULE_PHAZON | EXOSUIT_MODULE_SIDEWINDER
 /// Module is compatible with "Medical" Exosuit modelsm - Odysseus

code/game/mecha/equipment/tools/work_tools.dm

@@ -572,8 +572,8 @@
 
 //Dunno where else to put this so shrug
 /obj/item/mecha_parts/mecha_equipment/ripleyupgrade
-	name = "Ripley MK-II Conversion Kit"
-	desc = "A pressurized canopy attachment kit for an Autonomous Power Loader Unit \"Ripley\" MK-I mecha, to convert it to the slower, but space-worthy MK-II design. This kit cannot be removed, once applied."
+	name = "Firefighter Conversion Kit"
+	desc = "A pressurized canopy attachment kit for an Autonomous Power Loader Unit MK-I \"Ripley\" mecha, to convert it to the slower, but space-worthy MK-II design. This kit cannot be removed, once applied."
 	icon_state = "ripleyupgrade"
 
 /obj/item/mecha_parts/mecha_equipment/ripleyupgrade/can_attach(obj/mecha/working/ripley/M)
@@ -592,7 +592,7 @@
 	return TRUE
 
 /obj/item/mecha_parts/mecha_equipment/ripleyupgrade/attach(obj/mecha/M)
-	var/obj/mecha/working/ripley/mkii/N = new /obj/mecha/working/ripley/mkii(get_turf(M),1)
+	var/obj/mecha/working/ripley/firefighter/N = new /obj/mecha/working/ripley/firefighter(get_turf(M),1)
 	if(!N)
 		return
 	QDEL_NULL(N.cell)

code/game/mecha/mech_fabricator.dm

@@ -56,7 +56,6 @@
 								"Cyborg",
 								"Ripley",
 								"Odysseus",
-								"Firefighter",
 								"Clarke",
 								"Gygax",
 								"Durand",
@@ -245,8 +244,6 @@
 					category_override += "Ripley"
 				if(mech_types & EXOSUIT_MODULE_ODYSSEUS)
 					category_override += "Odysseus"
-				if(mech_types & EXOSUIT_MODULE_FIREFIGHTER)
-					category_override += "Firefighter"
 				if(mech_types & EXOSUIT_MODULE_GYGAX)
 					category_override += "Gygax"
 				if(mech_types & EXOSUIT_MODULE_DURAND)

code/game/mecha/mecha_construction_paths.dm

@@ -536,166 +536,6 @@
 				user.visible_message("[user] unfastens the Gygax Armor Plates.", span_notice("You unfasten the Gygax Armor Plates."))
 	return TRUE
 
-/datum/component/construction/unordered/mecha_chassis/firefighter
-	result = /datum/component/construction/mecha/firefighter
-	steps = list(
-		/obj/item/mecha_parts/part/ripley_torso,
-		/obj/item/mecha_parts/part/ripley_left_arm,
-		/obj/item/mecha_parts/part/ripley_right_arm,
-		/obj/item/mecha_parts/part/ripley_left_leg,
-		/obj/item/mecha_parts/part/ripley_right_leg,
-		/obj/item/clothing/suit/fire
-	)
-
-/datum/component/construction/mecha/firefighter
-	result = /obj/mecha/working/ripley/firefighter
-	base_icon = "fireripley"
-
-	circuit_control = /obj/item/circuitboard/mecha/ripley/main
-	circuit_periph = /obj/item/circuitboard/mecha/ripley/peripherals
-
-	inner_plating = /obj/item/stack/sheet/plasteel
-	inner_plating_amount = 5
-
-/datum/component/construction/mecha/firefighter/get_outer_plating_steps()
-	return list(
-		list(
-			"key" = /obj/item/stack/sheet/plasteel,
-			"amount" = 5,
-			"back_key" = TOOL_WELDER,
-			"desc" = "Internal armor is welded."
-		),
-
-		list(
-			"key" = /obj/item/stack/sheet/plasteel,
-			"amount" = 5,
-			"back_key" = TOOL_CROWBAR,
-			"desc" = "External armor is being installed."
-		),
-
-		list(
-			"key" = TOOL_WRENCH,
-			"back_key" = TOOL_CROWBAR,
-			"desc" = "External armor is installed."
-		),
-
-		list(
-			"key" = TOOL_WELDER,
-			"back_key" = TOOL_WRENCH,
-			"desc" = "External armor is wrenched."
-		),
-)
-
-/datum/component/construction/mecha/firefighter/custom_action(obj/item/I, mob/living/user, diff)
-	if(!..())
-		return FALSE
-
-	//TODO: better messages.
-	switch(index)
-		if(1)
-			user.visible_message("[user] connects [parent] hydraulic systems", span_notice("You connect [parent] hydraulic systems."))
-		if(2)
-			if(diff==FORWARD)
-				user.visible_message("[user] activates [parent] hydraulic systems.", span_notice("You activate [parent] hydraulic systems."))
-			else
-				user.visible_message("[user] disconnects [parent] hydraulic systems", span_notice("You disconnect [parent] hydraulic systems."))
-		if(3)
-			if(diff==FORWARD)
-				user.visible_message("[user] adds the wiring to [parent].", span_notice("You add the wiring to [parent]."))
-			else
-				user.visible_message("[user] deactivates [parent] hydraulic systems.", span_notice("You deactivate [parent] hydraulic systems."))
-		if(4)
-			if(diff==FORWARD)
-				user.visible_message("[user] adjusts the wiring of [parent].", span_notice("You adjust the wiring of [parent]."))
-			else
-				user.visible_message("[user] removes the wiring from [parent].", span_notice("You remove the wiring from [parent]."))
-		if(5)
-			if(diff==FORWARD)
-				user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent]."))
-			else
-				user.visible_message("[user] disconnects the wiring of [parent].", span_notice("You disconnect the wiring of [parent]."))
-		if(6)
-			if(diff==FORWARD)
-				user.visible_message("[user] secures the mainboard.", span_notice("You secure the mainboard."))
-			else
-				user.visible_message("[user] removes the central control module from [parent].", span_notice("You remove the central computer mainboard from [parent]."))
-		if(7)
-			if(diff==FORWARD)
-				user.visible_message("[user] installs [I]into [parent].", span_notice("You install [I]into [parent]."))
-			else
-				user.visible_message("[user] unfastens the mainboard.", span_notice("You unfasten the mainboard."))
-		if(8)
-			if(diff==FORWARD)
-				user.visible_message("[user] secures the peripherals control module.", span_notice("You secure the peripherals control module."))
-			else
-				user.visible_message("[user] removes the peripherals control module from [parent].", span_notice("You remove the peripherals control module from [parent]."))
-		if(9)
-			if(diff==FORWARD)
-				user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent]."))
-			else
-				user.visible_message("[user] unfastens the peripherals control module.", span_notice("You unfasten the peripherals control module."))
-		if(10)
-			if(diff==FORWARD)
-				user.visible_message("[user] secures the scanner module.", span_notice("You secure the scanner module."))
-			else
-				user.visible_message("[user] removes the scanner module from [parent].", span_notice("You remove the scanner module from [parent]."))
-		if(11)
-			if(diff==FORWARD)
-				user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent]."))
-			else
-				user.visible_message("[user] unfastens the scanner module.", span_notice("You unfasten the scanner module."))
-		if(12)
-			if(diff==FORWARD)
-				user.visible_message("[user] secures the capacitor.", span_notice("You secure the capacitor."))
-			else
-				user.visible_message("[user] removes the capacitor from [parent].", span_notice("You remove the capacitor from [parent]."))
-		if(13)
-			if(diff==FORWARD)
-				user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent]."))
-			else
-				user.visible_message("[user] unfastens the capacitor.", span_notice("You unfasten the capacitor."))
-		if(14)
-			if(diff==FORWARD)
-				user.visible_message("[user] secures the power cell.", span_notice("You secure the power cell."))
-			else
-				user.visible_message("[user] pries the power cell from [parent].", span_notice("You pry the power cell from [parent]."))
-		if(15)
-			if(diff==FORWARD)
-				user.visible_message("[user] installs the internal armor layer to [parent].", span_notice("You install the internal armor layer to [parent]."))
-			else
-				user.visible_message("[user] unfastens the power cell.", span_notice("You unfasten the power cell."))
-		if(16)
-			if(diff==FORWARD)
-				user.visible_message("[user] secures the internal armor layer.", span_notice("You secure the internal armor layer."))
-			else
-				user.visible_message("[user] pries internal armor layer from [parent].", span_notice("You pry internal armor layer from [parent]."))
-		if(17)
-			if(diff==FORWARD)
-				user.visible_message("[user] welds the internal armor layer to [parent].", span_notice("You weld the internal armor layer to [parent]."))
-			else
-				user.visible_message("[user] unfastens the internal armor layer.", span_notice("You unfasten the internal armor layer."))
-		if(18)
-			if(diff==FORWARD)
-				user.visible_message("[user] starts to install the external armor layer to [parent].", span_notice("You install the external armor layer to [parent]."))
-			else
-				user.visible_message("[user] cuts the internal armor layer from [parent].", span_notice("You cut the internal armor layer from [parent]."))
-		if(19)
-			if(diff==FORWARD)
-				user.visible_message("[user] installs the external reinforced armor layer to [parent].", span_notice("You install the external reinforced armor layer to [parent]."))
-			else
-				user.visible_message("[user] removes the external armor from [parent].", span_notice("You remove the external armor from [parent]."))
-		if(20)
-			if(diff==FORWARD)
-				user.visible_message("[user] secures the external armor layer.", span_notice("You secure the external reinforced armor layer."))
-			else
-				user.visible_message("[user] pries external armor layer from [parent].", span_notice("You pry external armor layer from [parent]."))
-		if(21)
-			if(diff==FORWARD)
-				user.visible_message("[user] welds the external armor layer to [parent].", span_notice("You weld the external armor layer to [parent]."))
-			else
-				user.visible_message("[user] unfastens the external armor layer.", span_notice("You unfasten the external armor layer."))
-	return TRUE
-
 /datum/component/construction/unordered/mecha_chassis/clarke
 	result = /datum/component/construction/mecha/clarke
 	steps = list(

code/game/mecha/mecha_parts.dm

@@ -187,11 +187,6 @@
 	desc = "A set of armor plates for the Durand. Built heavy to resist an incredible amount of brute force."
 	icon_state = "durand_armor"
 
-////////// Firefighter
-
-/obj/item/mecha_parts/chassis/firefighter
-	name = "\improper Firefighter chassis"
-	construct_type = /datum/component/construction/unordered/mecha_chassis/firefighter
 
 ////////// Clarke
 

code/game/mecha/mecha_wreckage.dm

@@ -206,11 +206,6 @@
 	icon_state = "ripley-broken"
 	orig_mecha = /obj/mecha/working/ripley
 
-/obj/structure/mecha_wreckage/ripley/mkii
-	name = "\improper Ripley MK-II wreckage"
-	icon_state = "ripleymkii-broken"
-	orig_mecha = /obj/mecha/working/ripley/mkii
-
 /obj/structure/mecha_wreckage/ripley/firefighter
 	name = "\improper Firefighter wreckage"
 	icon_state = "firefighter-broken"

code/game/mecha/working/ripley.dm

@@ -6,7 +6,6 @@
 	step_in = 1.5 //Move speed, lower is faster.
 	max_temperature = 20000
 	max_integrity = 200
-	light_power = 7
 	deflect_chance = 15
 	armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 0, BOMB = 40, BIO = 0, RAD = 20, FIRE = 100, ACID = 100)
 	max_equip = 6
@@ -62,36 +61,18 @@
 	. = ..()
 	AddComponent(/datum/component/armor_plate,3,/obj/item/stack/sheet/animalhide/goliath_hide,list(MELEE = 10, BULLET = 5, LASER = 5))
 
-
-/obj/mecha/working/ripley/mkii
-	desc = "Autonomous Power Loader Unit MK-II. This prototype Ripley is refitted with a pressurized cabin, trading its prior speed for atmospheric protection"
-	name = "\improper APLU MK-II \"Ripley\""
-	icon_state = "ripleymkii"
-	fast_pressure_step_in = 1.75 //step_in while in low pressure conditions
-	slow_pressure_step_in = 3 //step_in while in normal pressure conditions
-	step_in = 3
-	flags_1 = HEAR_1 | RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
-	armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 0, BOMB = 40, BIO = 100, RAD = 100, FIRE = 100, ACID = 100)
-	wreckage = /obj/structure/mecha_wreckage/ripley/mkii
-	enclosed = TRUE
-	enter_delay = 40
-	silicon_icon_state = null
-	opacity = TRUE
-
 /obj/mecha/working/ripley/firefighter
-	desc = "Autonomous Power Loader Unit MK-III. This model is refitted with a pressurized cabin and additional thermal protection."
-	name = "\improper APLU MK-III \"Firefighter\""
+	desc = "Autonomous Power Loader Unit MK-II. This model is fitted with a pressurized cabin and thermal protection."
+	name = "\improper APLU MK-II \"Firefighter\""
 	icon_state = "firefighter"
 	max_temperature = 65000
 	max_integrity = 250
 	fast_pressure_step_in = 1.75 //step_in while in low pressure conditions
 	slow_pressure_step_in = 3 //step_in while in normal pressure conditions
 	step_in = 3
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	light_power = 7
 	flags_1 = HEAR_1 | RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
 	armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 60, BIO = 100, RAD = 100, FIRE = 100, ACID = 100)
-	max_equip = 5 // More armor, less tools
 	wreckage = /obj/structure/mecha_wreckage/ripley/firefighter
 	enclosed = TRUE
 	enter_delay = 40

code/modules/cargo/bounties/mech.dm

@@ -13,13 +13,8 @@
 /datum/bounty/item/mech/mark_high_priority(scale_reward)
 	return ..(max(scale_reward * 0.7, 1.2))
 
-/datum/bounty/item/mech/ripleymkii
-	name = "APLU MK-II \"Ripley\""
-	reward = 13000
-	wanted_types = list(/obj/mecha/working/ripley/mkii)
-
 /datum/bounty/item/mech/firefighter
-	name = "APLU \"Firefighter\""
+	name = "APLU MK-II \"Firefighter\""
 	reward = 18000
 	wanted_types = list(/obj/mecha/working/ripley/firefighter)
 

code/modules/research/designs/mechfabricator_designs.dm

@@ -72,24 +72,14 @@
 	construction_time = 100
 	category = list("Ripley")
 
-//firefighter subtype
-/datum/design/firefighter_chassis
-	name = "Exosuit Chassis (APLU \"Firefighter\")"
-	id = "firefighter_chassis"
-	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/chassis/firefighter
-	materials = list(/datum/material/iron=20000)
-	construction_time = 100
-	category = list("Firefighter")
-
 /datum/design/ripley_torso
 	name = "Exosuit Torso (APLU \"Ripley\")"
 	id = "ripley_torso"
 	build_type = MECHFAB
 	build_path = /obj/item/mecha_parts/part/ripley_torso
 	materials = list(/datum/material/iron=20000, /datum/material/glass=7500)
 	construction_time = 200
-	category = list("Ripley","Firefighter")
+	category = list("Ripley")
 
 /datum/design/ripley_left_arm
 	name = "Exosuit Left Arm (APLU \"Ripley\")"
@@ -98,7 +88,7 @@
 	build_path = /obj/item/mecha_parts/part/ripley_left_arm
 	materials = list(/datum/material/iron=15000)
 	construction_time = 150
-	category = list("Ripley","Firefighter")
+	category = list("Ripley")
 
 /datum/design/ripley_right_arm
 	name = "Exosuit Right Arm (APLU \"Ripley\")"
@@ -107,7 +97,7 @@
 	build_path = /obj/item/mecha_parts/part/ripley_right_arm
 	materials = list(/datum/material/iron=15000)
 	construction_time = 150
-	category = list("Ripley","Firefighter")
+	category = list("Ripley")
 
 /datum/design/ripley_left_leg
 	name = "Exosuit Left Leg (APLU \"Ripley\")"
@@ -116,7 +106,7 @@
 	build_path = /obj/item/mecha_parts/part/ripley_left_leg
 	materials = list(/datum/material/iron=15000)
 	construction_time = 150
-	category = list("Ripley","Firefighter")
+	category = list("Ripley")
 
 /datum/design/ripley_right_leg
 	name = "Exosuit Right Leg (APLU \"Ripley\")"
@@ -125,7 +115,7 @@
 	build_path = /obj/item/mecha_parts/part/ripley_right_leg
 	materials = list(/datum/material/iron=15000)
 	construction_time = 150
-	category = list("Ripley","Firefighter")
+	category = list("Ripley")
 
 //Odysseus
 /datum/design/odysseus_chassis
@@ -636,7 +626,7 @@
 
 //Exosuit Equipment
 /datum/design/ripleyupgrade
-	name = "Ripley MK-I to MK-II conversion kit"
+	name = "APLU MK-II \"Firefighter\" conversion kit"
 	id = "ripleyupgrade"
 	build_type = MECHFAB
 	build_path = /obj/item/mecha_parts/mecha_equipment/ripleyupgrade