diff --git a/aurorastation.dme b/aurorastation.dme
index 7084c9a12a6..34a014bb6f0 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -759,6 +759,7 @@
 #include "code\game\objects\effects\spawners\gibspawner.dm"
 #include "code\game\objects\effects\temporary_visuals\blaster_effect.dm"
 #include "code\game\objects\effects\temporary_visuals\blood_splatter.dm"
+#include "code\game\objects\effects\temporary_visuals\nuke.dm"
 #include "code\game\objects\effects\temporary_visuals\temporary_visual.dm"
 #include "code\game\objects\items\airbubble.dm"
 #include "code\game\objects\items\apc_frame.dm"
@@ -1332,6 +1333,7 @@
 #include "code\modules\clothing\head\misc.dm"
 #include "code\modules\clothing\head\misc_special.dm"
 #include "code\modules\clothing\head\soft_caps.dm"
+#include "code\modules\clothing\head\xenos\tajara.dm"
 #include "code\modules\clothing\masks\boxing.dm"
 #include "code\modules\clothing\masks\breath.dm"
 #include "code\modules\clothing\masks\gasmask.dm"
@@ -1509,6 +1511,7 @@
 #include "code\modules\ghostroles\spawner\human\ert.dm"
 #include "code\modules\ghostroles\spawner\human\human.dm"
 #include "code\modules\ghostroles\spawner\human\merchant.dm"
+#include "code\modules\ghostroles\spawner\human\pra.dm"
 #include "code\modules\ghostroles\spawner\human\visitor.dm"
 #include "code\modules\ghostroles\spawner\simplemob\maintdrone.dm"
 #include "code\modules\ghostroles\spawner\simplemob\rat.dm"
diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm
index 96924a17c38..5b6744c6ac7 100644
--- a/code/datums/trading/weaponry.dm
+++ b/code/datums/trading/weaponry.dm
@@ -110,9 +110,13 @@
 		/obj/item/gun/projectile/revolver/lemat               = TRADER_THIS_TYPE,
 		/obj/item/gun/projectile/shotgun/pump/rifle/vintage   = TRADER_THIS_TYPE,
 		/obj/item/gun/energy/rifle/icelance                   = TRADER_THIS_TYPE,
-		/obj/item/clothing/accessory/storage/bayonet                 = TRADER_THIS_TYPE,
+		/obj/item/clothing/accessory/storage/bayonet          = TRADER_THIS_TYPE,
 		/obj/item/gun/projectile/cannon                       = TRADER_THIS_TYPE,
-		/obj/item/ammo_casing/cannon                                 = TRADER_ALL
+		/obj/item/ammo_casing/cannon                          = TRADER_ALL,
+		/obj/item/gun/projectile/nuke                         = TRADER_THIS_TYPE,
+		/obj/item/ammo_magazine/nuke                          = TRADER_THIS_TYPE,
+		/obj/item/gun/projectile/pistol/adhomai               = TRADER_THIS_TYPE,
+		/obj/item/gun/projectile/deagle/adhomai               = TRADER_THIS_TYPE
 	)
 
 
diff --git a/code/game/objects/effects/temporary_visuals/nuke.dm b/code/game/objects/effects/temporary_visuals/nuke.dm
new file mode 100644
index 00000000000..6b19e70b0cd
--- /dev/null
+++ b/code/game/objects/effects/temporary_visuals/nuke.dm
@@ -0,0 +1,5 @@
+/obj/effect/temp_visual/nuke
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "explosion"
+	duration = 9
+	layer= LIGHTING_LAYER+2
\ No newline at end of file
diff --git a/code/modules/clothing/head/xenos/tajara.dm b/code/modules/clothing/head/xenos/tajara.dm
new file mode 100644
index 00000000000..0e907ee21af
--- /dev/null
+++ b/code/modules/clothing/head/xenos/tajara.dm
@@ -0,0 +1,45 @@
+/obj/item/clothing/head/tajaran
+	icon = 'icons/obj/tajara_items.dmi'
+	contained_sprite = TRUE
+	description_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
+	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
+	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters usually shatter against how effective and cheap it is to \
+	make the human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
+	and colorful dress wearing \"Flapper\" variety of clothing."
+
+/obj/item/clothing/head/tajaran/circlet
+	name = "golden dress circlet"
+	desc = "A golden circlet with a pearl in the middle of it."
+	icon_state = "taj_circlet"
+	item_state = "taj_circlet"
+
+/obj/item/clothing/head/tajaran/circlet/silver
+	name = "silver dress circlet"
+	desc = "A silver circlet with a pearl in the middle of it."
+	icon_state = "taj_circlet_s"
+	item_state = "taj_circlet_s"
+
+/obj/item/clothing/head/tajaran/fur
+	name = "adhomian fur hat"
+	desc = "A typical tajaran hat, made with the fur of some adhomian animal."
+	icon_state = "fur_hat"
+	item_state = "fur_hat"
+
+/obj/item/clothing/head/tajaran/matake
+	name = "Mata'ke priest hat"
+	desc = "An adorned religious crown used by Mata'ke priests."
+	icon_state = "matakehat"
+	item_state = "matakehat"
+	description_fluff = "The priesthood of Mata'ke is comprised of only men and strangely enough, hunters. Like their patron, all priests of Mata'ke must prove themselves capable, \
+	practical, strong and masters of Adhomai wilderness. Every clan and temple of Mata'ke has a different way of testing its applicants and these tests are always kept as a strict \
+	secret, the only thing known is that the majority of applicants never return. After they're accepted, priests of Mata'ke dress in furs and carry silver \
+	weapons, usually daggers for ease of transport and to simulate Mata'ke's sword. There is a remarkably low amount of Njarir'Akhran in the Mata'ke priesthood."
+
+/obj/item/clothing/head/tajaran/cosmonaut_commissar
+	name = "kosmostrelki commissar hat"
+	desc = "A peaked cap used by Party Commissars attached to kosmostrelki units."
+	icon_state = "space_commissar_hat"
+	item_state = "space_commissar_hat"
+	description_fluff = "Party Commissars are high ranking members of the Party of the Free Tajara under the Leadership of Hadii attached to army units, who ensures that soldiers and \
+	their commanders follow the principles of Hadiism. Their duties are not only limited to enforcing the republican ideals among the troops and reporting possible subversive elements, \
+	they are expected to display bravery in combat and lead by example."
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm
index 643553674ab..14e5c53bf6e 100644
--- a/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm
@@ -73,6 +73,9 @@
 /obj/item/rig/tesla
 	name = "tesla suit control module"
 	desc = "A tajaran hardsuit designated to be used by the special forces of the Tesla Brigade."
