diff --git a/code/datums/outfits/ert/coalition.dm b/code/datums/outfits/ert/coalition.dm
index fc0a75d4b3e..99d27feb4bb 100644
--- a/code/datums/outfits/ert/coalition.dm
+++ b/code/datums/outfits/ert/coalition.dm
@@ -104,7 +104,7 @@
 	mask = /obj/item/clothing/mask/gas/tactical
 	suit_store = /obj/item/gun/projectile/automatic/rifle/konyang/k556
 	accessory = /obj/item/clothing/accessory/holster/hip
-	accessory_contents = list(/obj/item/gun/projectile/pistol/sol = 1)
+	accessory_contents = list(/obj/item/gun/projectile/pistol/sol/konyang = 1)
 	belt = /obj/item/storage/belt/military
 	id = /obj/item/card/id/ert
 
@@ -166,7 +166,7 @@
 	)
 	backpack_contents = list(
 		/obj/item/ammo_magazine/mc9mm = 3,
-		/obj/item/gun/projectile/pistol/sol = 1,
+		/obj/item/gun/projectile/pistol/sol/konyang = 1,
 		/obj/item/handcuffs/ziptie = 1,
 		/obj/item/clothing/glasses/welding/superior = 1,
 		/obj/item/grenade/frag = 2
diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm
index 9c0d50c8fc4..4632831cf47 100644
--- a/code/modules/clothing/suits/modular_armor.dm
+++ b/code/modules/clothing/suits/modular_armor.dm
@@ -268,6 +268,24 @@
 	item_state = "tcaf_plate_light"
 	slowdown = 0
 
+/obj/item/clothing/accessory/armor_plate/military/navy
+	name = "konyang navy armor plate"
+	desc = "A military-grade armor plate frequently seen in use by naval landing parties and sailors of the Konyang Navy."
+	icon_state = "plate_navy"
+	item_state = "plate_navy"
+
+/obj/item/clothing/accessory/armor_plate/press
+	name = "press armor plate"
+	desc = "A light-weight kevlar armor plate in blue colors and a \"PRESS\" sticker included. Used by wartime correspondents."
+	icon_state = "plate_press"
+	item_state = "plate_press"
+
+/obj/item/clothing/accessory/armor_plate/military/navy
+	name = "konyang navy armor plate"
+	desc = "A military-grade armor plate frequently seen in use by naval landing parties and sailors of the Konyang Navy."
+	icon_state = "plate_navy"
+	item_state = "plate_navy"
+
 /obj/item/clothing/accessory/storage/chestpouch
 	name = "chestpouch rig"
 	desc = "A harness made to be worn over a set of armor. Comes with three pouches on the front, and a hidden pouch on the back for your snacks!"
@@ -338,6 +356,12 @@
 	icon_state = "helm_generic"
 	item_state = "helm_generic"
 
+/obj/item/clothing/head/helmet/security/press
+	name = "press helmet"
+	desc = "A helmet in blue colors with a prominent \"PRESS\" emblazoned in front. A common sight on journalists in the Wildlands."
+	icon_state = "helm_press"
+	item_state = "helm_press"
+
 /obj/item/clothing/head/helmet/security/skrell
 	name = "skrellmet"
 	desc = "A helmet built for use by a Skrell. This one appears to be fairly standard and reliable."
diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm
index 9a98a1105b3..85706343ae0 100644
--- a/code/modules/clothing/under/accessories/armor.dm
+++ b/code/modules/clothing/under/accessories/armor.dm
@@ -128,6 +128,18 @@
 		bomb = ARMOR_BOMB_PADDED,
 	)
 
+/obj/item/clothing/accessory/leg_guard/konyang_navy
+	name = "\improper Konyang navy leg guards"
+	icon_state = "legguards_navy"
+	item_state = "legguards_navy"
+	armor = list(
+		melee = ARMOR_MELEE_MAJOR,
+		bullet = ARMOR_BALLISTIC_MAJOR,
+		laser = ARMOR_LASER_MEDIUM,
+		energy = ARMOR_ENERGY_SMALL,
+		bomb = ARMOR_BOMB_PADDED,
+	)
+
 //Arm guards.
 /obj/item/clothing/accessory/arm_guard
 	name = "corporate arm guards"
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index 45be00064af..d9a38616d89 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -312,6 +312,9 @@
 	caliber = "rocket"
 	max_stack = 1
 
