Exosuit UI Update + Equipment Refactor

_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm

@@ -9,7 +9,7 @@
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "d" = (
-/obj/vehicle/sealed/mecha/working/ripley/mining,
+/obj/vehicle/sealed/mecha/ripley/mining,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "e" = (

_maps/RandomRuins/SpaceRuins/mechtransport.dmm

@@ -101,7 +101,7 @@
 /turf/open/floor/mineral/titanium/yellow/airless,
 /area/ruin/space/has_grav/powered/mechtransport)
 "A" = (
-/obj/vehicle/sealed/mecha/working/ripley,
+/obj/vehicle/sealed/mecha/ripley,
 /turf/open/floor/mineral/titanium/yellow/airless,
 /area/ruin/space/has_grav/powered/mechtransport)
 "B" = (

_maps/RandomZLevels/caves.dmm

@@ -1113,7 +1113,7 @@
 	},
 /area/awaymission/caves/bmp_asteroid)
 "gC" = (
-/obj/vehicle/sealed/mecha/working/ripley/mining,
+/obj/vehicle/sealed/mecha/ripley/mining,
 /turf/open/floor/iron/recharge_floor,
 /area/awaymission/caves/bmp_asteroid)
 "gF" = (

_maps/RandomZLevels/snowdin.dmm

@@ -9503,7 +9503,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/post/mining_main/mechbay)
 "In" = (
-/obj/vehicle/sealed/mecha/working/ripley/mining,
+/obj/vehicle/sealed/mecha/ripley/mining,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron/recharge_floor,
 /area/awaymission/snowdin/post/mining_main/mechbay)

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -46008,7 +46008,7 @@
 /turf/open/floor/iron,
 /area/station/cargo/quartermaster)
 "kOy" = (
-/obj/vehicle/sealed/mecha/working/ripley/cargo,
+/obj/vehicle/sealed/mecha/ripley/cargo,
 /turf/open/floor/iron/recharge_floor,
 /area/station/cargo/storage)
 "kOA" = (

_maps/map_files/KiloStation/KiloStation.dmm

@@ -60089,7 +60089,7 @@
 /area/station/engineering/atmos)
 "sTm" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/vehicle/sealed/mecha/working/ripley/cargo,
+/obj/vehicle/sealed/mecha/ripley/cargo,
 /turf/open/floor/iron/recharge_floor,
 /area/station/cargo/storage)
 "sTo" = (

_maps/map_files/MetaStation/MetaStation.dmm

@@ -33995,7 +33995,7 @@
 /area/station/medical/treatment_center)
 "lTZ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/vehicle/sealed/mecha/working/ripley/cargo,
+/obj/vehicle/sealed/mecha/ripley/cargo,
 /turf/open/floor/plating,
 /area/station/cargo/warehouse)
 "lUe" = (

_maps/map_files/NorthStar/north_star.dmm

@@ -52200,7 +52200,7 @@
 /turf/open/floor/iron,
 /area/station/security/prison)
 "nOj" = (
-/obj/vehicle/sealed/mecha/working/ripley/cargo,
+/obj/vehicle/sealed/mecha/ripley/cargo,
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 4
 	},

_maps/map_files/tramstation/maintenance_modules/atmoscilower_attachment_a_3.dmm

@@ -104,7 +104,7 @@
 /area/station/maintenance/starboard/lesser)
 "y" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/vehicle/sealed/mecha/working/ripley,
+/obj/vehicle/sealed/mecha/ripley,
 /obj/effect/decal/cleanable/oil,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/lesser)

_maps/map_files/tramstation/tramstation.dmm

@@ -13856,7 +13856,7 @@
 /area/station/science/robotics/lab)
 "doS" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/vehicle/sealed/mecha/working/ripley,
+/obj/vehicle/sealed/mecha/ripley,
 /obj/effect/decal/cleanable/oil,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/lesser)