+	description_fluff = "Formed in 2461, the Tesla Brigade is an experimental force composed of augmented veterans. Created after the intense casualties of the Das'nrra campaign and the \
+	severe loss of Republican Guard units. Additional funding and focus was placed on a previously shelved proposal for heavily armed shock and high technology assault troopers. A \
+	special unit designated to withstand the numerical disadvantages and prolonged engagements special forces of the Republic often faces."
 	suit_type = "tesla suit"
 	icon_state = "tesla_rig"
 	armor = list(melee = 70, bullet = 50, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 60)
diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm
index 57bc18d31e0..2b55279d96a 100644
--- a/code/modules/clothing/suits/alien.dm
+++ b/code/modules/clothing/suits/alien.dm
@@ -127,43 +127,6 @@
 	agitation about the religion of Mata'ke and S'rrendars position within that pantheon. Further the Parivara has called multiple summits over the courses of war, which usually result \
 	in temporary cease-fires from all sides."
 
-/obj/item/clothing/head/tajaran
-	icon = 'icons/obj/tajara_items.dmi'
-	contained_sprite = TRUE
-	description_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
-	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
-	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters usually shatter against how effective and cheap it is to \
-	make the human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
-	and colorful dress wearing \"Flapper\" variety of clothing."
-
-/obj/item/clothing/head/tajaran/circlet
-	name = "golden dress circlet"
-	desc = "A golden circlet with a pearl in the middle of it."
-	icon_state = "taj_circlet"
-	item_state = "taj_circlet"
-
-/obj/item/clothing/head/tajaran/circlet/silver
-	name = "silver dress circlet"
-	desc = "A silver circlet with a pearl in the middle of it."
-	icon_state = "taj_circlet_s"
-	item_state = "taj_circlet_s"
-
-/obj/item/clothing/head/tajaran/fur
-	name = "adhomian fur hat"
-	desc = "A typical tajaran hat, made with the fur of some adhomian animal."
-	icon_state = "fur_hat"
-	item_state = "fur_hat"
-
-/obj/item/clothing/head/tajaran/matake
-	name = "Mata'ke priest hat"
-	desc = "An adorned religious crown used by Mata'ke priests."
-	icon_state = "matakehat"
-	item_state = "matakehat"
-	description_fluff = "The priesthood of Mata'ke is comprised of only men and strangely enough, hunters. Like their patron, all priests of Mata'ke must prove themselves capable, \
-	practical, strong and masters of Adhomai wilderness. Every clan and temple of Mata'ke has a different way of testing its applicants and these tests are always kept as a strict \
-	secret, the only thing known is that the majority of applicants never return. After they're accepted, priests of Mata'ke dress in furs and carry silver \
-	weapons, usually daggers for ease of transport and to simulate Mata'ke's sword. There is a remarkably low amount of Njarir'Akhran in the Mata'ke priesthood."
-
 /obj/item/clothing/mask/tajara
 	name = "sun sister veil"
 	desc = "A veil worn by the female Priests of the S'rand'Marr religion."
diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm
index a3c22816c61..a52a81277d9 100644
--- a/code/modules/clothing/under/xenos/tajara.dm
+++ b/code/modules/clothing/under/xenos/tajara.dm
@@ -36,6 +36,25 @@
 	secret, the only thing known is that the majority of applicants never return. After they're accepted, priests of Mata'ke dress in furs and carry silver \
 	weapons, usually daggers for ease of transport and to simulate Mata'ke's sword. There is a remarkably low amount of Njarir'Akhran in the Mata'ke priesthood."
 
+/obj/item/clothing/under/tajaran/cosmonaut
+	name = "kosmostrelki uniform"
+	desc = "A military uniform used by the forces of the People's Republic of Adhomai orbital fleet."
+	icon_state = "cosmonaut"
+	item_state = "cosmonaut"
+	description_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
+	protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
+	contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
+	ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
+
+/obj/item/clothing/under/tajaran/cosmonaut/commissar
+	name = "kosmostrelki commissar uniform"
+	desc = "A military uniform used by Party Commissars attached to kosmostrelki units."
+	icon_state = "space_commissar"
+	item_state = "space_commissar"
+	description_fluff = "Party Commissars are high ranking members of the Party of the Free Tajara under the Leadership of Hadii attached to army units, who ensures that soldiers and \
+	their commanders follow the principles of Hadiism. Their duties are not only limited to enforcing the republican ideals among the troops and reporting possible subversive elements, \
+	they are expected to display bravery in combat and lead by example."
+
 /obj/item/clothing/under/dress/tajaran
 	name = "fancy adhomian dress"
 	desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is white."
diff --git a/code/modules/ghostroles/spawner/human/ert.dm b/code/modules/ghostroles/spawner/human/ert.dm
index 6951872d34e..69224a7ad69 100644
--- a/code/modules/ghostroles/spawner/human/ert.dm
+++ b/code/modules/ghostroles/spawner/human/ert.dm
@@ -169,6 +169,7 @@
 	mob_name_prefix = "Zosaa "
 	uses_species_whitelist = FALSE // Anyone should be able to play a Kataphract Unathi
 	possible_species = list("Unathi")
+	extra_languages = list(LANGUAGE_UNATHI, LANGUAGE_AZAZIBA)
 
 /datum/ghostspawner/human/ert/kataphract/specialist
 	name = "Kataphract-Hopeful Specialist"
@@ -184,4 +185,4 @@
 	desc = "A brave Saa (Knight) of the local Kataphract Guild. Two together operate as leaders of the team."
 	max_count = 2
 	outfit = /datum/outfit/admin/ert/kataphract/leader
-	mob_name_prefix = "Saa "
\ No newline at end of file
+	mob_name_prefix = "Saa "
diff --git a/code/modules/ghostroles/spawner/human/human.dm b/code/modules/ghostroles/spawner/human/human.dm
index c664d3a2f66..7be4bdc5e3c 100644
--- a/code/modules/ghostroles/spawner/human/human.dm
+++ b/code/modules/ghostroles/spawner/human/human.dm
@@ -16,6 +16,7 @@
 	var/possible_species = list("Human")
 	var/possible_genders = list(MALE,FEMALE)
 	var/allow_appearance_change = APPEARANCE_PLASTICSURGERY
+	var/list/extra_languages = list() //Which languages are added to this mob
 
 	var/assigned_role = null
 	var/special_role = null
@@ -122,6 +123,9 @@
 		M.preEquipOutfit(outfit, FALSE)
 		M.equipOutfit(outfit, FALSE)
 
+	for(var/language in extra_languages)
+		M.add_language(language)
+
 	M.force_update_limbs()
 	M.update_eyes()
 	M.regenerate_icons()
