Merge pull request #3627 from CHOMPStation2/upstream-merge-12144

[MIRROR] exosuit cargo expansion equipment

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

@@ -0,0 +1,25 @@
+/obj/item/mecha_parts/mecha_equipment/storage
+    name = "auxillary exosuit storage bay"
+    desc = "An auxillary storage compartment, for attaching to exosuits."
+    icon_state = "mecha_tiler"
+    icon = 'icons/mecha/mecha_equipment_vr.dmi'
+    origin_tech = list(TECH_MATERIAL = 3)
+    range = 0
+    var/storage_added = 5
+    equip_type = EQUIP_SPECIAL
+
+/obj/item/mecha_parts/mecha_equipment/storage/attach(obj/mecha/M)
+    . = ..()
+    M.cargo_capacity += storage_added
+
+/obj/item/mecha_parts/mecha_equipment/storage/detach()
+    chassis.cargo_capacity -= storage_added
+    ..()
+
+/obj/item/mecha_parts/mecha_equipment/storage/bluespace
+    name = "auxillary exosuit storage wormhole"
+    desc = "An auxillary storage wormhole, utilizing a localized rip in bluespace for storage. Interestingly enough, teleport-stable, \
+    despite its blatant disregard for the fabric of reality or reality-adjacency."
+    icon_state = "mecha_phase_array"
+    storage_added = 15
+    origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 4, TECH_POWER = 5, TECH_BLUESPACE = 3)

code/game/mecha/mecha.dm

@@ -2483,8 +2483,8 @@
 		var/obj/item/mecha_parts/mecha_equipment/equip = top_filter.getObj("select_equip")
 		if(equip)
 			src.selected = equip
-			src.occupant_message("You switch to [equip]")
-			src.visible_message("[src] raises [equip]")
+			src.occupant_message("You switch to [equip].")
+			src.visible_message("[src] raises [equip].")
 			send_byjax(src.occupant,"exosuit.browser","eq_list",src.get_equipment_list())
 		return
 	if(href_list["eject"])

code/game/objects/items/paintkit.dm

@@ -259,6 +259,17 @@
 	new_desc = "A very retro APLU unit; didn't they retire these back in 2543?"
 	new_icon = "ripley-old"
 	allowed_types = list("ripley")
+	var/showpilot = TRUE
+	var/showpilot_lift = 5
+
+/obj/item/device/kit/paint/ripley/customize(obj/mecha/M, mob/user)
+	if(showpilot)
+		M.show_pilot = TRUE
+		M.pilot_lift = 5
+	else
+		M.show_pilot = FALSE
+		M.pilot_lift = 0
+	. = ..()
 
 /obj/item/device/kit/paint/ripley/death
 	name = "\"Reaper\" APLU customisation kit"
@@ -266,18 +277,21 @@
 	new_desc = "A terrifying, grim power loader. Why do those clamps have spikes?"
 	new_icon = "deathripley"
 	allowed_types = list("ripley","firefighter")
+	showpilot = FALSE
 
 /obj/item/device/kit/paint/ripley/flames_red
 	name = "\"Firestarter\" APLU customisation kit"
 	new_name = "APLU \"Firestarter\""
 	new_desc = "A standard APLU exosuit with stylish orange flame decals."
 	new_icon = "ripley_flames_red"
+	showpilot = FALSE
 
 /obj/item/device/kit/paint/ripley/flames_blue
 	name = "\"Burning Chrome\" APLU customisation kit"
 	new_name = "APLU \"Burning Chrome\""
 	new_desc = "A standard APLU exosuit with stylish blue flame decals."
 	new_icon = "ripley_flames_blue"
+	showpilot = FALSE
 
 // Durand kits.
 /obj/item/device/kit/paint/durand

code/modules/research/mechfab_designs.dm

@@ -770,6 +770,22 @@
 	materials = list(MAT_STEEL = 10000, MAT_SILVER = 1000, MAT_GOLD = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/speedboost
 
+/datum/design/item/mecha/auxstorage
+	name = "Auxillary Exosuit Storage Bay"
+	desc = "An auxillary storage compartment, for attaching to exosuits."
+	id = "mech_storage"
+	req_tech = list(TECH_MATERIAL = 4)
+	materials = list(MAT_STEEL = 10000)
+	build_path = /obj/item/mecha_parts/mecha_equipment/storage
+
+/datum/design/item/mecha/bsauxstorage
+	name = "Auxillary Exosuit Storage Wormhole"
+	desc = "An auxillary storage wormhole, for attaching to exosuits."
+	id = "mech_storage_bs"
+	req_tech = list(TECH_MATERIAL = 4)
+	materials = list(MAT_PLASTEEL = 10000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000)
+	build_path = /obj/item/mecha_parts/mecha_equipment/storage/bluespace
+
 /datum/design/item/synthetic_flash
 	name = "Synthetic Flash"
 	id = "sflash"

vorestation.dme

@@ -1075,6 +1075,7 @@
 #include "code\game\mecha\equipment\tools\shield_omni.dm"
 #include "code\game\mecha\equipment\tools\sleeper.dm"
 #include "code\game\mecha\equipment\tools\speedboost.dm"
+#include "code\game\mecha\equipment\tools\storage_compartment.dm"
 #include "code\game\mecha\equipment\tools\syringe_gun.dm"
 #include "code\game\mecha\equipment\tools\teleporter.dm"
 #include "code\game\mecha\equipment\tools\tools.dm"