@@ -35766,7 +35766,7 @@
 /turf/open/floor/iron/smooth,
 /area/station/hallway/primary/tram/right)
 "kqy" = (
-/obj/vehicle/sealed/mecha/working/ripley/cargo,
+/obj/vehicle/sealed/mecha/ripley/cargo,
 /obj/machinery/requests_console/directional/north{
 	department = "Cargo Bay";
 	name = "Cargo Bay Requests Console"

code/__DEFINES/cooldowns.dm

@@ -37,6 +37,7 @@
 #define COOLDOWN_MECHA_SMOKE "mecha_smoke"
 #define COOLDOWN_MECHA_SKYFALL "mecha_skyfall"
 #define COOLDOWN_MECHA_MISSILE_STRIKE "mecha_missile_strike"
+#define COOLDOWN_MECHA_CABIN_SEAL "mecha_cabin_seal"
 
 //car cooldowns
 #define COOLDOWN_CAR_HONK "car_honk"

code/__DEFINES/mecha.dm

@@ -1,11 +1,11 @@
 #define MECHA_INT_FIRE (1<<0)
 #define MECHA_INT_TEMP_CONTROL (1<<1)
 #define MECHA_INT_SHORT_CIRCUIT (1<<2)
-#define MECHA_INT_TANK_BREACH (1<<3)
+#define MECHA_CABIN_AIR_BREACH (1<<3)
 #define MECHA_INT_CONTROL_LOST (1<<4)
 
-#define ADDING_ACCESS_POSSIBLE (1<<0)
-#define ADDING_MAINT_ACCESS_POSSIBLE (1<<1)
+#define PANEL_OPEN (1<<0)
+#define ID_LOCK_ON (1<<1)
 #define CANSTRAFE (1<<2)
 #define LIGHTS_ON (1<<3)
 #define SILICON_PILOT (1<<4)
@@ -34,18 +34,18 @@
 #define MECHA_POWER "mecha_power"
 #define MECHA_ARMOR "mecha_armor"
 
-#define MECHA_LOCKED 0
-#define MECHA_SECURE_BOLTS 1
-#define MECHA_LOOSE_BOLTS 2
-#define MECHA_OPEN_HATCH 3
-
 // Some mechs must (at least for now) use snowflake handling of their UI elements, these defines are for that
 // when changing MUST update the same-named tsx file constants
 #define MECHA_SNOWFLAKE_ID_SLEEPER "sleeper_snowflake"
 #define MECHA_SNOWFLAKE_ID_SYRINGE "syringe_snowflake"
 #define MECHA_SNOWFLAKE_ID_MODE "mode_snowflake"
 #define MECHA_SNOWFLAKE_ID_EXTINGUISHER "extinguisher_snowflake"
 #define MECHA_SNOWFLAKE_ID_EJECTOR "ejector_snowflake"
+#define MECHA_SNOWFLAKE_ID_OREBOX_MANAGER "orebox_manager_snowflake"
+#define MECHA_SNOWFLAKE_ID_RADIO "radio_snowflake"
+#define MECHA_SNOWFLAKE_ID_AIR_TANK "air_tank_snowflake"
+#define MECHA_SNOWFLAKE_ID_WEAPON_BALLISTIC "ballistic_weapon_snowflake"
+#define MECHA_SNOWFLAKE_ID_GENERATOR "generator_snowflake"
 
 #define MECHA_AMMO_INCENDIARY "Incendiary bullet"
 #define MECHA_AMMO_BUCKSHOT "Buckshot shell"
@@ -54,3 +54,6 @@
 #define MECHA_AMMO_MISSILE_PEP "PEP missile"
 #define MECHA_AMMO_FLASHBANG "Flashbang"
 #define MECHA_AMMO_CLUSTERBANG "Clusterbang"
+#define MECHA_AMMO_PUNCHING_GLOVE "Punching glove"
+#define MECHA_AMMO_BANANA_PEEL "Banana peel"
+#define MECHA_AMMO_MOUSETRAP "Mousetrap"

code/__DEFINES/traits/declarations.dm

@@ -642,7 +642,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_WINE_TASTER "wine_taster"
 #define TRAIT_BONSAI "bonsai"
 #define TRAIT_LIGHTBULB_REMOVER "lightbulb_remover"
-#define TRAIT_KNOW_ROBO_WIRES "know_cyborg_wires"
+#define TRAIT_KNOW_ROBO_WIRES "know_robo_wires"
 #define TRAIT_KNOW_ENGI_WIRES "know_engi_wires"
 #define TRAIT_ENTRAILS_READER "entrails_reader"
 #define TRAIT_SABRAGE_PRO "sabrage_pro"
@@ -958,6 +958,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Similar trait given to temporary bodies inhabited by players
 #define TRAIT_TEMPORARY_BODY "temporary_body"
 
+/// Trait given to mechs that can have orebox functionality on movement
+#define TRAIT_OREBOX_FUNCTIONAL "orebox_functional"
+
 /// Trait given to objects with the wallmounted component
 #define TRAIT_WALLMOUNTED "wallmounted"
 

code/__DEFINES/wires.dm

@@ -16,6 +16,7 @@
 #define WIRE_BACKUP1 "Auxiliary Power 1"
 #define WIRE_BACKUP2 "Auxiliary Power 2"
 #define WIRE_BEACON "Beacon"
+#define WIRE_BOLTLIGHT "Bolt Lights"
 #define WIRE_BOLTS "Bolts"
 #define WIRE_BOOM "Boom Wire 1"
 #define WIRE_BOOM2 "Boom Wire 2"
@@ -30,7 +31,7 @@
 #define WIRE_IDSCAN "ID Scan"
 #define WIRE_INTERFACE "Interface"
 #define WIRE_LAWSYNC "AI Law Synchronization"
-#define WIRE_LIGHT "Bolt Lights"
+#define WIRE_LIGHT "Lights"
 #define WIRE_LIMIT "Limiter"
 #define WIRE_LOADCHECK "Load Check"
 #define WIRE_LOCKDOWN "Lockdown"
@@ -59,6 +60,7 @@
 #define WIRE_ZAP "High Voltage Circuit"
 #define WIRE_ZAP1 "High Voltage Circuit 1"
 #define WIRE_ZAP2 "High Voltage Circuit 2"
+#define WIRE_OVERCLOCK "Overclock"
 
 // Wire states for the AI
 #define AI_WIRE_NORMAL 0

code/_globalvars/bitfields.dm

@@ -235,14 +235,13 @@ DEFINE_BITFIELD(mat_container_flags, list(
 DEFINE_BITFIELD(internal_damage, list(
 	"MECHA_INT_FIRE" = MECHA_INT_FIRE,
 	"MECHA_INT_TEMP_CONTROL" = MECHA_INT_TEMP_CONTROL,
-	"MECHA_INT_TANK_BREACH" = MECHA_INT_TANK_BREACH,
+	"MECHA_CABIN_AIR_BREACH" = MECHA_CABIN_AIR_BREACH,
 	"MECHA_INT_CONTROL_LOST" = MECHA_INT_CONTROL_LOST,
 	"MECHA_INT_SHORT_CIRCUIT" = MECHA_INT_SHORT_CIRCUIT,
 ))
 
 DEFINE_BITFIELD(mecha_flags, list(
-	"ADDING_ACCESS_POSSIBLE" = ADDING_ACCESS_POSSIBLE,
-	"ADDING_MAINT_ACCESS_POSSIBLE" = ADDING_MAINT_ACCESS_POSSIBLE,
+	"ID_LOCK_ON" = ID_LOCK_ON,
 	"CANSTRAFE" = CANSTRAFE,
 	"LIGHTS_ON" = LIGHTS_ON,
 	"SILICON_PILOT" = SILICON_PILOT,

code/datums/components/armor_plate.dm

@@ -15,7 +15,7 @@
 	RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine))
 	RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(applyplate))
 	RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(dropplates))
-	if(istype(parent, /obj/vehicle/sealed/mecha/working/ripley))
+	if(istype(parent, /obj/vehicle/sealed/mecha/ripley))
 		RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_mech_overlays))
 
 	if(_maxamount)