+/obj/item/ammo_casing/rocket/konyang
+	icon_state = "kgm_rocket"
+
 /obj/item/ammo_casing/chameleon
 	name = "chameleon bullets"
 	desc = "A set of bullets for the Chameleon Gun."
diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm
index 4994ca3a05a..3843943808d 100644
--- a/code/modules/projectiles/guns/launcher/rocket.dm
+++ b/code/modules/projectiles/guns/launcher/rocket.dm
@@ -47,3 +47,11 @@
 	message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([src.name]) at [target].")
 	log_game("[key_name(user)] used a rocket launcher ([src.name]) at [target].",ckey=key_name(src))
 	..()
+
+/obj/item/gun/launcher/rocket/konyang
+	name = "konyang rocket launcher"
+	desc = "An unguided rocket launcher often used by the armed forces of Konyang."
+	desc_extended = "The KGM-701 is a heavy anti-tank guided missile in use by the Konyang Army, another carryover from their old Solarian stockpiles. Capable of handling any tank that wouldn't get bogged down on Konyang's soft terrain, the KGM-701 is expected to soldier on for many years to come. This however, is not a KGM-701, but the KGM-701D, the unguided discount variation of the old Solarian ATGM, typically issued to colonial garrisons and not rated against any modern vehicles."
+	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon_state = "kgm"
+	item_state = "kgm"
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 4aaed7b5c3c..0b9acdc2ac2 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -645,6 +645,31 @@
 	..()
 	icon_state = (ammo_magazine) ? "assassin_smg" : "assassin_smg-empty"
 
+/obj/item/gun/projectile/automatic/tommygun/konyang
+	name = "konyang police submachine gun"
+	desc = "A compact submachine gun made specifically for the Konyang National Police. Takes .45 ammo."
+	desc_extended = "Produced by one of Einstein Engines' local subsidiaries on Konyang, the K45 \"Pogpung\" submachine gun is Taepung Arms' entry into the submachine gun market. \
+	The National Police purchased a large number of K45s for their patrol units due to reports that service revolvers were inadequate at stopping rampant IPCs. The K45-P variant \
+	specially designed for the police forces is chambered in the organization's preferred .45 caliber and is limited to 3-round bursts due to the relatively limited firearms training of \
+	National Police officers."
+	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon_state = "k45carbine"
+	item_state = "k45carbine"
+	w_class = ITEMSIZE_NORMAL
+	max_shells = 30
+	load_method = MAGAZINE
+	ammo_type = /obj/item/ammo_casing/c45
+	allowed_magazines = list(/obj/item/ammo_magazine/c45m, /obj/item/ammo_magazine/submachinemag)
+
+	firemodes = list(
+		list(mode_name="semiauto",       can_autofire=0, burst=1, fire_delay=ROF_SMG),
+		list(mode_name="3-round bursts", can_autofire=0, burst=3, burst_accuracy=list(1,0,0), dispersion=list(0, 10, 15))
+	)
+
+/obj/item/gun/projectile/automatic/tommygun/konyang/update_icon()
+	..()
+	icon_state = (ammo_magazine)? "k45carbine" : "k45carbine-e"
+
 /obj/item/gun/projectile/automatic/rifle/dnac
 	name = "dNAC-6.5 assault rifle"
 	desc = "A durable, sleek-looking bullpup rifle manufactured by d.N.A Defense & Aerospace for the All-Xanu Armed Forces. This model has been adopted by a majority of the Coalition's military forces as well due to its simplicity and reliability."
@@ -740,7 +765,7 @@
 /obj/item/gun/projectile/automatic/rifle/konyang/k556
 	name = "konyang assault rifle"
 	desc = "The K556 is the standard assault rifle of the Konyang Armed Forces. Sturdy and reliable."
-	desc_extended = "The Zavodskoi-made K556 assault rifle is a new design in use by elements of the Konyang Armed Forces. Light and accurate, it is a weapon of choice for its aerospace branch and special forces."
+	desc_extended = "The K556 assault rifle is a new design in use by elements of the Konyang Armed Forces, designed in-house by the military in partnership with Einstein Engines'local subsidiaries. It has yet to see widespread service as the government is reluctant to spend money on new small arms when they already possess large stockpiles from the colonial period. This has not stopped the Aerospace Forces from making the transition to the new weapon however, as its compact design, light weight, and accuracy make it ideal for use aboard a spacecraft."
 	icon = 'icons/obj/guns/konyang_weapons.dmi'
 	icon_state = "k556rifle"
 	item_state = "k556rifle"