diff --git a/code/modules/ghostroles/spawner/human/pra.dm b/code/modules/ghostroles/spawner/human/pra.dm
new file mode 100644
index 00000000000..d372dcfa105
--- /dev/null
+++ b/code/modules/ghostroles/spawner/human/pra.dm
@@ -0,0 +1,73 @@
+/datum/ghostspawner/human/pra_cosmonaut
+	short_name = "pra_cosmonaut"
+	name = "Kosmostrelki"
+	desc = "Protect the People's Republic of Adhomai's possessions on space."
+	tags = list("External")
+
+	enabled = TRUE
+	spawnpoints = list("pra_cosmonaut")
+	req_perms = null
+	max_count = 3
+
+	outfit = /datum/outfit/admin/pra_cosmonaut
+	possible_species = list("Tajara", "M'sai Tajara", "Zhan-Khazan Tajara")
+	possible_genders = list(MALE,FEMALE)
+	allow_appearance_change = APPEARANCE_PLASTICSURGERY
+
+	assigned_role = "Kosmostrelki"
+	special_role = "Kosmostrelki"
+	respawn_flag = null
+	extra_languages = list(LANGUAGE_SIIK_MAAS)
+
+/datum/ghostspawner/human/pra_cosmonaut/commissar
+	short_name = "pra_commissar"
+	name = "Kosmostrelki Party Commissar"
+	desc = "Protect the People's Republic of Adhomai's possessions on space, and ensure that the Kosmostrelki follow the principles of Hadiism."
+
+	max_count = 1
+
+	assigned_role = "Party Commissar"
+	special_role = "Party Commissar"
+
+	req_species_whitelist = "Tajara"
+
+	outfit = /datum/outfit/admin/pra_cosmonaut/commissar
+	possible_species = list("Tajara", "M'sai Tajara")
+
+/datum/outfit/admin/pra_cosmonaut
+	name = "Kosmostrelki"
+
+	uniform = /obj/item/clothing/under/tajaran/cosmonaut
+	shoes = /obj/item/clothing/shoes/jackboots/unathi
+	belt = /obj/item/storage/belt/military
+	back = /obj/item/gun/projectile/shotgun/pump/rifle
+	id = /obj/item/card/id/syndicate
+	accessory = /obj/item/clothing/accessory/badge/hadii_card
+	belt_contents = list(
+						/obj/item/ammo_magazine/boltaction = 3,
+						/obj/item/grenade/smokebomb = 2,
+						/obj/item/plastique = 1,
+						/obj/item/gun/projectile/pistol/adhomai = 1
+
+						)
+	l_hand = /obj/item/clothing/accessory/storage/bayonet
+	r_hand = /obj/item/storage/field_ration
+
+/datum/outfit/admin/pra_cosmonaut/commissar
+	name = "Party Commissar"
+
+	uniform = /obj/item/clothing/under/tajaran/cosmonaut/commissar
+	head = /obj/item/clothing/head/tajaran/cosmonaut_commissar
+	accessory = /obj/item/clothing/accessory/hadii_pin
+	belt = /obj/item/gun/projectile/deagle/adhomai
+	belt_contents = null
+	back = /obj/item/storage/backpack/satchel
+	backpack_contents = list(
+						/obj/item/clothing/accessory/holster/hip = 1,
+						/obj/item/ammo_magazine/a50 = 2,
+						/obj/item/material/knife/trench = 1,
+						/obj/item/storage/box/hadii_manifesto = 1,
+						/obj/item/storage/box/hadii_card = 1
+						)
+	l_hand = /obj/item/device/megaphone
+	r_hand = null
diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm
index 2040f6df074..8837e4fc703 100644
--- a/code/modules/item_worth/worths_list.dm
+++ b/code/modules/item_worth/worths_list.dm
@@ -117,6 +117,7 @@ var/list/worths = list(
 					/obj/item/gun/projectile/contender = 1300,
 					/obj/item/gun/projectile/leyon = 500,
 					/obj/item/gun/projectile/cannon = 2100,
+					/obj/item/gun/projectile/nuke = 15000,
 					/obj/item/gun/projectile = 1500,
 //GUN,
 					/obj/item/gun/bang = 200,
@@ -643,6 +644,7 @@ var/list/worths = list(
 					/obj/item/solar_assembly = 680,
 					/obj/item/ammo_casing/cannon = 200,
 					/obj/item/ammo_casing = 5,
+					/obj/item/ammo_magazine/nuke = 1200,
 					/obj/item/ammo_magazine = 30,
 					/obj/item/conveyor_construct = 100,
 					/obj/item/conveyor_switch_construct = 30,
diff --git a/code/modules/mob/living/simple_animal/hostile/pra.dm b/code/modules/mob/living/simple_animal/hostile/pra.dm
index 705f043a085..d3792eba295 100644
--- a/code/modules/mob/living/simple_animal/hostile/pra.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pra.dm
@@ -1,6 +1,10 @@
 /mob/living/simple_animal/hostile/republicon
 	name = "republican defensive robot"
 	desc = "An outdated defense drone commonly used by People's Republic of Adhomai Orbital Fleet."
+	description_fluff = "Most heavy and medium Republican ships carry a detachment of very outdated combat robots brought from Solarian military surplus, they are usually armed with \
+	blades,	ballistic rifles or rockets. Those machines are usually deployed in rare cases of boarding operations. They possess a rudimentary artificial intelligence and targeting system, \
+	being only capable of perfoming simple tasks outside of attacking. The People's Republic is unable to manufacture this kind of synthetics, but their fleet technicians can \
+	easily repair and reprogram them."
 	icon = 'icons/mob/npc/republicon.dmi'
 	icon_state = "republicon"
 	icon_living = "republicon"
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 7f7784dad90..d2152593e63 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -439,4 +439,14 @@
 	icon_state = "light_plasma_cell"
 	caliber = "plasma bolt"
 	ammo_type = /obj/item/ammo_casing/plasma_bolt
-	max_ammo = 30
\ No newline at end of file
+	max_ammo = 30
+
+/obj/item/ammo_magazine/nuke
+	name = "nuclear launcher cartridge"
+	icon_state = "nukemag"
+	w_class = 3
+	mag_type = MAGAZINE
+	caliber = "nuke"
+	ammo_type = /obj/item/ammo_casing/nuke
+	max_ammo = 2
+	multiple_sprites = 1
\ No newline at end of file
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index 6f0dc7a0cb0..323d65e0f80 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -312,3 +312,9 @@
 	name = "canister shot"
 	desc = "A solid projectile filled with deadly shrapnel."
 	projectile_type = /obj/item/projectile/bullet/pellet/shotgun/canister
+
+/obj/item/ammo_casing/nuke
+	name = "miniaturized nuclear warhead"
+	icon_state = "nuke"
+	desc = "A miniaturized version of a nuclear bomb."
+	projectile_type = /obj/item/projectile/bullet/nuke
diff --git a/code/modules/projectiles/guns/projectile/cannon.dm b/code/modules/projectiles/guns/projectile/cannon.dm
index ba47d73703b..e11688f27be 100644
--- a/code/modules/projectiles/guns/projectile/cannon.dm
+++ b/code/modules/projectiles/guns/projectile/cannon.dm
@@ -4,6 +4,7 @@
 	icon_state = "cannon"
 	item_state = "cannon"
 	caliber = "cannon"
+	w_class = ITEMSIZE_LARGE
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
 	load_method = SINGLE_CASING
 	handle_casings = DELETE_CASINGS
@@ -29,6 +30,49 @@
 
 
 /obj/item/gun/projectile/cannon/special_check(mob/user)
+	if(!wielded)
+		to_chat(user, "<span class='warning'>You can't fire without stabilizing \the [src]!</span>")
+		return 0
+	return ..()
+
+/obj/item/gun/projectile/nuke
+	name = "nuclear launcher"
+	desc = "A launcher weapon designated to fire miniaturized nuclear warheads."
+	icon_state = "blockbuster"
+	item_state = "blockbuster"
+	caliber = "nuke"
+	w_class = ITEMSIZE_LARGE
+	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4)
+	load_method = MAGAZINE
+	handle_casings = DELETE_CASINGS
+	slot_flags = SLOT_BACK
+	magazine_type = /obj/item/ammo_magazine/nuke
+	allowed_magazines = list(/obj/item/ammo_magazine/nuke)
+	fire_delay = 40
+	fire_sound = 'sound/weapons/empty.ogg'
+	recoil = 4
+
+	auto_eject = TRUE
+
+	is_wieldable = TRUE
+
+	description_fluff = "The People's Republic of Adhomai is the only Adhomian faction able to master the nuclear fission. Atomic weapons were used before in the tajaran civil war, \
+	causing the annihilation of the military base of Quizosa. The nuclear launcher was created by republican scientists as way to deploy this destructive force while on the field."
+
+/obj/item/gun/projectile/nuke/update_icon()
+	if(ammo_magazine)
+		icon_state = "blockbuster-[(ammo_magazine.stored_ammo.len)]"
+	else
+		icon_state = "blockbuster-0"
+
+	if(wielded)
+		item_state = "blockbuster-wielded"
+	else
+		item_state = "blockbuster"
+
+	update_held_icon()
+
+/obj/item/gun/projectile/nuke/special_check(mob/user)
 	if(!wielded)
 		to_chat(user, "<span class='warning'>You can't fire without stabilizing \the [src]!</span>")
 		return 0
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 318e3738190..49ae49674b4 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -137,7 +137,7 @@
 	name = ".50 magnum pistol"
 	desc = "A robust handgun that uses .50 AE ammo."
 	icon_state = "deagle"
-	force = 14.0
+	force = 10
 	accuracy = 1
 	caliber = ".50"
 	load_method = MAGAZINE
@@ -153,6 +153,11 @@
 	else
 		icon_state = "[initial(icon_state)]-e"
 
+/obj/item/gun/projectile/deagle/adhomai
+	name = "adhomian heavy pistol"
+	desc = "A bulk handgun used by republican commissars and high-ranking members of the Hadiist Party."
+	icon_state = "adhomian_heavy_pistol"
+
 /obj/item/gun/projectile/gyropistol
 	name = "gyrojet pistol"
 	desc = "A bulky pistol designed to fire self propelled rounds"
@@ -316,7 +321,7 @@
 
 /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 political commissars."
+	desc = "The Adar'Mazy pistol is an adhomian firearm commonly issued to People's Republic officers, government officials and low-ranking Party members."
 	icon_state = "adhomian_pistol"
 	item_state = "pistol"
 	can_silence = FALSE
diff --git a/code/modules/projectiles/guns/projectile/plasma.dm b/code/modules/projectiles/guns/projectile/plasma.dm
index 6831243da89..21fd43a5a18 100644
--- a/code/modules/projectiles/guns/projectile/plasma.dm
+++ b/code/modules/projectiles/guns/projectile/plasma.dm
@@ -3,7 +3,7 @@
 	desc = "A marvel of Elyran weapons technology which utilizes superheated plasma to pierce thick armor with gruesome results."
 	icon_state = "slammer"
 	item_state = "slammer"
-	w_class = 3
+	w_class = ITEMSIZE_LARGE
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
 	ammo_type = /obj/item/ammo_casing/plasma_slug
 	magazine_type = /obj/item/ammo_magazine/plasma
@@ -27,7 +27,7 @@
 	desc = "A miniaturized, less efficient version of the infamous plasma slammer. Sacrifices much of its power for a more compact frame."
 	icon_state = "bolter"
 	item_state = "bolter"
-	w_class = 2
+	w_class = ITEMSIZE_NORMAL
 	ammo_type = /obj/item/ammo_casing/plasma_bolt
 	magazine_type = /obj/item/ammo_magazine/plasma/light
 	allowed_magazines = list(/obj/item/ammo_magazine/plasma/light)
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 372fa826a5e..895d5f19c2b 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -119,7 +119,7 @@
 
 /obj/item/gun/projectile/dragunov
 	name = "antique sniper rifle"
-	desc = "An old Dragunov semi-automatic marksman rifle. Smells of vodka and Communism. Uses 7.62mm rounds."
+	desc = "An old semi-automatic marksman rifle. Uses 7.62mm rounds."
 	icon_state = "dragunov"
 	item_state = "dragunov"
 	w_class = 4
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index b873a5f4b39..b1ae1067e28 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -347,4 +347,19 @@
 
 /obj/item/projectile/bullet/cannonball/explosive/on_impact(var/atom/A)
 	explosion(A, -1, 1, 2)
+	..()
+
+/obj/item/projectile/bullet/nuke
+	name = "miniaturized nuclear warhead"
+	icon_state = "nuke"
+	damage = 25
+
+/obj/item/projectile/bullet/nuke/on_impact(var/atom/A)
+	for(var/mob/living/carbon/human/mob in human_mob_list)
+		var/turf/T = get_turf(mob)
+		if(T && (loc.z == T.z))
+			if(ishuman(mob))
+				mob.apply_effect(450, IRRADIATE)
+	new /obj/effect/temp_visual/nuke(A.loc)
+	explosion(A,2,5,9)
 	..()
\ No newline at end of file
diff --git a/html/changelogs/alberyk-spacecats.yml b/html/changelogs/alberyk-spacecats.yml
new file mode 100644
index 00000000000..cc972d04840
--- /dev/null
+++ b/html/changelogs/alberyk-spacecats.yml
@@ -0,0 +1,7 @@
+author: Alberyk, Kyres1
+
+delete-after: True
+
+changes: 
+  - rscadd: "Added a new ghost role for one of the away sites."
+  - rscadd: "Species related ert and ghost roles should now get their relevant languages."
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 9dedf7f924f..ade34bdd289 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/belt_mirror.dmi b/icons/mob/belt_mirror.dmi
index d74de117d28..a55fc18e9c3 100644
Binary files a/icons/mob/belt_mirror.dmi and b/icons/mob/belt_mirror.dmi differ
diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi
index a89f9e76fc6..1276c5efaae 100644
Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ
diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi
index 5d694039ba4..4e37b11268a 100644
Binary files a/icons/mob/items/righthand_guns.dmi and b/icons/mob/items/righthand_guns.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 67869e8b360..42225bb71f3 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 4fd29cff4ff..e0aa64ef559 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index ae44ba38342..aeb1a85b8c1 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi
index baca5e3c52d..8aa3f148f58 100644
Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ
diff --git a/maps/space_ruins/pra_blockade_runner.dmm b/maps/space_ruins/pra_blockade_runner.dmm
index b1870a13fcf..4f296915009 100644
--- a/maps/space_ruins/pra_blockade_runner.dmm
+++ b/maps/space_ruins/pra_blockade_runner.dmm
@@ -74,7 +74,6 @@
 "an" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/steel,
-/obj/machinery/light/small/built,
 /obj/item/gun/projectile/pistol/adhomai,
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
@@ -247,7 +246,9 @@
 "aL" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/boozeomat,
+/obj/machinery/vending/boozeomat{
+	req_access = null
+	},
 /turf/simulated/floor/tiled/white,
 /area/derelict/ship)
 "aM" = (
@@ -262,6 +263,10 @@
 	},
 /obj/structure/bed/chair/comfy/beige,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/ghostspawpoint{
+	identifier = "pra_cosmonaut";
+	name = "igs - pra_cosmonaut"
+	},
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "aO" = (
@@ -283,6 +288,10 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/ghostspawpoint{
+	identifier = "pra_cosmonaut";
+	name = "igs - pra_cosmonaut"
+	},
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "aQ" = (
@@ -313,15 +322,14 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/generic,
-/obj/machinery/light/small/built{
-	dir = 4
-	},
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "aU" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/freezer/kitchen,
+/obj/structure/closet/secure_closet/freezer/kitchen{
+	req_access = null
+	},
 /turf/simulated/floor/tiled/white,
 /area/derelict/ship)
 "aV" = (
@@ -350,6 +358,10 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/ghostspawpoint{
+	identifier = "pra_cosmonaut";
+	name = "igs - pra_cosmonaut"
+	},
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "aZ" = (
@@ -358,7 +370,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
+/obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
@@ -408,6 +420,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood,
 /area/derelict/ship)
+"bi" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/shuttle/black,
+/area/derelict/ship)
 "bk" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/appliance/cooker/fryer,
@@ -420,6 +439,10 @@
 	},
 /obj/effect/decal/cleanable/generic,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/ghostspawpoint{
+	identifier = "pra_cosmonaut";
+	name = "igs - pra_cosmonaut"
+	},
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "bm" = (
@@ -442,10 +465,10 @@
 	dir = 1
 	},
 /obj/structure/table/wood,