code/datums/wires/airlock.dm

@@ -45,7 +45,7 @@
 		WIRE_BACKUP2,
 		WIRE_BOLTS,
 		WIRE_IDSCAN,
-		WIRE_LIGHT,
+		WIRE_BOLTLIGHT,
 		WIRE_OPEN,
 		WIRE_POWER1,
 		WIRE_POWER2,
@@ -142,7 +142,7 @@
 				A.close()
 		if(WIRE_TIMING)
 			A.normalspeed = !A.normalspeed
-		if(WIRE_LIGHT)
+		if(WIRE_BOLTLIGHT)
 			A.lights = !A.lights
 			A.update_appearance()
 		if(WIRE_UNRESTRICTED_EXIT) // Pulse to switch the direction around by 180 degrees (North goes to South, East goes to West, vice-versa)
@@ -206,7 +206,7 @@
 			A.autoclose = mend
 			if(A.autoclose && !A.density)
 				A.close()
-		if(WIRE_LIGHT) // Cut to disable lights, mend to re-enable.
+		if(WIRE_BOLTLIGHT) // Cut to disable lights, mend to re-enable.
 			A.lights = mend
 			A.update_appearance()
 		if(WIRE_ZAP1, WIRE_ZAP2) // Ouch.

code/datums/wires/mecha.dm