@@ -760,8 +785,7 @@
 /obj/item/gun/projectile/automatic/rifle/konyang/konyang47
 	name = "konyang assault carbine"
 	desc = "The Dering-K1 is the carbine version of the K556. Intended to be used by vehicle crews, second line infantry, support crew and staff or when you have limited space to work with."
-	desc_extended = "The Dering K1 battle rifle is a Zavodskoi-produced variant of its standard Solarian counterpart, suited for the needs of the Konyang Armed Forces. \
-	Its more robust design is tailored for naval and swamp warfare, while still maintaining the firepower needed for frontline combat operations."
+	desc_extended = "The Dering K1 battle rifle is a standard Solarian M469 given a service extension package by Zavodskoi Interstellar. Many of the rifles bear Konyanger proof marks right next to old Solarian ones, indicating their heritage. Its more robust design is tailored for naval and swamp warfare, while still maintaining the firepower needed for frontline combat operations."
 	icon = 'icons/obj/guns/konyang_weapons.dmi'
 	icon_state = "k47"
 	item_state = "k47"
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index f28d5ff5b0e..53fa065be5d 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -417,6 +417,21 @@
 	else
 		icon_state = "m8-empty"
 
+/obj/item/gun/projectile/pistol/sol/konyang
+	name = "konyang service pistol"
+	desc = "The compact M8, redesignated as the K8, is the standard service pistol of the Konyanger Armed Forces. Inherited from the Solarian military, Zavodskoi has since given these handguns \
+	a service extension package, including laser sights and replacement of worn-out parts."
+	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon_state = "k8"
+	item_state = "k8"
+
+/obj/item/gun/projectile/pistol/sol/konyang/update_icon()
+	..()
+	if(ammo_magazine)
+		icon_state = "k8"
+	else
+		icon_state = "k8-empty"
+
 /obj/item/gun/projectile/pistol/adhomai
 	name = "adhomian service pistol"
 	desc = "The Adar'Mazy pistol is an Adhomian firearm commonly issued to People's Republic officers, government officials and low-ranking Party members."
diff --git a/html/changelogs/RustingWithYou - konyangguns.yml b/html/changelogs/RustingWithYou - konyangguns.yml
new file mode 100644
index 00000000000..fe534a4d440
--- /dev/null
+++ b/html/changelogs/RustingWithYou - konyangguns.yml	
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds the Konyang guns and armor used in the Silicon Nightmares events."
diff --git a/icons/clothing/kit/modular_armor.dmi b/icons/clothing/kit/modular_armor.dmi
index a8650c06e63..0c15be3b52e 100644
Binary files a/icons/clothing/kit/modular_armor.dmi and b/icons/clothing/kit/modular_armor.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 751ba3cb99f..fc1e4cdd636 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/guns/konyang_weapons.dmi b/icons/obj/guns/konyang_weapons.dmi
index 11c61603233..2ae4579e23c 100644
Binary files a/icons/obj/guns/konyang_weapons.dmi and b/icons/obj/guns/konyang_weapons.dmi differ
diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm
index 40b6cefab3c..c81a653ecfe 100644
--- a/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm
+++ b/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm
@@ -2686,13 +2686,13 @@
 	dir = 8;
 	icon_state = "tube_empty"
 	},
-/obj/item/gun/projectile/pistol/sol,
 /obj/item/clothing/under/rank/konyang,
 /obj/item/clothing/under/rank/konyang,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
+/obj/item/gun/projectile/pistol/sol/konyang,
 /turf/simulated/floor/wood,
 /area/point_verdant/interior/offices/kaf)
 "ib" = (
@@ -2789,15 +2789,6 @@
 	},
 /turf/simulated/floor/lino,
 /area/point_verdant/interior/decrepit)
