diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
index 049a901bb0fe..75cc5f8b9864 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
@@ -197,7 +197,6 @@
 	dir = 9
 	},
 /obj/effect/turf_decal/industrial/warning/corner,
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/plating/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "cL" = (
@@ -397,7 +396,6 @@
 	icon_state = "streak4"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "eH" = (
@@ -800,7 +798,6 @@
 	dir = 9
 	},
 /obj/item/ammo_casing/spent,
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "jn" = (
@@ -898,10 +895,6 @@
 /obj/item/ammo_casing/spent,
 /turf/open/floor/pod,
 /area/ruin/wasteplanet/tradepost/center)
-"kM" = (
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/concrete/pavement/wasteplanet,
-/area/overmap_encounter/planetoid/cave/explored)
 "kP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -960,7 +953,6 @@
 "lv" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "lw" = (
@@ -1180,7 +1172,6 @@
 /area/ruin/wasteplanet/tradepost/center)
 "nL" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/marker_beacon/acidproof,
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
@@ -1245,10 +1236,6 @@
 /obj/item/stack/sheet/mineral/sandbags,
 /turf/open/floor/concrete/pavement/wasteplanet/lit,
 /area/overmap_encounter/planetoid/wasteplanet/explored)
-"oL" = (
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/plating/asteroid/wasteplanet,
-/area/overmap_encounter/planetoid/cave/explored)
 "oQ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
@@ -1301,11 +1288,6 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ruin/wasteplanet/tradepost/warehouse)
-"pA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/concrete/pavement/wasteplanet,
-/area/overmap_encounter/planetoid/cave/explored)
 "pL" = (
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/grille,
@@ -1453,10 +1435,6 @@
 	},
 /turf/open/floor/wood/walnut,
 /area/ruin/wasteplanet/tradepost/center)
-"rm" = (
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/concrete/pavement/wasteplanet/lit,
-/area/overmap_encounter/planetoid/wasteplanet/explored)
 "ro" = (
 /obj/structure/extinguisher_cabinet/directional/east,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
@@ -1490,12 +1468,6 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/wasteplanet/tradepost/barracks)
-"rP" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/concrete/pavement/wasteplanet,
-/area/overmap_encounter/planetoid/cave/explored)
 "rQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
@@ -1536,17 +1508,6 @@
 /obj/item/clothing/head/soft/inteq,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
-"so" = (
-/obj/structure/barricade/sandbags,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/plating/wasteplanet,
-/area/overmap_encounter/planetoid/cave/explored)
 "su" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