@@ -0,0 +1,78 @@
+/datum/wires/mecha
+	holder_type = /obj/vehicle/sealed/mecha
+	proper_name = "Mecha Control"
+
+/datum/wires/mecha/New(atom/holder)
+	wires = list(WIRE_IDSCAN, WIRE_DISARM, WIRE_ZAP, WIRE_OVERCLOCK)
+	var/obj/vehicle/sealed/mecha/mecha = holder
+	if(mecha.mecha_flags & HAS_LIGHTS)
+		wires += WIRE_LIGHT
+	add_duds(3)
+	..()
+
+/datum/wires/mecha/interactable(mob/user)
+	if(!..())
+		return FALSE
+	var/obj/vehicle/sealed/mecha/mecha = holder
+	return mecha.mecha_flags & PANEL_OPEN
+
+/datum/wires/mecha/get_status()
+	var/obj/vehicle/sealed/mecha/mecha = holder
+	var/list/status = list()
+	status += "The orange light is [mecha.internal_damage & MECHA_INT_SHORT_CIRCUIT ? "on" : "off"]."
+	status += "The red light is [mecha.overclock_mode ? "blinking" : "off"]."
+	status += "The green light is [(mecha.mecha_flags & ID_LOCK_ON) || mecha.dna_lock ? "on" : "off"]."
+	if(mecha.mecha_flags & HAS_LIGHTS)
+		status += "The yellow light is [mecha.light_on ? "on" : "off"]."
+	status += "The blue light is [mecha.equipment_disabled ? "on" : "off"]."
+	return status
+
+/datum/wires/mecha/on_pulse(wire)
+	var/obj/vehicle/sealed/mecha/mecha = holder
+	switch(wire)
+		if(WIRE_IDSCAN)
+			mecha.mecha_flags ^= ID_LOCK_ON
+			mecha.dna_lock = null
+		if(WIRE_DISARM)
+			mecha.equipment_disabled = TRUE
+			mecha.set_mouse_pointer()
+		if(WIRE_ZAP)
+			mecha.internal_damage ^= MECHA_INT_SHORT_CIRCUIT
+		if(WIRE_LIGHT)
+			mecha.set_light_on(!mecha.light_on)
+		if(WIRE_OVERCLOCK)
+			mecha.toggle_overclock()
+
+/datum/wires/mecha/on_cut(wire, mend, source)
+	var/obj/vehicle/sealed/mecha/mecha = holder
+	switch(wire)
+		if(WIRE_IDSCAN)
+			if(!mend)
+				mecha.mecha_flags &= ~ID_LOCK_ON
+				mecha.dna_lock = null
+		if(WIRE_DISARM)
+			mecha.equipment_disabled = !mend
+			mecha.set_mouse_pointer()
+		if(WIRE_ZAP)
+			if(mend)
+				mecha.internal_damage &= ~MECHA_INT_SHORT_CIRCUIT
+			else
+				mecha.internal_damage |= MECHA_INT_SHORT_CIRCUIT
+		if(WIRE_LIGHT)
+			mecha.set_light_on(!mend)
+		if(WIRE_OVERCLOCK)
+			if(!mend)
+				mecha.toggle_overclock(FALSE)
+
+/datum/wires/mecha/ui_act(action, params)
+	. = ..()
+	if(.)
+		return
+	var/obj/vehicle/sealed/mecha/mecha = holder
+	if(!issilicon(usr) && mecha.internal_damage & MECHA_INT_SHORT_CIRCUIT && mecha.shock(usr))
+		return FALSE
+
+/datum/wires/mecha/can_reveal_wires(mob/user)
+	if(HAS_TRAIT(user, TRAIT_KNOW_ROBO_WIRES))
+		return TRUE
+	return ..()

