diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
index 67a4ed46cdf..f599a09379c 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
@@ -9,7 +9,9 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
-/obj/mecha/working/ripley/mining,
+/obj/mecha/working/ripley/mining{
+ ruin_mecha = 1
+ },
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"e" = (
diff --git a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm
index 6e35de07be8..5bc1da71749 100644
--- a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm
+++ b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm
@@ -101,7 +101,9 @@
/turf/open/floor/mineral/titanium/yellow/airless,
/area/ruin/space/has_grav/powered/mechtransport)
"A" = (
-/obj/mecha/working/ripley,
+/obj/mecha/working/ripley{
+ ruin_mecha = 1
+ },
/turf/open/floor/mineral/titanium/yellow/airless,
/area/ruin/space/has_grav/powered/mechtransport)
"B" = (
diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm
index 2a16c881abb..8535e9345b8 100644
--- a/_maps/RandomZLevels/VR/snowdin_VR.dmm
+++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm
@@ -14459,7 +14459,8 @@
/area/awaymission/snowdin/post/mining_main/mechbay)
"In" = (
/obj/mecha/working/ripley/mining{
- dir = 1
+ dir = 1;
+ ruin_mecha = 1
},
/obj/effect/turf_decal/bot,
/turf/open/floor/mech_bay_recharge_floor,
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 6e3f2633753..0c4a5db3557 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -2127,7 +2127,9 @@
},
/area/awaymission/caves/BMP_asteroid)
"gC" = (
-/obj/mecha/working/ripley/mining,
+/obj/mecha/working/ripley/mining{
+ ruin_mecha = 1
+ },
/turf/open/floor/plasteel/recharge_floor,
/area/awaymission/caves/BMP_asteroid)
"gD" = (
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index b381fb37592..1b2d4fa4ea5 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -14564,7 +14564,8 @@
/area/awaymission/snowdin/post/mining_main/mechbay)
"In" = (
/obj/mecha/working/ripley/mining{
- dir = 1
+ dir = 1;
+ ruin_mecha = 1
},
/obj/effect/turf_decal/bot,
/turf/open/floor/mech_bay_recharge_floor,
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index d8c2fead4c8..93affc2dcb9 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -844,7 +844,9 @@
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"dL" = (
-/obj/mecha/working/ripley/firefighter,
+/obj/mecha/working/ripley/firefighter{
+ ruin_mecha = 1
+ },
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"dM" = (
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index f24cde53f36..3697bfc99b8 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -24,6 +24,7 @@
infra_luminosity = 15 //byond implementation is bugged.
force = 5
flags_1 = HEAR_1
+ var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming.
var/can_move = 0 //time of next allowed movement
var/mob/living/carbon/occupant = null
var/step_in = 10 //make a step in step_in/10 sec.
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index e3d999c59be..46fee923315 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -6,28 +6,21 @@
req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/circuitboard/computer/mecha_control
var/list/located = list()
- var/screen = 0
- var/stored_data
/obj/machinery/computer/mecha/ui_interact(mob/user)
. = ..()
- var/dat = "[src.name]"
- if(screen == 0)
- dat += "Tracking beacons data
"
- var/list/trackerlist = list()
- for(var/obj/mecha/MC in GLOB.mechas_list)
- trackerlist += MC.trackers
- for(var/obj/item/mecha_parts/mecha_tracking/TR in trackerlist)
- var/answer = TR.get_mecha_info()
- if(answer)
- dat += {"
[answer]
- Send message
-
- if(screen==1)
- dat += {"Log contents
"
- Return
"
- [stored_data]"}
+ var/dat = {"[src.name]
+ Tracking beacons data
"}
+ var/list/trackerlist = list()
+ for(var/obj/mecha/MC in GLOB.mechas_list)
+ trackerlist += MC.trackers
+ for(var/obj/item/mecha_parts/mecha_tracking/TR in trackerlist)
+ var/answer = TR.get_mecha_info()
+ if(answer)
+ dat += {"
[answer]
+ Send Message | (EMP Pulse)
"}
+ dat += "
"
dat += "(Refresh)
"
dat += ""
@@ -48,8 +41,7 @@
if(href_list["shock"])
var/obj/item/mecha_parts/mecha_tracking/MT = afilter.getObj("shock")
MT.shock()
- if(href_list["return"])
- screen = 0
+
updateUsrDialog()
return
@@ -66,16 +58,16 @@
return 0
var/obj/mecha/M = src.loc
var/cell_charge = M.get_charge()
- var/answer = {"Name: [M.name]
-Integrity: [M.obj_integrity/M.max_integrity*100]%
-Cell charge: [isnull(cell_charge)?"Not found":"[M.cell.percent()]%"]
-Airtank: [M.return_pressure()]kPa
-Pilot: [M.occupant||"None"]
-Location: [get_area(M)||"Unknown"]
-Active equipment: [M.selected||"None"] "}
+ var/answer = {"Name: [M.name]
+Integrity: [round((M.obj_integrity/M.max_integrity*100), 0.01)]%
+Cell Charge: [isnull(cell_charge)?"Not Found":"[M.cell.percent()]%"]
+Airtank: [round(M.return_pressure(), 0.01)] kPa
+Pilot: [M.occupant||"None"]
+Location: [get_area(M)||"Unknown"]
+Active Equipment: [M.selected||"None"]"}
if(istype(M, /obj/mecha/working/ripley))
var/obj/mecha/working/ripley/RM = M
- answer += "Used cargo space: [RM.cargo.len/RM.cargo_capacity*100]%
"
+ answer += "
Used Cargo Space: [round((RM.cargo.len/RM.cargo_capacity*100), 0.01)]%"
return answer
diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm
index 1bdae48389c..ec61a2efaa5 100644
--- a/code/game/mecha/working/working.dm
+++ b/code/game/mecha/working/working.dm
@@ -3,4 +3,5 @@
/obj/mecha/working/Initialize()
. = ..()
- trackers += new /obj/item/mecha_parts/mecha_tracking(src)
+ if(!ruin_mecha)
+ trackers += new /obj/item/mecha_parts/mecha_tracking(src)