@@ -1725,11 +1686,7 @@
 "uf" = (
 /obj/effect/turf_decal/industrial/warning/full,
 /obj/structure/closet/crate,
-/obj/item/stack/marker_beacon/acidproof/thirty,
-/obj/item/stack/marker_beacon/acidproof/thirty,
 /obj/machinery/light/small/broken/directional/south,
-/obj/item/stack/marker_beacon/acidproof/thirty,
-/obj/item/stack/marker_beacon/acidproof/thirty,
 /turf/open/floor/pod/dark,
 /area/ruin/wasteplanet/tradepost/warehouse)
 "ug" = (
@@ -1737,7 +1694,6 @@
 /obj/effect/turf_decal/industrial/warning/cee{
 	dir = 4
 	},
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/plating/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "um" = (
@@ -1885,7 +1841,6 @@
 "vQ" = (
 /obj/effect/decal/cleanable/molten_object/large,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "vR" = (
@@ -2340,7 +2295,6 @@
 /obj/effect/decal/cleanable/blood/old{
 	icon_state = "drip5"
 	},
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "AQ" = (
@@ -2634,10 +2588,6 @@
 /obj/effect/decal/cleanable/oil/streak,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
-"Eg" = (
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/plating/wasteplanet/rust,
-/area/overmap_encounter/planetoid/cave/explored)
 "Ei" = (
 /obj/structure/cable{
 	icon_state = "0-5"
@@ -2727,7 +2677,6 @@
 "Fn" = (
 /obj/structure/barricade/sandbags,
 /obj/effect/turf_decal/industrial/warning/cee,
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/plating/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "Ft" = (
@@ -3388,11 +3337,6 @@
 /obj/structure/table,
 /turf/open/floor/pod/light,
 /area/ruin/wasteplanet/tradepost/center)
-"Mj" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/concrete/pavement/wasteplanet/lit,
-/area/overmap_encounter/planetoid/wasteplanet/explored)
 "Ml" = (
 /turf/open/floor/plating/wasteplanet/rust/lit,
 /area/overmap_encounter/planetoid/wasteplanet/explored)
@@ -3838,7 +3782,6 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "Rk" = (
@@ -4064,20 +4007,6 @@
 	},
 /turf/open/floor/wood/walnut,
 /area/ruin/wasteplanet/tradepost/center)
-"Tf" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/concrete/pavement/wasteplanet,
-/area/overmap_encounter/planetoid/cave/explored)
 "Tg" = (
 /obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/closed/wall,
@@ -4151,7 +4080,6 @@
 /turf/open/floor/plating/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "TC" = (
-/obj/structure/marker_beacon/acidproof,
 /obj/structure/cable{
 	icon_state = "1-10"
 	},
@@ -4267,11 +4195,6 @@
 /obj/item/soap,
 /turf/open/floor/pod/light,
 /area/ruin/wasteplanet/tradepost/center)
-"Vm" = (
-/obj/effect/gibspawner/robot,
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/concrete/pavement/wasteplanet,
-/area/overmap_encounter/planetoid/cave/explored)
 "Vw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -4305,11 +4228,6 @@
 	},
 /turf/open/floor/wood/walnut,
 /area/ruin/wasteplanet/tradepost/center)
-"VU" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/marker_beacon/acidproof,
-/turf/open/floor/plating/wasteplanet/rust,
-/area/overmap_encounter/planetoid/cave/explored)
 "VY" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/stack/ore/salvage/scrapgold,
@@ -4367,7 +4285,6 @@
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "WF" = (
-/obj/structure/marker_beacon/acidproof,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
 	},
@@ -4511,7 +4428,6 @@
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 4
 	},
-/obj/structure/marker_beacon/acidproof,
 /turf/open/floor/plating/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "Xz" = (
@@ -5019,7 +4935,7 @@ Ma
 HV
 JG
 Fc
-Mj
+iq
 HV
 em
 em
@@ -5230,7 +5146,7 @@ BN
 sH
 HV
 iq
-rm
+Wg
 AT
 HV
 Fc
@@ -5276,7 +5192,7 @@ en
 en
 en
 en
-so
+TB
 TB
 Xw
 QB
@@ -5387,7 +5303,7 @@ FV
 ug
 QB
 Yt
-rP
+AV
 AV
 cJ
 cL
@@ -5491,7 +5407,7 @@ QB
 FP
 HH
 AV
-rP
+AV
 AV
 QZ
 QB
@@ -5858,7 +5774,7 @@ hO
 Ps
 QB
 uC
-Tf
+pk
 GQ
 hg
 xA
@@ -5922,14 +5838,14 @@ QB
 sL
 QB
 QB
-VU
+UQ
 PZ
 Hc
 Hc
 UQ
 Hc
 sL
-VU
+UQ
 QB
 QB
 QB
@@ -6068,7 +5984,7 @@ dS
 gA
 Yt
 Yt
-Tf
+pk
 sL
 Yt
 QB
@@ -6118,7 +6034,7 @@ MS
 MS
 MS
 Ie
-Vm
+km
 Yt
 GQ
 do
@@ -6181,13 +6097,13 @@ QZ
 QZ
 dB
 lq
-rP
+AV
 AV
 wA
 eF
 LO
 sv
-kM
+Yt
 PZ
 sL
 sL
@@ -6487,7 +6403,7 @@ Wy
 Wy
 Hv
 Ki
-pA
+QZ
 hV
 Yt
 Yt
@@ -6505,14 +6421,14 @@ bW
 tp
 zD
 QB
-VU
+UQ
 sL
 UQ
 SE
 Hc
 UQ
 sL
-Eg
+sL
 QB
 QB
 kd
@@ -6806,7 +6722,7 @@ QB
 Nh
 QB
 Bk
-kM
+Yt
 vz
 ua
 ua
@@ -6921,7 +6837,7 @@ WG
 Yt
 Yt
 qi
-kM
+Yt
 QB
 QB
 QB
@@ -7035,7 +6951,7 @@ QB
 QB
 QB
 sL
-oL
+QB
 QB
 jy
 Nl
@@ -7192,7 +7108,7 @@ QB
 QB
 QB
 QB
-oL
+QB
 QB
 Nl
 en
@@ -7296,7 +7212,7 @@ QB
 QB
 QB
 QB
-Eg
+sL
 QB
 QB
 QB
@@ -7345,7 +7261,7 @@ cZ
 vu
 qb
 QB
-oL
+QB
 FP
 PZ
 sL
diff --git a/code/datums/ruins/wasteplanet.dm b/code/datums/ruins/wasteplanet.dm
index 3d51594a40c2..137a08ae9ca4 100644
--- a/code/datums/ruins/wasteplanet.dm
+++ b/code/datums/ruins/wasteplanet.dm
@@ -27,3 +27,9 @@
 	description = "A military base formerly used for staging 4 exosuits and crew. God knows what's in it now."
 	id = "abandoned_mechbay"
 	suffix = "wasteplanet_abandoned_mechbay.dmm"
+
+/datum/map_template/ruin/wasteplanet/tradepost
+	name = "Ruined Tradepost"
+	description = "Formerly a functioning, if not thriving tradepost. Now a graveyard of Inteq soldiers and hivebots."
+	id = "wasteplanet_tradepost"
+	suffix = "wasteplanet_tradepost.dmm"
diff --git a/code/game/area/areas/ruins/wasteplanet.dm b/code/game/area/areas/ruins/wasteplanet.dm
index e80cb364c3ea..1c9d272b5839 100644
--- a/code/game/area/areas/ruins/wasteplanet.dm
+++ b/code/game/area/areas/ruins/wasteplanet.dm
@@ -43,3 +43,17 @@
 /area/ruin/wasteplanet/wasteplanet_radiation/containment
 	name = "Abandoned Waste Containment Vault"
 	icon_state = "disposal"
+
+//Wasteplanet_Tradepost
+
+/area/ruin/wasteplanet/tradepost/barracks
+	name = "Abandoned Barracks"
+	icon_state = "red"
+
+/area/ruin/wasteplanet/tradepost/center
+	name = "Abandoned Dome"
+	icon_state = "bridge"
+
+/area/ruin/wasteplanet/tradepost/warehouse
+	name = "Abandoned Warehouse"
+	icon_state = "dk_yellow"
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 1b8004cbd5b5..9d34784d01be 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -251,3 +251,33 @@
 	id_job = "SolGov Sonnensoldner"
 	outfit = /datum/outfit/job/solgov/sonnensoldner
 	id_access_list = list(ACCESS_SOLGOV)
+
+//inteq
+
+/obj/effect/mob_spawn/human/corpse/inteq
+	name = "Avery Inteq"
+
+/obj/effect/mob_spawn/human/corpse/inteq/recruit
+	name = "IRMG Recruit"
+	id_job = "Recruit"
+	outfit = /datum/outfit/job/inteq/assistant
+
+/obj/effect/mob_spawn/human/corpse/inteq/medic
+	name = "IRMG Corpsman"
+	id_job = "Corpsman"
+	outfit = /datum/outfit/job/inteq/paramedic
+
+/obj/effect/mob_spawn/human/corpse/inteq/enforcer
+	name = "IRMG Enforcer"
+	id_job = "Enforcer"
+	outfit = /datum/outfit/job/inteq/security
+
+/obj/effect/mob_spawn/human/corpse/inteq/vanguard
+	name = "IRMG Vanguard"
+	id_job = "Vanguard"
+	outfit = /datum/outfit/job/inteq/captain
+
+/obj/effect/mob_spawn/human/corpse/inteq/artificer
+	name = "IRMG Artificer"
+	id_job = "Artificer"
+	outfit = /datum/outfit/job/inteq/engineer