+/obj/item/clothing/accessory/badge/hadii_card,
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "bq" = (
-/obj/effect/decal/cleanable/blood,
 /obj/effect/floor_decal/spline/fancy/wood{
 	icon_state = "spline_fancy";
 	dir = 1
@@ -493,25 +516,8 @@
 	icon_state = "spline_fancy";
 	dir = 6
 	},
-/obj/item/reagent_containers/food/snacks/tajaran_bread,
-/obj/item/reagent_containers/food/snacks/tajaran_bread,
-/obj/item/reagent_containers/food/snacks/tajaran_bread,
-/obj/item/reagent_containers/food/snacks/tajaran_bread,
-/obj/item/reagent_containers/food/snacks/tajaran_bread,
-/obj/item/reagent_containers/food/snacks/tajaran_stew,
-/obj/item/reagent_containers/food/snacks/tajaran_stew,
-/obj/item/reagent_containers/food/snacks/tajaran_stew,
-/obj/item/reagent_containers/food/snacks/tajaran_stew,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/item/reagent_containers/food/snacks/lasagna,
-/obj/item/reagent_containers/food/snacks/lasagna,
-/obj/item/reagent_containers/food/snacks/lasagna,
-/obj/item/reagent_containers/food/snacks/lasagna,
-/obj/item/reagent_containers/food/snacks/lasagna,
-/obj/item/reagent_containers/food/snacks/lasagna,
-/obj/item/reagent_containers/food/snacks/lasagna,
-/obj/item/reagent_containers/food/snacks/lasagna,
+/obj/machinery/computer/arcade,
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "by" = (
@@ -538,8 +544,8 @@
 /area/derelict/ship)
 "bD" = (
 /obj/effect/floor_decal/industrial/hatch,
-/obj/structure/closet/bombclosetsecurity,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/largecrate/animal/adhomai/fatshouter,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "bE" = (
@@ -547,6 +553,8 @@
 /obj/item/gun/projectile/shotgun/pump/rifle,
 /obj/structure/table/rack,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/gun/projectile/shotgun/pump/rifle,
+/obj/item/clothing/accessory/storage/bayonet,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "bF" = (
@@ -556,6 +564,7 @@
 /obj/item/storage/field_ration,
 /obj/item/storage/field_ration,
 /obj/item/storage/field_ration,
+/obj/machinery/light/small,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "bG" = (
@@ -571,12 +580,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
-"bI" = (
-/obj/item/clothing/suit/storage/hooded/tajaran,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/floor_decal/spline/fancy/wood,
-/turf/simulated/floor/wood,
-/area/derelict/ship)
 "bJ" = (
 /obj/item/clothing/under/tajaran,
 /obj/effect/decal/cleanable/dirt,
@@ -592,6 +595,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/cabinet,
+/obj/item/clothing/suit/storage/hooded/tajaran,
+/obj/item/clothing/under/tajaran,
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "bL" = (
@@ -604,9 +609,6 @@
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/secure_closet/freezer/meat,
-/obj/machinery/light/small/built{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/white,
 /area/derelict/ship)
 "bN" = (
@@ -649,6 +651,8 @@
 "bX" = (
 /obj/effect/floor_decal/industrial/hatch,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/table/rack,
+/obj/item/gun/projectile/pistol/adhomai,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "bY" = (
@@ -679,22 +683,28 @@
 	},
 /turf/simulated/floor/wood,
 /area/derelict/ship)
-"cc" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 1
-	},
-/obj/effect/floor_decal/spline/fancy/wood{
-	icon_state = "spline_fancy";
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/derelict/ship)
 "cd" = (
-/obj/effect/floor_decal/corner/black/diagonal,
-/obj/machinery/washing_machine,
+/obj/item/reagent_containers/food/snacks/tajaran_bread,
+/obj/item/reagent_containers/food/snacks/tajaran_bread,
+/obj/item/reagent_containers/food/snacks/tajaran_bread,
+/obj/item/reagent_containers/food/snacks/tajaran_bread,
+/obj/item/reagent_containers/food/snacks/tajaran_bread,
+/obj/item/reagent_containers/food/snacks/tajaran_stew,
+/obj/item/reagent_containers/food/snacks/tajaran_stew,
+/obj/item/reagent_containers/food/snacks/tajaran_stew,
+/obj/item/reagent_containers/food/snacks/tajaran_stew,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/item/reagent_containers/food/snacks/lasagna,
+/obj/item/reagent_containers/food/snacks/lasagna,
+/obj/item/reagent_containers/food/snacks/lasagna,
+/obj/item/reagent_containers/food/snacks/lasagna,
+/obj/item/reagent_containers/food/snacks/lasagna,
+/obj/item/reagent_containers/food/snacks/lasagna,
+/obj/item/reagent_containers/food/snacks/lasagna,
+/obj/item/reagent_containers/food/snacks/lasagna,
+/obj/effect/floor_decal/corner/black/diagonal,
+/obj/machinery/light/small,
 /turf/simulated/floor/tiled/white,
 /area/derelict/ship)
 "ce" = (
@@ -772,9 +782,6 @@
 /obj/effect/decal/cleanable/blood,
 /obj/random/arcade,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 4
-	},
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "cq" = (
@@ -802,9 +809,6 @@
 "cu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/generic,
-/obj/machinery/light/small/built{
-	dir = 1
-	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	icon_state = "spline_fancy";
 	dir = 1
@@ -841,12 +845,6 @@
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/derelict/ship)
-"cC" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/obj/item/clothing/suit/storage/tajaran/cloak,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/wood,
-/area/derelict/ship)
 "cD" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -856,6 +854,7 @@
 /obj/effect/decal/cleanable/vomit,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/cabinet,
+/obj/item/clothing/suit/storage/tajaran/cloak,
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "cE" = (
@@ -867,6 +866,9 @@
 /obj/item/clothing/gloves/botanic_leather/tajara,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "cG" = (
@@ -894,6 +896,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small,
 /mob/living/simple_animal/hostile/republicon,
 /turf/simulated/floor/tiled/freezer,
 /area/derelict/ship)
@@ -915,16 +918,6 @@
 /obj/effect/decal/remains,
 /turf/unsimulated/floor/asteroid/ash,
 /area/mine/unexplored)
-"cN" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/floor_decal/spline/fancy/wood{
-	icon_state = "spline_fancy";
-	dir = 9
-	},
-/obj/item/bedsheet/rd,
-/obj/structure/bed/padded,
-/turf/simulated/floor/wood,
-/area/derelict/ship)
 "cO" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/dirt,
@@ -933,6 +926,7 @@
 	dir = 1
 	},
 /obj/structure/table/wood,
+/obj/item/eightball/haunted,
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "cQ" = (
@@ -956,21 +950,12 @@
 "cS" = (
 /obj/machinery/papershredder,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "cT" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/derelict/ship)
-"cU" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/obj/effect/decal/cleanable/dirt,
-/obj/random/junk,
-/turf/simulated/floor/wood,
-/area/derelict/ship)
 "cV" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -1001,17 +986,11 @@
 "da" = (
 /obj/machinery/vending/sovietsoda,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 1
-	},
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
 "db" = (
 /obj/machinery/vending/cigarette,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 1
-	},
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
 "dc" = (
@@ -1053,9 +1032,6 @@
 "dl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/material/shard/wood,
-/obj/machinery/light/small/built{
-	dir = 4
-	},
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
 "dm" = (
@@ -1412,6 +1388,9 @@
 /obj/item/gun/energy/rifle/icelance,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/rack,
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "eI" = (
@@ -1541,6 +1520,7 @@
 /obj/structure/closet/crate/freezer{
 	name = "O- Blood Packs"
 	},
+/obj/machinery/light/small,
 /turf/simulated/floor/tiled/freezer,
 /area/derelict/ship)
 "ff" = (
@@ -1561,7 +1541,6 @@
 "fh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built,
 /turf/simulated/floor/tiled/white,
 /area/derelict/ship)
 "fi" = (
@@ -1602,20 +1581,24 @@
 /obj/structure/flora/pottedplant/random,
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
+"gT" = (
+/obj/effect/floor_decal/corner/orange/diagonal,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/rack,
+/obj/random/powercell,
+/obj/random/tech_supply,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/derelict/ship)
 "hJ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
+/obj/machinery/light/small{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/derelict/ship)
-"jE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 1
-	},
-/turf/simulated/floor/shuttle/black,
-/area/derelict/ship)
 "kr" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/hostile/republicon,
@@ -1626,10 +1609,33 @@
 /mob/living/simple_animal/hostile/republicon/ranged,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
+"lG" = (
+/obj/effect/floor_decal/spline/fancy/wood,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/generic,
+/obj/structure/table/wood,
+/obj/item/storage/fancy/cigar,
+/obj/item/flame/lighter/zippo,
+/turf/simulated/floor/wood,
+/area/derelict/ship)
+"me" = (
+/obj/effect/floor_decal/corner/orange/diagonal,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/derelict/ship)
+"mF" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/greengrid,
+/area/derelict/ship)
 "nx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/firealarm/east,
-/obj/machinery/light/small/built{
+/obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor/shuttle/black,
@@ -1641,22 +1647,18 @@
 	},
 /turf/simulated/floor,
 /area/derelict/ship)
-"qd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 8
-	},
-/turf/simulated/floor/shuttle/black,
-/area/derelict/ship)
-"uP" = (
-/obj/machinery/light/small/built{
+"rI" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	icon_state = "spline_fancy";
 	dir = 1
 	},
-/turf/simulated/floor/shuttle/black,
+/obj/structure/table/wood,
+/obj/item/clothing/accessory/storage/bayonet,
+/turf/simulated/floor/wood,
 /area/derelict/ship)
 "vW" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
+/obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/black,
@@ -1669,16 +1671,13 @@
 	},
 /turf/simulated/floor,
 /area/derelict/ship)