code/datums/wires/mod.dm

@@ -55,3 +55,8 @@
 	if(!issilicon(usr) && mod.seconds_electrified && mod.shock(usr))
 		return FALSE
 	return ..()
+
+/datum/wires/mod/can_reveal_wires(mob/user)
+	if(HAS_TRAIT(user, TRAIT_KNOW_ROBO_WIRES))
+		return TRUE
+	return ..()

code/game/machinery/doors/airlock.dm

@@ -1655,7 +1655,7 @@
 	wire["shock"] = !wires.is_cut(WIRE_SHOCK)
 	wire["id_scanner"] = !wires.is_cut(WIRE_IDSCAN)
 	wire["bolts"] = !wires.is_cut(WIRE_BOLTS)
-	wire["lights"] = !wires.is_cut(WIRE_LIGHT)
+	wire["lights"] = !wires.is_cut(WIRE_BOLTLIGHT)
 	wire["safe"] = !wires.is_cut(WIRE_SAFETY)
 	wire["timing"] = !wires.is_cut(WIRE_TIMING)
 

code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm

@@ -208,7 +208,7 @@
 
 /datum/dimension_theme/radioactive
 	icon = 'icons/obj/ore.dmi'
-	icon_state = "Uranium ore"
+	icon_state = "uranium"
 	material = /datum/material/uranium
 	sound = 'sound/items/welder.ogg'
 

code/game/objects/effects/spawners/random/exotic.dm

@@ -87,5 +87,5 @@
 	icon_state = "ripley"
 	loot = list(
 		/obj/structure/mecha_wreckage/ripley = 3,
-		/obj/vehicle/sealed/mecha/working/ripley/mining = 1,
+		/obj/vehicle/sealed/mecha/ripley/mining = 1,
 	)

code/game/objects/items/stacks/bscrystal.dm

@@ -2,7 +2,7 @@
 /obj/item/stack/ore/bluespace_crystal
 	name = "bluespace crystal"
 	desc = "A glowing bluespace crystal, not much is known about how they work. It looks very delicate."
-	icon = 'icons/obj/telescience.dmi'
+	icon = 'icons/obj/ore.dmi'
 	icon_state = "bluespace_crystal"
 	singular_name = "bluespace crystal"
 	dye_color = DYE_COSMIC

code/game/objects/structures/showcase.dm

@@ -64,13 +64,13 @@
 /obj/structure/showcase/mecha/marauder
 	name = "combat mech exhibit"
 	desc = "A stand with an empty old Nanotrasen Corporation combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees."
-	icon = 'icons/mecha/mecha.dmi'
+	icon = 'icons/mob/mecha.dmi'
 	icon_state = "marauder"
 
 /obj/structure/showcase/mecha/ripley
 	name = "construction mech exhibit"
 	desc = "A stand with a retired construction mech bolted to it. The clamps are rated at 9300PSI. It seems to be falling apart."
-	icon = 'icons/mecha/mecha.dmi'
+	icon = 'icons/mob/mecha.dmi'
 	icon_state = "firefighter"
 
 /obj/structure/showcase/machinery/implanter