-"is" = (
-/obj/item/clothing/suit/space/void/sol/konyang,
-/obj/item/clothing/head/helmet/space/void/sol/konyang,
-/obj/structure/table/rack,
-/obj/item/tank/air,
-/obj/random/dirt_75,
-/obj/item/clothing/shoes/magboots,
-/turf/simulated/floor/tiled,
-/area/point_verdant/interior/offices/kaf)
 "it" = (
 /obj/structure/ledge/quarter{
 	dir = 1
@@ -4140,11 +4131,7 @@
 /turf/simulated/floor/tiled/white,
 /area/point_verdant/interior/police)
 "mm" = (
-/obj/item/clothing/suit/space/void/sol/konyang,
-/obj/item/clothing/head/helmet/space/void/sol/konyang,
-/obj/structure/table/rack,
-/obj/item/tank/air,
-/obj/item/clothing/shoes/magboots,
+/obj/machinery/suit_cycler/offship/konyang,
 /turf/simulated/floor/tiled,
 /area/point_verdant/interior/offices/kaf)
 "mn" = (
@@ -6643,6 +6630,12 @@
 /obj/item/ammo_magazine/c45/revolver,
 /obj/item/ammo_magazine/c45/revolver,
 /obj/item/ammo_magazine/c45/revolver,
+/obj/item/ammo_magazine/c45/revolver,
+/obj/item/ammo_magazine/c45/revolver,
+/obj/item/ammo_magazine/c45/revolver,
+/obj/item/ammo_magazine/c45/revolver,
+/obj/item/gun/projectile/revolver/konyang/police,
+/obj/item/gun/projectile/revolver/konyang/police,
 /turf/simulated/floor/tiled/dark,
 /area/point_verdant/interior/police)
 "tV" = (
@@ -8782,10 +8775,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled,
 /area/point_verdant/interior/offices/basement)
-"AF" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/simulated/floor/tiled,
-/area/point_verdant/interior/offices/kaf)
 "AG" = (
 /obj/structure/ledge{
 	dir = 1
@@ -9416,15 +9405,15 @@
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(218)
 	},
-/obj/item/gun/projectile/pistol/sol,
-/obj/item/gun/projectile/pistol/sol,
-/obj/item/gun/projectile/pistol/sol,
-/obj/item/gun/projectile/pistol/sol,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
+/obj/item/gun/projectile/pistol/sol/konyang,
+/obj/item/gun/projectile/pistol/sol/konyang,
+/obj/item/gun/projectile/pistol/sol/konyang,
+/obj/item/gun/projectile/pistol/sol/konyang,
 /turf/simulated/floor/sidewalk/dark,
 /area/point_verdant/interior/offices/kaf)
 "CJ" = (
@@ -10543,12 +10532,21 @@
 /turf/simulated/floor/asphalt,
 /area/point_verdant/interior/police)
 "FU" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/light{
-	dir = 4
+/obj/structure/closet/secure_closet/guncabinet{
+	req_access = list(218)
 	},
-/turf/simulated/floor/tiled,
-/area/point_verdant/interior/offices/kaf)
+/obj/random/dirt_75,
+/obj/item/gun/projectile/automatic/tommygun/konyang,
+/obj/item/gun/projectile/automatic/tommygun/konyang,
+/obj/item/gun/projectile/automatic/tommygun/konyang,
+/obj/item/ammo_magazine/submachinemag,
+/obj/item/ammo_magazine/submachinemag,
+/obj/item/ammo_magazine/submachinemag,
+/obj/item/ammo_magazine/submachinemag,
+/obj/item/ammo_magazine/submachinemag,
+/obj/item/ammo_magazine/submachinemag,
+/turf/simulated/floor/tiled/dark,
+/area/point_verdant/interior/police)
 "FV" = (
 /obj/structure/closet/crate/bin/urban/compact{
 	pixel_y = 24
@@ -15393,7 +15391,6 @@
 /obj/item/clothing/under/rank/konyang/officer,
 /obj/item/clothing/under/rank/konyang/officer,
 /obj/item/melee/telebaton,
-/obj/item/gun/projectile/pistol/sol,
 /obj/item/clothing/glasses/sunglasses/aviator,
 /obj/item/clothing/suit/armor/carrier/military,
 /obj/machinery/light{
@@ -15402,6 +15399,7 @@
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/storage/backpack/satchel/leather,
+/obj/item/gun/projectile/pistol/sol/konyang,
 /turf/simulated/floor/carpet/green,
 /area/point_verdant/interior/offices/kaf)
 "Tp" = (
@@ -16806,13 +16804,13 @@
 /area/point_verdant/interior/tunnels)
 "Xn" = (
 /obj/structure/undies_wardrobe,
-/obj/item/gun/projectile/pistol/sol,
 /obj/item/clothing/under/rank/konyang,
 /obj/item/clothing/under/rank/konyang,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
+/obj/item/gun/projectile/pistol/sol/konyang,
 /turf/simulated/floor/wood,
 /area/point_verdant/interior/offices/kaf)
 "Xo" = (
@@ -21164,7 +21162,7 @@ Xi
 mm
 mm
 mm
-AF
+dl
 ho
 vt
 Zm
@@ -21933,9 +21931,9 @@ ho
 ho
 sR
 mm
-is
-is
-FU
+mm
+mm
+ts
 ho
 PD
 PD
@@ -27096,7 +27094,7 @@ rf
 rf
 rf
 Ir
-tS
+FU
 ch
 EQ
 eV
diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
index 632683c9d00..f9d622ed33d 100644
--- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
+++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
@@ -7157,12 +7157,6 @@
 	pixel_x = 4;
 	pixel_y = -24
 	},
-/obj/item/gun/projectile/pistol/sol,
-/obj/item/gun/projectile/pistol/sol,
-/obj/item/gun/projectile/pistol/sol,
-/obj/item/gun/projectile/pistol/sol,
-/obj/item/gun/projectile/pistol/sol,
-/obj/item/gun/projectile/pistol/sol,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
@@ -7175,6 +7169,12 @@
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
+/obj/item/gun/projectile/pistol/sol/konyang,
+/obj/item/gun/projectile/pistol/sol/konyang,
+/obj/item/gun/projectile/pistol/sol/konyang,
+/obj/item/gun/projectile/pistol/sol/konyang,
+/obj/item/gun/projectile/pistol/sol/konyang,
+/obj/item/gun/projectile/pistol/sol/konyang,
 /turf/simulated/floor/tiled/dark/full,
 /area/ship/kasf_corvette/armory)
 "OS" = (
diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm
index 1aa60b31916..7df73f32cfc 100644
--- a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm
+++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm
@@ -14,7 +14,7 @@
 	corpseshoes = /obj/item/clothing/shoes/jackboots
 	corpsehelmet = /obj/item/clothing/head/helmet/konyang
 	corpsesuit = /obj/item/clothing/suit/armor/carrier/military
-	corpsebelt = /obj/item/gun/projectile/pistol/sol
+	corpsebelt = /obj/item/gun/projectile/pistol/sol/konyang
 	corpseback = /obj/item/storage/backpack/rucksack/green
 	corpseid = FALSE
 	corpsepocket1 = /obj/item/storage/wallet/random
diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm
index a86263a8d38..91da5ad04fd 100644
--- a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm
+++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm
@@ -25,20 +25,20 @@
 	dir = 4
 	},
 /obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "aT" = (
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "bn" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /obj/machinery/mech_recharger,
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "br" = (
 /obj/effect/decal/fake_object{
@@ -53,14 +53,14 @@
 /area/konyang_telecomms_outpost)
 "by" = (
 /obj/structure/flora/pottedplant/orchid,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "bM" = (
 /turf/simulated/floor/exoplanet/konyang,
 /area/konyang_telecomms_outpost)
 "cB" = (
 /obj/machinery/door/urban,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "dd" = (
 /obj/item/ammo_casing/a556/spent,
@@ -77,7 +77,7 @@
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 8
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "dB" = (
 /obj/structure/table/wood,
@@ -86,16 +86,18 @@
 	pixel_x = -2;
 	pixel_y = 6
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "dN" = (
 /obj/item/modular_computer/console/preset/civilian{
 	dir = 8
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "eE" = (
-/obj/structure/sign/flag/konyang/large/south,
+/obj/structure/sign/flag/konyang/large/south{
+	pixel_y = -32
+	},
 /turf/simulated/floor/exoplanet/dirt_konyang,
 /area/konyang_telecomms_outpost)
 "fh" = (
@@ -111,7 +113,7 @@
 /area/konyang_telecomms_outpost)
 "fN" = (
 /obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "fW" = (
 /turf/simulated/wall/wood,
@@ -120,7 +122,7 @@
 /obj/machinery/light{
 	icon_state = "tube_empty"
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "hi" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -130,7 +132,7 @@
 /area/konyang_telecomms_outpost)
 "hA" = (
 /obj/random/dirt_75,
-/turf/simulated/floor/exoplanet/tiled/white,
+/turf/simulated/floor/tiled/white,
 /area/konyang_telecomms_outpost)
 "hH" = (
 /obj/structure/girder,
@@ -154,10 +156,10 @@
 "iQ" = (
 /obj/structure/curtain/open/shower,
 /obj/machinery/shower,
-/turf/simulated/floor/exoplanet/tiled/white,
+/turf/simulated/floor/tiled/white,
 /area/konyang_telecomms_outpost)
 "iT" = (
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "ja" = (
 /obj/structure/table/wood,
@@ -170,7 +172,7 @@
 	name = "expensive flatscreen holovision";
 	pixel_y = 15
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "jH" = (
 /turf/simulated/floor/bluegrid/cooled,
@@ -191,7 +193,7 @@
 /obj/structure/automobile{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "kc" = (
 /obj/structure/sign/securearea{
@@ -205,7 +207,7 @@
 	},
 /obj/machinery/mech_recharger,
 /mob/living/heavy_vehicle/premade/firefighter,
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "ks" = (
 /obj/item/stack/rods,
@@ -218,14 +220,14 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "kT" = (
 /obj/machinery/door/airlock/highsecurity,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "lp" = (
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "lF" = (
 /obj/structure/table/steel,
@@ -236,19 +238,19 @@
 /obj/item/ammo_casing/a556/spent,
 /obj/item/ammo_casing/a556/spent,
 /obj/item/ammo_casing/a556/spent,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "lL" = (
 /obj/structure/flora/rock/konyang/water,
 /turf/simulated/floor/exoplanet/water/shallow/konyang,
 /area/konyang_telecomms_outpost)
 "mh" = (
-/turf/simulated/floor/exoplanet/tiled/white,
+/turf/simulated/floor/tiled/white,
 /area/konyang_telecomms_outpost)
 "mx" = (
 /obj/structure/table/wood,
 /obj/item/toy/comic/inspector,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "mT" = (
 /obj/structure/table/steel,
@@ -258,7 +260,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "ni" = (
 /obj/structure/flora/bush/konyang_reeds,
@@ -276,7 +278,7 @@
 	pixel_x = -8;
 	pixel_y = -4
 	},
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "nt" = (
 /obj/effect/decal/fake_object{
@@ -293,7 +295,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "ok" = (
 /turf/simulated/floor/exoplanet/water/shallow/konyang,
@@ -301,7 +303,7 @@
 "on" = (
 /obj/effect/decal/road_marking/thin,
 /obj/machinery/mech_recharger/automobile,
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "oG" = (
 /obj/structure/bed/stool/chair/office/dark{
@@ -310,7 +312,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "oJ" = (
 /obj/structure/flora/bush/konyang_reeds,
@@ -324,13 +326,13 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "pG" = (
 /obj/structure/bed/stool/chair/sofa/right/brown{
 	dir = 8
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "pT" = (
 /obj/item/ammo_casing/a556/spent,
@@ -349,7 +351,7 @@
 /obj/machinery/computer/ship/sensors{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "rm" = (
 /obj/effect/decal/road_marking/thin,
@@ -357,7 +359,7 @@
 /obj/vehicle/bike/speeder{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "rI" = (
 /obj/item/ammo_casing/a556/spent,
@@ -370,7 +372,7 @@
 /area/konyang_telecomms_outpost)
 "sA" = (
 /obj/machinery/recharge_station,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "sE" = (
 /obj/structure/flora/rock/konyang/small,
@@ -382,7 +384,7 @@
 /obj/item/clothing/head/welding,
 /obj/item/storage/toolbox/electrical,
 /obj/item/clothing/gloves/yellow,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "ts" = (
 /obj/machinery/door/window/westleft,
@@ -395,7 +397,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/tiled/white,
+/turf/simulated/floor/tiled/white,
 /area/konyang_telecomms_outpost)
 "tE" = (
 /turf/simulated/floor/plating,
@@ -406,7 +408,7 @@
 	},
 /obj/item/device/radio,
 /obj/item/device/radio,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "uk" = (
 /obj/structure/flora/tree/konyang/spring,
@@ -414,7 +416,7 @@
 /area/konyang_telecomms_outpost)
 "un" = (
 /obj/machinery/door/airlock/multi_tile,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "up" = (
 /obj/structure/bed/padded{
@@ -424,7 +426,7 @@
 	pixel_y = 4
 	},
 /obj/structure/curtain/open/bed,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "uw" = (
 /obj/structure/table/steel,
@@ -434,7 +436,7 @@
 /obj/item/paper_bin,
 /obj/item/pen/black,
 /obj/item/stamp,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "uR" = (
 /obj/structure/chainlink_fence,
@@ -446,14 +448,14 @@
 /area/konyang_telecomms_outpost)
 "uU" = (
 /obj/item/stack/material/wood,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "vc" = (
 /obj/structure/filingcabinet/filingcabinet{
 	pixel_x = 10;
 	pixel_y = 1
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "vq" = (
 /obj/effect/decal/cleanable/blood/oil,
@@ -472,7 +474,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "vI" = (
 /obj/structure/window/reinforced{
@@ -495,11 +497,11 @@
 /obj/item/ammo_casing/a556/spent,
 /obj/item/ammo_casing/a556/spent,
 /obj/item/stamp/denied,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "xJ" = (
 /obj/structure/closet/cabinet,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "xS" = (
 /obj/structure/flora/rock/konyang/small,
@@ -510,7 +512,7 @@
 /obj/structure/table/rack,
 /obj/item/towel/random,
 /obj/item/towel/random,
-/turf/simulated/floor/exoplanet/tiled/white,
+/turf/simulated/floor/tiled/white,
 /area/konyang_telecomms_outpost)
 "yg" = (
 /obj/machinery/door/blast/shutters{
@@ -532,7 +534,7 @@
 /obj/vehicle/bike/speeder{
 	dir = 8
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "yy" = (
 /obj/effect/floor_decal/industrial/warning,
@@ -542,11 +544,11 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "yU" = (
 /obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "zv" = (
 /turf/simulated/wall,
@@ -555,14 +557,14 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "zz" = (
 /obj/random/dirt_75,
 /obj/structure/toilet{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/tiled/white,
+/turf/simulated/floor/tiled/white,
 /area/konyang_telecomms_outpost)
 "zI" = (
 /obj/effect/floor_decal/industrial/warning,
@@ -572,7 +574,7 @@
 /obj/machinery/light{
 	icon_state = "tube_empty"
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "zO" = (
 /obj/item/ammo_casing/a556/spent,
@@ -584,7 +586,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "Aq" = (
 /obj/structure/flora/bush/konyang_reeds,
@@ -595,16 +597,16 @@
 /area/konyang_telecomms_outpost)
 "AH" = (
 /obj/machinery/door/airlock/command,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "BP" = (
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "BS" = (
 /obj/structure/table/rack,
 /obj/random/soap,
 /obj/random/soap,
-/turf/simulated/floor/exoplanet/tiled/white,
+/turf/simulated/floor/tiled/white,
 /area/konyang_telecomms_outpost)
 "Ck" = (
 /obj/effect/floor_decal/industrial/warning,
@@ -614,7 +616,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "CK" = (
 /obj/structure/chainlink_fence,
@@ -638,7 +640,7 @@
 /area/konyang_telecomms_outpost)
 "Dd" = (
 /obj/machinery/appliance/cooker/stove,
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "Dm" = (
 /obj/effect/decal/fake_object{
@@ -654,11 +656,11 @@
 /obj/item/storage/firstaid/large/combat,
 /obj/item/bodybag/cryobag,
 /obj/item/bodybag/cryobag,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "Dv" = (
 /obj/structure/table/wood,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "Dz" = (
 /obj/structure/flora/bush/konyang_reeds,
@@ -673,13 +675,13 @@
 	dir = 8;
 	icon_state = "tube_empty"
 	},
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "Ei" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "EH" = (
 /obj/structure/plasticflaps/airtight,
@@ -705,7 +707,7 @@
 	dir = 8;
 	icon_state = "tube_empty"
 	},
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "FV" = (
 /obj/structure/window/reinforced{
@@ -723,7 +725,9 @@
 /turf/simulated/floor/bluegrid/cooled,
 /area/konyang_telecomms_outpost)
 "Gc" = (
-/obj/structure/sign/flag/konyang/large/south,
+/obj/structure/sign/flag/konyang/large/south{
+	pixel_y = -32
+	},
 /turf/simulated/floor/exoplanet/konyang,
 /area/konyang_telecomms_outpost)
 "Gq" = (
@@ -760,7 +764,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "GJ" = (
 /obj/structure/bed/stool/chair/sofa/corner/concave/brown{
@@ -769,7 +773,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "GL" = (
 /obj/structure/table/steel,
@@ -779,7 +783,7 @@
 	pixel_y = 10;
 	pixel_x = 10
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "Hv" = (
 /obj/structure/flora/bush/konyang_reeds,
@@ -816,13 +820,13 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "Jh" = (
 /obj/structure/bed/stool/chair/sofa/left/brown{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "Jl" = (
 /obj/structure/table/wood,
@@ -830,7 +834,7 @@
 	pixel_x = -20;
 	pixel_y = -3
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "JR" = (
 /obj/structure/table/stone/marble,
@@ -842,7 +846,7 @@
 /obj/machinery/light{
 	icon_state = "tube_empty"
 	},
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "JS" = (
 /obj/machinery/door/blast/shutters/open{
@@ -858,13 +862,13 @@
 /area/konyang_telecomms_outpost)
 "Ks" = (
 /obj/structure/bed/stool/padded/brown,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "Kw" = (
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "KA" = (
 /obj/structure/flora/bush/konyang_reeds/water,
@@ -874,10 +878,10 @@
 /obj/machinery/light{
 	icon_state = "tube_empty"
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "Lu" = (
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "Lx" = (
 /obj/effect/landmark/corpse/ipc_zombie,
@@ -912,7 +916,7 @@
 /obj/structure/closet/walllocker/medical{
 	pixel_y = 28
 	},
-/turf/simulated/floor/exoplanet/tiled/white,
+/turf/simulated/floor/tiled/white,
 /area/konyang_telecomms_outpost)
 "OC" = (
 /obj/effect/landmark/corpse/ipc_zombie,
@@ -923,7 +927,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "PI" = (
 /obj/machinery/door/blast/shutters{
@@ -931,7 +935,7 @@
 	id = "konyang_garage";
 	name = "Garage"
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "Qc" = (
 /obj/item/ammo_casing/a556/spent,
@@ -947,7 +951,7 @@
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = null
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "Rc" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -959,7 +963,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/flame/lighter/random,
 /obj/item/storage/box/fancy/cigarettes/dromedaryco,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "RB" = (
 /obj/structure/table/stone/marble,
@@ -973,7 +977,7 @@
 	pixel_x = 3;
 	pixel_y = 4
 	},
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "RZ" = (
 /obj/structure/window/reinforced{
@@ -1002,12 +1006,12 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "Sh" = (
 /obj/effect/decal/road_marking/thin,
 /obj/structure/automobile,
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "Sm" = (
 /obj/item/material/shard,
@@ -1035,13 +1039,13 @@
 	pixel_y = 10;
 	pixel_x = -10
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "UC" = (
 /obj/structure/bed/stool/padded/brown{
 	dir = 1
 	},
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "UO" = (
 /obj/structure/flora/rock/konyang/small,
@@ -1059,7 +1063,7 @@
 	pixel_x = -9;
 	pixel_y = 1
 	},
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 "Wq" = (
 /obj/effect/landmark/corpse/ipc_zombie,
@@ -1072,7 +1076,7 @@
 	pixel_x = -4
 	},
 /obj/effect/landmark/corpse/ipc_zombie,
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "WQ" = (
 /obj/structure/table/stone/marble,
@@ -1081,7 +1085,7 @@
 	pixel_y = 7
 	},
 /obj/item/material/kitchen/rollingpin,
-/turf/simulated/floor/exoplanet/lino/diamond,
+/turf/simulated/floor/lino/diamond,
 /area/konyang_telecomms_outpost)
 "Yx" = (
 /obj/item/ammo_casing/a556/spent,
@@ -1115,11 +1119,11 @@
 "Zj" = (
 /obj/structure/table/wood,
 /obj/item/material/ashtray,
-/turf/simulated/floor/exoplanet/wood,
+/turf/simulated/floor/wood,
 /area/konyang_telecomms_outpost)
 "Zo" = (
 /obj/effect/decal/road_marking/thin,
-/turf/simulated/floor/exoplanet/asphalt,
+/turf/simulated/floor/asphalt,
 /area/konyang_telecomms_outpost)
 "ZQ" = (
 /obj/effect/landmark/corpse/ipc_zombie,
@@ -1129,7 +1133,7 @@
 /area/konyang_telecomms_outpost)
 "ZV" = (
 /obj/machinery/hologram/holopad/long_range,
-/turf/simulated/floor/exoplanet/tiled,
+/turf/simulated/floor/tiled,
 /area/konyang_telecomms_outpost)
 
 (1,1,1) = {"
diff --git a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm
index b8b22747090..15132ee7b5c 100644
--- a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm
+++ b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm
@@ -889,12 +889,12 @@
 	req_access = list(218);
 	name = "Sidearms Cabinet"
 	},
-/obj/item/gun/projectile/pistol/sol,
-/obj/item/gun/projectile/pistol/sol,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
+/obj/item/gun/projectile/pistol/sol/konyang,
+/obj/item/gun/projectile/pistol/sol/konyang,
 /turf/simulated/floor/exoplanet/tiled,
 /area/konyang_telecomms_outpost)
 "UK" = (