-"xr" = (
-/obj/effect/floor_decal/corner/black/diagonal,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/republicon/ranged,
-/turf/simulated/floor/tiled/white,
+"wQ" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/greengrid,
 /area/derelict/ship)
 "yi" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
+/obj/machinery/light/small{
 	dir = 8
 	},
 /mob/living/simple_animal/hostile/republicon/ranged,
@@ -1689,15 +1688,7 @@
 /obj/structure/bed/chair{
 	dir = 8
 	},
-/obj/machinery/light/small/built{
-	dir = 4
-	},
-/turf/simulated/floor/shuttle/black,
-/area/derelict/ship)
-"Bg" = (
-/obj/structure/flora/pottedplant/random,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
+/obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/black,
@@ -1711,22 +1702,29 @@
 	icon_state = "spline_fancy";
 	dir = 10
 	},
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "CH" = (
 /mob/living/simple_animal/hostile/republicon/ranged,
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
-"DX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "Ee" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/steel,
 /obj/item/storage/field_ration,
-/obj/machinery/light/small/built,
+/turf/simulated/floor/shuttle/black,
+/area/derelict/ship)
+"Gv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/material/shard/shrapnel,
+/obj/machinery/light/small,
+/turf/simulated/floor/shuttle/black,
+/area/derelict/ship)
+"GW" = (
+/obj/machinery/light/small,
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
 "HX" = (
@@ -1737,6 +1735,14 @@
 /obj/item/clothing/head/helmet/space/void/pra,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
+"Im" = (
+/obj/structure/lattice/catwalk/indoor,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor,
+/area/derelict/ship)
 "IC" = (
 /obj/effect/floor_decal/corner/orange/diagonal,
 /obj/effect/decal/cleanable/dirt,
@@ -1744,47 +1750,37 @@
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "JX" = (
-/obj/machinery/light/small/built{
+/obj/machinery/light/small{
 	dir = 1
 	},
 /turf/simulated/floor/greengrid,
 /area/derelict/ship)
-"Kj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 1
-	},
-/obj/effect/floor_decal/spline/fancy/wood{
-	icon_state = "spline_fancy";
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/derelict/ship)
 "Kp" = (
 /obj/effect/floor_decal/industrial/hatch,
-/obj/structure/closet/crate/loot,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 4
-	},
+/obj/structure/closet/crate,
+/obj/item/landmine,
+/obj/item/landmine,
+/obj/item/landmine,
+/obj/item/landmine,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
+"KR" = (
+/obj/effect/floor_decal/corner/black/diagonal,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sink/kitchen{
+	dir = 4;
+	icon_state = "sink_alt";
+	pixel_x = -18
+	},
+/turf/simulated/floor/tiled/white,
+/area/derelict/ship)
 "KW" = (
 /obj/effect/floor_decal/corner/orange/diagonal,
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/hostile/republicon/ranged,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
-"Lm" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bed/chair{
-	dir = 4
-	},
-/obj/machinery/light/small/built{
-	dir = 8
-	},
-/turf/simulated/floor/shuttle/black,
-/area/derelict/ship)
 "LO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/spline/fancy/wood,
@@ -1794,14 +1790,6 @@
 /mob/living/simple_animal/hostile/republicon,
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
-"OC" = (
-/obj/effect/floor_decal/corner/orange/diagonal,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "OR" = (
 /obj/structure/table/rack,
 /obj/structure/window/reinforced,
@@ -1824,10 +1812,10 @@
 /obj/item/reagent_containers/food/snacks/tajaran_bread,
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
-"Qk" = (
+"Qy" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built,
-/turf/simulated/floor/tiled/freezer,
+/obj/machinery/light/small,
+/turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
 "Qz" = (
 /obj/machinery/door/firedoor,
@@ -1839,34 +1827,62 @@
 	},
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
-"RJ" = (
+"Rg" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
-"Sj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table/rack,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
-"TH" = (
-/obj/effect/floor_decal/corner/orange/diagonal,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built{
+/obj/machinery/light/small{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
-"VV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/random/junk,
-/obj/machinery/light/small/built{
+"Rv" = (
+/obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/black,
 /area/derelict/ship)
+"RW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/dark,
+/area/derelict/ship)
+"Ua" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	icon_state = "spline_fancy";
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/ghostspawpoint{
+	identifier = "pra_cosmonaut";
+	name = "igs - pra_cosmonaut"
+	},
+/turf/simulated/floor/wood,
+/area/derelict/ship)
+"Ui" = (
+/obj/effect/floor_decal/industrial/hatch,
+/obj/structure/closet/crate/loot,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/nuke,
+/turf/simulated/floor/tiled/dark,
+/area/derelict/ship)
+"YS" = (
+/obj/effect/floor_decal/spline/fancy/wood,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small,
+/turf/simulated/floor/wood,
+/area/derelict/ship)
+"Zb" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/greengrid,
+/area/derelict/ship)
+"Ze" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor,
+/area/derelict/ship)
 "Zh" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/hostile/republicon/ranged,
@@ -30275,7 +30291,7 @@ ae
 cj
 Cy
 ae
-cN
+cj
 Cy
 ae
 ay
@@ -30524,9 +30540,9 @@ cq
 cq
 ae
 bp
-bI
+cT
 ae
-bp
+rI
 cT
 ae
 cs
@@ -30787,17 +30803,17 @@ cb
 LO
 ae
 ct
-cC
+be
 ae
 aH
-cU
+be
 ae
 ak
 ae
 dv
 dH
 dw
-ed
+gT
 ei
 et
 eD
@@ -31037,21 +31053,21 @@ cq
 cq
 cq
 ae
-Kj
+ct
 bK
 ae
-cc
+ct
 ci
 ae
 cu
 cD
 ae
-Kj
+ct
 cV
 ae
 Qz
 ae
-TH
+dw
 dw
 dP
 KW
@@ -31551,17 +31567,17 @@ cq
 cq
 cq
 ae
-uP
-bs
-bs
-bs
-bs
+ak
+ak
 bs
 bs
+vW
+ak
 bs
+ak
 CH
-bs
-bs
+Rv
+ak
 bs
 aA
 ae
@@ -31820,7 +31836,7 @@ ae
 ae
 ae
 aq
-ak
+Qy
 ae
 ae
 ae
@@ -32067,7 +32083,7 @@ aU
 bk
 bt
 aM
-aM
+KR
 cd
 ae
 cm
@@ -32081,8 +32097,8 @@ ax
 ae
 dz
 dJ
-OC
 dw
+me
 dw
 eu
 eE
@@ -32344,7 +32360,7 @@ dw
 dw
 eF
 ae
-eR
+Ze
 eR
 fg
 cq
@@ -32573,12 +32589,12 @@ cq
 cq
 cq
 ae
-jE
+ak
 ak
 aD
 aM
 aW
-xr
+aW
 aM
 bM
 bT
@@ -32831,11 +32847,11 @@ cq
 cq
 ao
 ak
-ak
+Qy
 ae
 aN
 aX
-aX
+Ua
 bu
 ae
 ae
@@ -33098,15 +33114,15 @@ ao
 ak
 ak
 bO
-ak
-ak
+Zh
+vW
 aA
 ak
 bm
 ak
 ak
 ak
-ak
+bi
 ak
 ak
 ak
@@ -33365,7 +33381,7 @@ aA
 dl
 ak
 ak
-VV
+ay
 ak
 ak
 ak
@@ -33613,7 +33629,7 @@ bm
 ae
 Cc
 ck
-ck
+mF
 ck
 Cc
 ae
@@ -33860,12 +33876,12 @@ an
 aq
 ay
 ak
-ak
+bi
 kr
 ak
 bm
 ak
-ak
+vW
 ak
 ae
 ck
@@ -34113,7 +34129,7 @@ ZU
 ah
 ak
 al
-ak
+Qy
 ar
 ak
 aB
@@ -34129,7 +34145,7 @@ JX
 ck
 ck
 ck
-ck
+wQ
 ae
 da
 ay
@@ -34138,7 +34154,7 @@ kr
 ak
 ak
 ak
-dh
+Gv
 aq
 ev
 ak
@@ -34146,14 +34162,14 @@ ak
 ak
 ak
 ak
-qd
+ak
 ak
 ak
 ak
 ak
 ak
 fn
-Lm
+fn
 ay
 ak
 ak
@@ -34378,7 +34394,7 @@ ak
 ak
 ak
 bn
-bs
+GW
 Mu
 bs
 bN
@@ -34389,7 +34405,7 @@ ck
 Cc
 ae
 bB
-ak
+Rg
 ak
 aB
 aF
@@ -34402,7 +34418,7 @@ ak
 bO
 aA
 ay
-ak
+vW
 ak
 ak
 ak
@@ -34627,7 +34643,7 @@ ZU
 ah
 ak
 al
-ak
+Qy
 ar
 ak
 ae
@@ -34643,7 +34659,7 @@ JX
 ck
 ck
 ck
-ck
+wQ
 ae
 db
 ak
@@ -34907,7 +34923,7 @@ ak
 dm
 ds
 ds
-Bg
+ba
 ak
 ak
 ep
@@ -35155,7 +35171,7 @@ bV
 ae
 Cc
 ck
-ck
+Zb
 ck
 Cc
 ae
@@ -35170,7 +35186,7 @@ dg
 ae
 cG
 eH
-RJ
+bC
 bC
 fd
 ae
@@ -35404,7 +35420,7 @@ ak
 ae
 aI
 aS
-bd
+lG
 ae
 ag
 am
@@ -35661,23 +35677,23 @@ Zh
 ae
 aJ
 aS
-be
+YS
 ae
 ba
 ak
 ak
 bm
 ak
-ak
-VV
-ak
-ak
-ak
-ak
+bi
+ay
 ak
 ak
 ak
 vW
+ak
+ak
+ak
+ak
 bO
 ak
 ak
@@ -35686,7 +35702,7 @@ ex
 yi
 ex
 eW
-Qk
+cm
 ae
 cq
 cq
@@ -36178,7 +36194,7 @@ ae
 ae
 ae
 bB
-jE
+Qy
 kr
 ae
 bc
@@ -36193,7 +36209,7 @@ ae
 dt
 dC
 ae
-ak
+Rg
 ak
 ae
 ez
@@ -36445,7 +36461,7 @@ cF
 bP
 bC
 ae
-ak
+Qy
 dn
 af
 by
@@ -37209,20 +37225,20 @@ bC
 bP
 bC
 bP
-bC
+RW
 ae
 HX
 HX
-Sj
-Sj
+HX
+HX
 ae
 ak
-qd
+Qy
 ae
 dE
 dM
 dU
-OC
+me
 er
 eB
 eD
@@ -37466,7 +37482,7 @@ bD
 bC
 bX
 bC
-ca
+Ui
 ae
 cy
 cy
@@ -37725,7 +37741,7 @@ bY
 ln
 ca
 ae
-cy
+Im
 cy
 cy
 cy
@@ -37980,7 +37996,7 @@ bF
 bP
 bZ
 bC
-DX
+bC
 ae
 cz
 cH
@@ -38502,7 +38518,7 @@ ak
 ak
 ak
 ay
-ak
+bi
 ak
 ak
 bB
@@ -42872,7 +42888,7 @@ cq
 cq
 cq
 cq
-cq
+ab
 ab
 af
 af
@@ -43128,9 +43144,9 @@ aa
 cq
 cq
 cq
-cq
-cq
-cq
+ab
+ab
+ab
 af
 af
 af
@@ -43385,13 +43401,13 @@ aa
 cq
 cq
 cq
-cq
-cq
-cq
+ab
+ab
+ab
 af
 af
 af
-cq
+ab
 aa
 aa
 aa
@@ -43642,13 +43658,13 @@ aa
 cq
 cq
 cq
-cq
-cq
-cq
+ab
+ab
+ab
 af
 af
 af
-cq
+ab
 aa
 aa
 aa
@@ -43899,13 +43915,13 @@ aa
 cq
 cq
 cq
-cq
-cq
-cq
+ab
+ab
+ab
 af
 af
 af
-cq
+ab
 aa
 aa
 aa
@@ -44156,13 +44172,13 @@ aa
 cq
 cq
 cq
-cq
-cq
-cq
+ab
+ab
+ab
 af
 af
 af
-cq
+ab
 aa
 aa
 aa
@@ -44413,13 +44429,13 @@ aa
 aa
 cq
 cq
-cq
-cq
-cq
+ab
+ab
+ab
 af
 af
 af
-cq
+ab
 aa
 aa
 aa
@@ -44670,13 +44686,13 @@ aa
 aa
 cq
 cq
-cq
-cq
-cq
+ab
+ab
+ab
 af
 af
 af
-cq
+ab
 aa
 aa
 aa
@@ -44927,13 +44943,13 @@ aa
 aa
 aa
 cq
-cq
-cq
-cq
+ab
+ab
+ab
 af
 af
 af
-aa
+ab
 aa
 aa
 aa
@@ -45185,12 +45201,12 @@ aa
 aa
 aa
 aa
-cq
-cq
-cq
+ab
+ab
+ab
 ec
-cq
-aa
+ab
+ab
 aa
 aa
 aa
@@ -45444,9 +45460,9 @@ aa
 aa
 aa
 aa
-cq
-cq
-aa
+ab
+ab
+ab
 aa
 aa
 aa