diff --git a/code/modules/custom_ka/barrels.dm b/code/modules/custom_ka/barrels.dm
index 703f2dc9e1f..e11fe8255fa 100644
--- a/code/modules/custom_ka/barrels.dm
+++ b/code/modules/custom_ka/barrels.dm
@@ -1,18 +1,18 @@
 /obj/item/custom_ka_upgrade/barrels/barrel01
 	name = "standard core KA power converter"
 	build_name = "'Standard'"
-	desc = "A very standard kinetic accelerator energy converter and barrel assembly. Has poor range, but gets the job done."
+	desc = "A very standard kinetic accelerator energy converter and barrel assembly. Has poor range and firerate, but gets the job done."
 	icon_state = "barrel01"
-	damage_increase = 10
-	firedelay_increase = 0.75 SECONDS
-	range_increase = 2
+	damage_increase = 15
+	firedelay_increase = 1 SECONDS
+	range_increase = 3
 	recoil_increase = 2
 	cost_increase = 1
 	cell_increase = 0
 	capacity_increase = -1
 	fire_sound = 'sound/weapons/Kenetic_accel.ogg'
 	projectile_type = /obj/item/projectile/kinetic
-	origin_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2,TECH_MAGNET = 2)
+	origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1, TECH_PHORON = 2)
 
 /obj/item/custom_ka_upgrade/barrels/barrel02
 	name = "professional core KA power converter"
@@ -20,15 +20,15 @@
 	desc = "A more advanced kinetic accelerator energy converter and barrel assembly intended for professional miners out on the rock."
 	icon_state = "barrel02"
 	damage_increase = 15
-	firedelay_increase = 0.75 SECONDS
-	range_increase = 3
+	firedelay_increase = 0.5 SECONDS
+	range_increase = 4
 	recoil_increase = 3
 	cost_increase = 1
 	cell_increase = 0
 	capacity_increase = -2
 	fire_sound = 'sound/weapons/Kenetic_accel.ogg'
 	projectile_type = /obj/item/projectile/kinetic
-	origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3)
+	origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 3, TECH_PHORON = 2)
 
 /obj/item/custom_ka_upgrade/barrels/barrel03
 	name = "meteor core KA power converter"
@@ -37,14 +37,14 @@
 	icon_state = "barrel03"
 	damage_increase = 20
 	firedelay_increase = 0.75 SECONDS
-	range_increase = 4
+	range_increase = 5
 	recoil_increase = 4
 	cost_increase = 2
 	cell_increase = 0
 	capacity_increase = -3
 	fire_sound = 'sound/weapons/resonator_fire.ogg'
 	projectile_type = /obj/item/projectile/kinetic
-	origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4,TECH_MAGNET = 4)
+	origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 3, TECH_PHORON = 3)
 
 
 /obj/item/custom_ka_upgrade/barrels/barrel04
@@ -54,14 +54,14 @@
 	icon_state = "barrel04"
 	damage_increase = 25
 	firedelay_increase = 1 SECONDS
-	range_increase = 5
+	range_increase = 6
 	recoil_increase = 6
 	cost_increase = 5
 	cell_increase = 0
 	capacity_increase = -4
 	fire_sound = 'sound/weapons/pulse.ogg'
 	projectile_type = /obj/item/projectile/kinetic
-	origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5)
+	origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 3,TECH_MAGNET = 5, TECH_PHORON = 4)
 
 /obj/item/custom_ka_upgrade/barrels/barrel05
 	name = "experimental core KA power converter"
@@ -70,14 +70,14 @@
 	icon_state = "barrel05"
 	damage_increase = 30
 	firedelay_increase = 1 SECONDS
-	range_increase = 6
+	range_increase = 7
 	recoil_increase = 10
 	cost_increase = 10
 	cell_increase = 0
 	capacity_increase = -5
 	fire_sound = 'sound/weapons/resonator_blast.ogg'
 	projectile_type = /obj/item/projectile/kinetic
-	origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 6,TECH_MAGNET = 6)
+	origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5,TECH_MAGNET = 6, TECH_PHORON = 5)
 
 /obj/item/custom_ka_upgrade/barrels/illegal
 	name = "laser KA power converter"
@@ -87,8 +87,8 @@
 	damage_increase = 15
 	firedelay_increase = 1.5 SECONDS
 	range_increase = 64
-	recoil_increase = 6
-	cost_increase = 4
+	recoil_increase = 0
+	cost_increase = 10
 	cell_increase = 0
 	capacity_increase = 0
 	fire_sound = 'sound/weapons/lasercannonfire.ogg'
diff --git a/code/modules/custom_ka/cells.dm b/code/modules/custom_ka/cells.dm
index 2a459506892..a266df48aa2 100644
--- a/code/modules/custom_ka/cells.dm
+++ b/code/modules/custom_ka/cells.dm
@@ -21,49 +21,46 @@
 
 /obj/item/custom_ka_upgrade/cells/cell01
 	//Pump Action
-	name = "pump action KA cell"
-	build_name = "pump-action"
-	desc = "A very basic power cell and pump action combo that stores a single charge. A pump is required after each shot, however it deals increased damage and has increased range."
+	name = "pump recharging KA cell"
+	build_name = "pump-recharging"
+	desc = "A very basic power cell and pump action combo that stores 4 charges. Low capacity however it has slightly increased range."
 	icon_state = "cell01"
-	damage_increase = 5
 	firedelay_increase = 0.25 SECONDS
-	range_increase = 3
-	recoil_increase = -1
-	cost_increase = -100 //Always have a single charge
-	cell_increase = 1
+	range_increase = 2
+	recoil_increase = -3
+	cell_increase = 4
 	capacity_increase = -1
 	mod_limit_increase = 0
 
 	pump_restore = 1
 	pump_delay = 0.4 SECONDS
 
-	origin_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2,TECH_MAGNET = 2,TECH_POWER = 2)
+	origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 1)
 
 /obj/item/custom_ka_upgrade/cells/cell02
 	//Pump Action
-	name = "pump recharging KA cell"
+	name = "advanced pump recharging KA cell"
 	build_name = "pump-recharging"
-	desc = "A somewhat more advanced, standard issue pump and cell assembly that allows the user to 'pre-pump' their charges, up to a capacity of 12. Can fire quite quickly."
+	desc = "A somewhat more advanced, standard issue pump and cell assembly that stores charges up to a capacity of 12. Can fire and pump quite quickly."
 	icon_state = "cell02"
-	firedelay_increase = 0
+	firedelay_increase = 0.1 SECONDS
 	recoil_increase = 1
 	cell_increase = 12
 	capacity_increase = -2
 	mod_limit_increase = 0
 
 	pump_restore = 1
-	pump_delay = 0.5 SECONDS
+	pump_delay = 0.3 SECONDS
 
-	origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3,TECH_POWER = 3)
+	origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 3)
 
 /obj/item/custom_ka_upgrade/cells/cell03
 	name = "kinetic charging KA cell"
-	build_name = "kinetic-reloading"
-	desc = "A complex pump and cell assembly that uses the kinetic energy of an initial pump to significantly charge the cell. Deals increased damage at the cost of severely increased recoil and reduced firerate."
+	build_name = "kinetic"
+	desc = "A complex pump and cell assembly that uses the kinetic energy of an initial pump to significantly charge the cell. Deals increased damage at the cost of reduced firerate."
 	icon_state = "cell03"
 	damage_increase = 10
 	firedelay_increase = 0.5 SECONDS
-	recoil_increase = 4
 	cost_increase = -1
 	cell_increase = 40
 	capacity_increase = -3
@@ -72,13 +69,14 @@
 	pump_restore = 40
 	pump_delay = 1 SECONDS
 
-	origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4,TECH_MAGNET = 4,TECH_POWER = 4)
+	origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 2,TECH_POWER = 3)
 
 /obj/item/custom_ka_upgrade/cells/cell04
 	name = "uranium charging KA cell"
 	build_name = "recharging"
 	desc = "A pumpless cell assembly that containes a miniaturized nuclear reactor housed safely inside the assembly. Recharges the cell shortly over time, however deals slightly reduced damage."
 	icon_state = "cell04"
+	firedelay_increase = 0.1 SECONDS
 	damage_increase = -5
 	recoil_increase = 0
 	cost_increase = 0
@@ -89,7 +87,7 @@
 	pump_restore = 0
 	pump_delay = 0
 
-	origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5,TECH_POWER = 5)
+	origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 4,TECH_MAGNET = 3,TECH_POWER = 5)
 
 /obj/item/custom_ka_upgrade/cells/cell04/on_update(var/obj/item/weapon/gun/custom_ka/the_gun)
 	stored_charge = min(stored_charge + 3,cell_increase)
@@ -110,7 +108,7 @@
 	pump_restore = 5
 	pump_delay = 0.5 SECONDS
 
-	origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 6,TECH_MAGNET = 6,TECH_POWER = 6)
+	origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 6,TECH_MAGNET = 5,TECH_POWER = 5, TECH_PHORON = 5)
 
 /obj/item/custom_ka_upgrade/cells/cell05/on_fire(var/obj/item/weapon/gun/custom_ka/the_gun)
 	if(the_gun.recoil_increase > 0)
@@ -132,7 +130,7 @@
 	pump_restore = 0
 	pump_delay = 0
 
-	origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5,TECH_POWER = 5)
+	origin_tech = list()
 
 /obj/item/custom_ka_upgrade/cells/cyborg/on_update(var/obj/item/weapon/gun/custom_ka/the_gun)
 	var/mob/living/silicon/robot/owner_robot = the_gun.loc
@@ -147,18 +145,18 @@
 /obj/item/custom_ka_upgrade/cells/illegal
 	//Pump Action
 	name = "pump action KA cell"
-	build_name = "static"
-	desc = "A clusterfuck of circuitry and battery parts all snuggly fit inside a solid, static plastisteel frame."
+	build_name = "pump-action"
+	desc = "A clusterfuck of circuitry and battery parts all snuggly fit inside a solid, static plastisteel frame. A single pump is enough for any shot of any weapon."
 	icon_state = "cell_illegal"
 	firedelay_increase = 0
 	recoil_increase = 0
-	cost_increase = 0
-	stored_charge = 20
-	cell_increase = 20
+	cost_increase = -100
+	stored_charge = 1
+	cell_increase = 1
 	capacity_increase = 0
 	mod_limit_increase = 0
 
-	pump_restore = 20
-	pump_delay = 0.5 SECONDS
+	pump_restore = 1
+	pump_delay = 0.3 SECONDS
 
 	origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3,TECH_POWER = 3, TECH_ILLEGAL = 4)
\ No newline at end of file
diff --git a/code/modules/custom_ka/frames.dm b/code/modules/custom_ka/frames.dm
index b3267c7349f..1438407d239 100644
--- a/code/modules/custom_ka/frames.dm
+++ b/code/modules/custom_ka/frames.dm
@@ -5,7 +5,7 @@
 	w_class = 3
 	capacity_increase = 3
 	mod_limit_increase = 2
-	origin_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2)
+	origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1)
 	slot_flags = SLOT_BELT
 
 /obj/item/weapon/gun/custom_ka/frame02
@@ -16,7 +16,7 @@
 	recoil_increase = -1
 	capacity_increase = 5
 	mod_limit_increase = 3
-	origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3)
+	origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 3)
 
 /obj/item/weapon/gun/custom_ka/frame03
 	name = "medium kinetic accelerator frame"
@@ -26,7 +26,7 @@
 	recoil_increase = -2
 	capacity_increase = 7
 	mod_limit_increase = 4
-	origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4)
+	origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3)
 
 /obj/item/weapon/gun/custom_ka/frame04
 	name = "heavy kinetic accelerator frame"
@@ -36,7 +36,7 @@
 	recoil_increase = -5
 	capacity_increase = 9
 	mod_limit_increase = 5
-	origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5)
+	origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 5)
 
 /obj/item/weapon/gun/custom_ka/frame05
 	name = "tactical kinetic accelerator frame"
diff --git a/code/modules/custom_ka/upgrade_chips.dm b/code/modules/custom_ka/upgrade_chips.dm
index 979333ae413..82a8cf33272 100644
--- a/code/modules/custom_ka/upgrade_chips.dm
+++ b/code/modules/custom_ka/upgrade_chips.dm
@@ -1,6 +1,6 @@
 /obj/item/custom_ka_upgrade/upgrade_chips/damage
 	name = "upgrade chip - damage increase"
-	desc = "Increases damage and recoil."
+	desc = "Increases damage and recoil, reduces accuracy."
 	icon_state = "upgrade_chip"
 	damage_increase = 10
 	recoil_increase = 3
@@ -54,7 +54,6 @@
 	name = "illegal custom KA upgrade chip"
 	desc = "Overrides safety settings for a custom kinetic accelerator. What's the worst that could happen?"
 	icon_state = "upgrade_chip_illegal"
-	damage_increase = 10
 	firedelay_increase = -0.5 SECONDS
 	recoil_increase = 4
 	cost_increase = 1
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 349ae9cae3c..ade79edff93 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -125,7 +125,7 @@
 		var/author = query_books.item[1]
 		var/title = query_books.item[2]
 		var/content = query_books.item[3]
-		var/obj/item/weapon/book/B = new(src.loc)
+		var/obj/item/weapon/book/B = new(src)
 		B.name = "Book: [title]"
 		B.title = title
 		B.author = author
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 3cd7025f371..eebdb868261 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -442,28 +442,28 @@
 //Frames
 /datum/design/item/weapon/ka_frame01
 	id = "ka_frame01"
-	req_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2)
+	req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1)
 	materials = list(DEFAULT_WALL_MATERIAL = 3000)
 	build_path = /obj/item/weapon/gun/custom_ka/frame01
 	sort_string = "TZZFA"
 
 /datum/design/item/weapon/ka_frame02
 	id = "ka_frame02"
-	req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000, "silver" = 1000)
+	req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000)
 	build_path = /obj/item/weapon/gun/custom_ka/frame02
 	sort_string = "TZZFB"
 
 /datum/design/item/weapon/ka_frame03
 	id = "ka_frame03"
-	req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4)
+	req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3)
 	materials = list(DEFAULT_WALL_MATERIAL = 5000, "silver" = 2000)
 	build_path = /obj/item/weapon/gun/custom_ka/frame03
 	sort_string = "TZZFC"
 
 /datum/design/item/weapon/ka_frame04
 	id = "ka_frame04"
-	req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5)
+	req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5)
 	materials = list(DEFAULT_WALL_MATERIAL = 5000, "silver" = 2000, "diamond" = 1000)
 	build_path = /obj/item/weapon/gun/custom_ka/frame04
 	sort_string = "TZZFD"
@@ -478,35 +478,35 @@
 //Cells
 /datum/design/item/weapon/ka_cell01
 	id = "ka_cell01"
-	req_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2,TECH_MAGNET = 2,TECH_POWER = 2)
+	req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 1)
 	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/cells/cell01
 	sort_string = "TZZGA"
 
 /datum/design/item/weapon/ka_cell02
 	id = "ka_cell02"
-	req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3,TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 1000)
+	req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/cells/cell02
 	sort_string = "TZZGB"
 
 /datum/design/item/weapon/ka_cell03
 	id = "ka_cell03"
-	req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4,TECH_MAGNET = 4,TECH_POWER = 4)
+	req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 2,TECH_POWER = 3)
 	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 3000, "silver" = 3000, "gold" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/cells/cell03
 	sort_string = "TZZGC"
 
 /datum/design/item/weapon/ka_cell04
 	id = "ka_cell04"
-	req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5,TECH_POWER = 5)
+	req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 4,TECH_MAGNET = 3,TECH_POWER = 5)
 	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 3000, "silver" = 3000, "gold" = 1000, "uranium" = 5000)
 	build_path = /obj/item/custom_ka_upgrade/cells/cell04
 	sort_string = "TZZGD"
 
 /datum/design/item/weapon/ka_cell05
 	id = "ka_cell05"
-	req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 6,TECH_MAGNET = 6,TECH_POWER = 6)
+	req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 6,TECH_MAGNET = 5,TECH_POWER = 5, TECH_PHORON = 5)
 	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 3000, "silver" = 3000, "gold" = 1000, "phoron" = 5000)
 	build_path = /obj/item/custom_ka_upgrade/cells/cell05
 	sort_string = "TZZGE"
@@ -514,35 +514,35 @@
 //Barrels
 /datum/design/item/weapon/ka_barrel01
 	id = "ka_barrel01"
-	req_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2,TECH_MAGNET = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "gold" = 1000, "phoron" = 500)
+	req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1, TECH_PHORON = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "phoron" = 500)
 	build_path = /obj/item/custom_ka_upgrade/barrels/barrel01
 	sort_string = "TZZHA"
 
 /datum/design/item/weapon/ka_barrel02
 	id = "ka_barrel02"
-	req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 2000, "gold" = 1000, "phoron" = 500)
+	req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 3, TECH_PHORON = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 2000, "phoron" = 500)
 	build_path = /obj/item/custom_ka_upgrade/barrels/barrel02
 	sort_string = "TZZHB"
 
 /datum/design/item/weapon/ka_barrel03
 	id = "ka_barrel03"
-	req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4,TECH_MAGNET = 4)
+	req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 3, TECH_PHORON = 3)
 	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 2000, "gold" = 2000, "phoron" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/barrels/barrel03
 	sort_string = "TZZHC"
 
 /datum/design/item/weapon/ka_barrel04
 	id = "ka_barrel04"
-	req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5)
+	req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 3,TECH_MAGNET = 5, TECH_PHORON = 4)
 	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 3000, "gold" = 3000, "phoron" = 3000, "diamond" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/barrels/barrel04
 	sort_string = "TZZHD"
 
 /datum/design/item/weapon/ka_barrel05
 	id = "ka_barrel05"
-	req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 6,TECH_MAGNET = 6)
+	req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5,TECH_MAGNET = 6, TECH_PHORON = 5)
 	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 4000, "gold" = 4000, "phoron" = 4000, "diamond" = 2000)
 	build_path = /obj/item/custom_ka_upgrade/barrels/barrel05
 	sort_string = "TZZHE"
@@ -551,48 +551,48 @@
 /datum/design/item/weapon/ka_upgrade01
 	id = "ka_upgrade01"
 	req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/upgrade_chips/damage
 	sort_string = "TZZIA"
 
 /datum/design/item/weapon/ka_upgrade02
 	id = "ka_upgrade02"
 	req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/upgrade_chips/firerate
 	sort_string = "TZZIB"
 
 /datum/design/item/weapon/ka_upgrade03
 	id = "ka_upgrade03"
 	req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/upgrade_chips/effeciency
 	sort_string = "TZZIC"
 
 /datum/design/item/weapon/ka_upgrade04
 	id = "ka_upgrade04"
 	req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/upgrade_chips/recoil
 	sort_string = "TZZID"
 
 /datum/design/item/weapon/ka_upgrade05
 	id = "ka_upgrade05"
 	req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/upgrade_chips/focusing
 	sort_string = "TZZIE"
 
 /datum/design/item/weapon/ka_upgrade06
 	id = "ka_upgrade06"
 	req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/upgrade_chips/capacity
 	sort_string = "TZZIF"
 
 /datum/design/item/weapon/ka_upgrade07
 	id = "ka_upgrade07"
 	req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
 	build_path = /obj/item/custom_ka_upgrade/upgrade_chips/explosive
 	sort_string = "TZZIF"
\ No newline at end of file
diff --git a/html/changelogs/burgerbb-postfixes.yml b/html/changelogs/burgerbb-postfixes.yml
new file mode 100644
index 00000000000..ff9c5243e0e
--- /dev/null
+++ b/html/changelogs/burgerbb-postfixes.yml
@@ -0,0 +1,40 @@
+################################
+# 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
+#################################
+
+# Your name.  
+author: BurgerBB
+
+# 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: 
+  - bugfix: "Fixed library books spawning outside of shelves."
+  - bugfix: "Fixed kinetic accelerators displaying an error when equipped on the waist."
+  - balance: "Balances kinetic accelerator research to prevent easy research exploit. Balances traitor kinetic accelerator to be less powerful."
+  - maptweak: "Tweaked the new library to be more aesthetically pleasing. Removed empty mediwall from the command section of the shuttle. Removed floating light near departures and on the shuttle. Removed pointless holopad on the evac shuttle."
\ No newline at end of file
diff --git a/icons/obj/kinetic_accelerators.dmi b/icons/obj/kinetic_accelerators.dmi
index 2446c7e8588..d89a1833a47 100644
Binary files a/icons/obj/kinetic_accelerators.dmi and b/icons/obj/kinetic_accelerators.dmi differ
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 727df16b797..e8a548165b6 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -13217,9 +13217,17 @@
 	},
 /area/centcom/holding)
 "DA" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape/centcom)
+/turf/unsimulated/floor{
+	icon_state = "gcircuit"
+	},
+/obj/structure/artilleryplaceholder/decorative{
+	icon_state = "29"
+	},
+/obj/machinery/porta_turret/crescent,
+/turf/unsimulated/floor{
+	icon_state = "wood_siding6"
+	},
+/area/centcom/control)
 "DB" = (
 /obj/machinery/light/spot,
 /turf/simulated/shuttle/plating,
@@ -13295,24 +13303,6 @@
 	},
 /area/centcom/holding)
 "DJ" = (
-/turf/unsimulated/floor{
-	icon_state = "gcircuit"
-	},
-/obj/structure/artilleryplaceholder/decorative{
-	icon_state = "29"
-	},
-/obj/machinery/porta_turret/crescent,
-/turf/unsimulated/floor{
-	icon_state = "wood_siding6"
-	},
-/area/centcom/control)
-"DK" = (
-/obj/item/modular_computer/console/preset/security,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor3"
-	},
-/area/shuttle/escape/centcom)
-"DL" = (
 /turf/unsimulated/floor{
 	icon_state = "engine"
 	},
@@ -13329,6 +13319,28 @@
 	icon_state = "wood_siding9"
 	},
 /area/centcom/control)
+"DK" = (
+/obj/item/modular_computer/console/preset/security,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor3"
+	},
+/area/shuttle/escape/centcom)
+"DL" = (
+/turf/unsimulated/floor{
+	icon_state = "gcircuit"
+	},
+/obj/structure/artilleryplaceholder/decorative{
+	icon_state = "27"
+	},
+/obj/structure/table/reinforced/steel,
+/obj/machinery/button/remote/blast_door{
+	id = "battery2";
+	name = "Battery 2 Firing Control"
+	},
+/turf/unsimulated/floor{
+	icon_state = "wood_siding10"
+	},
+/area/centcom/control)
 "DM" = (
 /turf/unsimulated/wall/riveted,
 /area/centcom/ferry)
@@ -13527,9 +13539,11 @@
 	},
 /obj/structure/table/reinforced/steel,
 /obj/machinery/button/remote/blast_door{
-	id = "battery2";
-	name = "Battery 2 Firing Control"
+	id = "battery1";
+	name = "Battery 1 Firing Control"
 	},
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/weapon/reagent_containers/glass/rag,
 /turf/unsimulated/floor{
 	icon_state = "wood_siding10"
 	},
@@ -13598,20 +13612,12 @@
 /area/centcom/holding)
 "Er" = (
 /turf/unsimulated/floor{
-	icon_state = "gcircuit"
+	icon_state = "engine"
 	},
-/obj/structure/artilleryplaceholder/decorative{
-	icon_state = "27"
-	},
-/obj/structure/table/reinforced/steel,
-/obj/machinery/button/remote/blast_door{
-	id = "battery1";
-	name = "Battery 1 Firing Control"
-	},
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/weapon/reagent_containers/glass/rag,
+/obj/effect/decal/cleanable/dirt,
 /turf/unsimulated/floor{
-	icon_state = "wood_siding10"
+	icon_state = "wood_siding1";
+	dir = 6
 	},
 /area/centcom/control)
 "Es" = (
@@ -13793,6 +13799,7 @@
 	icon_state = "engine"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/item/weapon/stool,
 /turf/unsimulated/floor{
 	icon_state = "wood_siding1";
 	dir = 6
@@ -13811,7 +13818,7 @@
 	icon_state = "engine"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/weapon/stool,
+/obj/item/weapon/storage/toolbox/electrical,
 /turf/unsimulated/floor{
 	icon_state = "wood_siding1";
 	dir = 6
@@ -13954,17 +13961,6 @@
 	},
 /area/centcom/holding)
 "Fl" = (
-/turf/unsimulated/floor{
-	icon_state = "engine"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/weapon/storage/toolbox/electrical,
-/turf/unsimulated/floor{
-	icon_state = "wood_siding1";
-	dir = 6
-	},
-/area/centcom/control)
-"Fm" = (
 /turf/unsimulated/floor{
 	icon_state = "engine"
 	},
@@ -13982,6 +13978,16 @@
 	icon_state = "wood_siding9"
 	},
 /area/centcom/control)
+"Fm" = (
+/turf/unsimulated/floor{
+	icon_state = "wood"
+	},
+/obj/item/weapon/stool/padded,
+/turf/unsimulated/floor{
+	name = "plating";
+	icon_state = "siding2"
+	},
+/area/centcom/holding)
 "Fn" = (
 /obj/machinery/computer/med_data,
 /obj/structure/window/reinforced{
@@ -14356,11 +14362,19 @@
 /obj/machinery/status_display{
 	pixel_y = -32
 	},
+/obj/machinery/light,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/escape/centcom)
 "Ga" = (
+/obj/structure/bed/chair/office/bridge{
+	icon_state = "bridge";
+	dir = 8
+	},
+/obj/machinery/status_display{
+	pixel_y = -32
+	},
 /obj/machinery/light,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
@@ -15134,12 +15148,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/closet/medical_wall{
-	pixel_x = -32
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor3"
-	},
+/turf/simulated/floor/tiled/ramp,
 /area/shuttle/escape/centcom)
 "HM" = (
 /obj/structure/window/reinforced,
@@ -15308,16 +15317,11 @@
 	},
 /area/centcom/spawning)
 "If" = (
-/obj/structure/bed/chair/office/bridge{
-	icon_state = "bridge";
-	dir = 8
-	},
-/obj/machinery/status_display{
-	pixel_y = -32
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor3"
+/obj/machinery/light{
+	dir = 4;
+	status = 2
 	},
+/turf/simulated/floor/tiled/ramp,
 /area/shuttle/escape/centcom)
 "Ig" = (
 /obj/structure/window/reinforced{
@@ -17208,14 +17212,16 @@
 /turf/unsimulated/wall/riveted,
 /area/centcom/spawning)
 "Ma" = (
-/obj/machinery/light{
-	dir = 4;
-	status = 0
+/turf/unsimulated/floor{
+	icon_state = "floor"
 	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor3"
+/obj/structure/bed/chair/unmovable{
+	dir = 1
 	},
-/area/shuttle/escape/centcom)
+/turf/unsimulated/floor{
+	icon_state = "wood_siding2"
+	},
+/area/centcom/spawning)
 "Mb" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -22032,14 +22038,16 @@
 /area/shuttle/escape/centcom)
 "WE" = (
 /turf/unsimulated/floor{
-	icon_state = "wood"
+	icon_state = "floor"
+	},
+/obj/machinery/vending/snack{
+	name = "Free Chocolate Corp";
+	prices = list()
 	},
-/obj/item/weapon/stool/padded,
 /turf/unsimulated/floor{
-	name = "plating";
-	icon_state = "siding2"
+	icon_state = "wood_siding4"
 	},
-/area/centcom/holding)
+/area/centcom/spawning)
 "WF" = (
 /obj/machinery/status_display{
 	pixel_y = -32
@@ -22346,29 +22354,6 @@
 	},
 /area/centcom/spawning)
 "Xl" = (
-/turf/unsimulated/floor{
-	icon_state = "floor"
-	},
-/obj/structure/bed/chair/unmovable{
-	dir = 1
-	},
-/turf/unsimulated/floor{
-	icon_state = "wood_siding2"
-	},
-/area/centcom/spawning)
-"Xm" = (
-/turf/unsimulated/floor{
-	icon_state = "floor"
-	},
-/obj/machinery/vending/snack{
-	name = "Free Chocolate Corp";
-	prices = list()
-	},
-/turf/unsimulated/floor{
-	icon_state = "wood_siding4"
-	},
-/area/centcom/spawning)
-"Xn" = (
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -22380,7 +22365,7 @@
 	icon_state = "wood_siding8"
 	},
 /area/centcom/spawning)
-"Xo" = (
+"Xm" = (
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -57018,7 +57003,7 @@ DM
 DM
 EP
 EP
-WE
+Fm
 Gq
 GE
 GF
@@ -57275,7 +57260,7 @@ Fi
 Fo
 EP
 EP
-WE
+Fm
 Gq
 GF
 GF
@@ -57532,7 +57517,7 @@ Fj
 Fp
 EP
 EP
-WE
+Fm
 Gq
 GF
 GF
@@ -57789,7 +57774,7 @@ Fk
 Fp
 EP
 EP
-WE
+Fm
 Gq
 GF
 GF
@@ -58046,7 +58031,7 @@ EP
 EP
 Fy
 EP
-WE
+Fm
 Gq
 GF
 GF
@@ -58303,7 +58288,7 @@ EP
 EP
 EP
 EP
-WE
+Fm
 Gq
 GF
 GF
@@ -64458,7 +64443,7 @@ CG
 CQ
 VC
 Fu
-Ga
+GQ
 CP
 CP
 OX
@@ -64495,7 +64480,7 @@ Ms
 Id
 Id
 Id
-Xm
+WE
 Id
 Id
 Id
@@ -64698,17 +64683,17 @@ wl
 xe
 xA
 yk
-DL
+DJ
 wl
 xe
 xA
 yk
-DL
+DJ
 wl
 xe
 xA
 Bp
-Fm
+Fl
 uT
 Cq
 CG
@@ -64716,8 +64701,8 @@ CQ
 Fn
 Fz
 GN
+GQ
 HL
-GO
 VH
 CP
 VQ
@@ -64751,9 +64736,9 @@ KZ
 Ms
 Id
 Id
-Xl
+Ma
 OY
-Xo
+Xm
 Id
 Id
 OA
@@ -65008,9 +64993,9 @@ MN
 Ms
 Id
 Id
-Xl
+Ma
 OZ
-Xo
+Xm
 Id
 Id
 Qn
@@ -65472,13 +65457,13 @@ yl
 yE
 wo
 xh
-Eh
+DL
 yl
 yE
 wo
 xh
+Eh
 Er
-ER
 BT
 uT
 Cq
@@ -65522,9 +65507,9 @@ KZ
 Ms
 Id
 Id
-Xl
+Ma
 Pa
-Xo
+Xm
 Id
 Id
 OA
@@ -65735,7 +65720,7 @@ yE
 wp
 xi
 Dr
-ET
+ER
 BT
 uT
 Cq
@@ -65751,7 +65736,7 @@ VE
 Ds
 Ds
 Ds
-DA
+Ds
 Ds
 Ds
 Ds
@@ -65779,9 +65764,9 @@ Nw
 Ms
 Id
 Id
-Xl
+Ma
 Pb
-Xo
+Xm
 Id
 Id
 OA
@@ -65981,18 +65966,18 @@ it
 uT
 wq
 xj
-DJ
+DA
 yl
 yE
 wq
 xj
-DJ
+DA
 yl
 yE
 wq
 xj
-DJ
-Fl
+DA
+ET
 BT
 uT
 Cq
@@ -66001,8 +65986,8 @@ CQ
 Ft
 FO
 Ig
-Ma
-GO
+GQ
+If
 VH
 CP
 Ds
@@ -66036,9 +66021,9 @@ KZ
 Ms
 Id
 Id
-Xl
+Ma
 Pc
-Xo
+Xm
 Id
 Id
 OA
@@ -66257,7 +66242,7 @@ CG
 CQ
 DK
 VF
-Ga
+GQ
 CP
 CP
 CP
@@ -66514,7 +66499,7 @@ CO
 CQ
 CQ
 GQ
-If
+Ga
 CP
 VD
 VJ
@@ -66550,9 +66535,9 @@ MN
 Ms
 Id
 Id
-Xl
+Ma
 Pb
-Xo
+Xm
 Id
 Id
 OA
@@ -66807,9 +66792,9 @@ KZ
 Ms
 Id
 Id
-Xl
+Ma
 Pd
-Xo
+Xm
 Id
 Id
 OA
@@ -67065,7 +67050,7 @@ Ms
 Id
 Id
 Id
-Xn
+Xl
 Id
 Id
 Id
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 714ddcb7527..17f430e519f 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -2375,6 +2375,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/brig)
+"aeG" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/table/wood,
+/turf/simulated/floor/wood,
+/area/library)
 "aeH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -2765,6 +2772,25 @@
 /obj/machinery/seed_extractor,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
+"afz" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/table/wood,
+/turf/simulated/floor/wood,
+/area/library)
+"afA" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/table/wood,
+/turf/simulated/floor/wood,
+/area/library)
+"afB" = (
+/obj/structure/window/reinforced,
+/obj/structure/table/wood,
+/turf/simulated/floor/wood,
+/area/library)
 "afC" = (
 /obj/structure/closet{
 	name = "Evidence Closet"
@@ -2851,6 +2877,58 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/brig)
+"afO" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
+/turf/simulated/floor/wood,
+/area/library)
+"afP" = (
+/obj/effect/landmark/start{
+	name = "Librarian"
+	},
+/obj/structure/bed/chair/office/dark,
+/turf/simulated/floor/carpet,
+/area/library)
+"afQ" = (
+/obj/structure/bed/chair/office/dark,
+/turf/simulated/floor/wood,
+/area/library)
+"afR" = (
+/obj/structure/bed/chair/office/dark,
+/turf/simulated/floor/carpet,
+/area/library)
+"afS" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/library)
+"afT" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/library)
+"afU" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 1
+	},
+/turf/simulated/floor/carpet,
+/area/library)
+"afV" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 8
+	},
+/turf/simulated/floor/carpet,
+/area/library)
+"afW" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 4
+	},
+/turf/simulated/floor/carpet,
+/area/library)
 "afX" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark{
@@ -62140,13 +62218,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/main)
-"crf" = (
-/obj/structure/toilet,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/freezer,
-/area/security/main)
 "crg" = (
 /obj/structure/toilet,
 /obj/machinery/light/small{
@@ -62381,18 +62452,6 @@
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/security/main)
-"crC" = (
-/obj/machinery/shower{
-	dir = 8;
-	icon_state = "shower";
-	pixel_x = 0;
-	pixel_y = 0
-	},
-/obj/machinery/door/window/westleft,
-/obj/structure/curtain/open/shower,
-/obj/item/weapon/soap,
-/turf/simulated/floor/tiled/freezer,
-/area/security/main)
 "crD" = (
 /obj/effect/floor_decal/corner/blue{
 	icon_state = "corner_white";
@@ -62556,22 +62615,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/main)
-"crQ" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	icon_state = "rwindow";
-	dir = 8
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor,
-/area/security/security_office)
 "crR" = (
 /obj/structure/flora/pottedplant/random,
 /obj/effect/floor_decal/corner/blue{
@@ -62599,9 +62642,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/security_office)
-"crU" = (
-/turf/simulated/floor/tiled,
-/area/security/security_office)
 "crV" = (
 /obj/machinery/light{
 	dir = 1
@@ -62732,22 +62772,6 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
 /area/security/security_office)
-"csi" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	icon_state = "rwindow";
-	dir = 8
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor,
-/area/security/security_office)
 "csj" = (
 /obj/structure/coatrack,
 /obj/effect/floor_decal/corner/blue{
@@ -62756,9 +62780,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/security_office)
-"csk" = (
-/turf/simulated/floor/tiled,
-/area/security/security_office)
 "csl" = (
 /obj/structure/table/standard,
 /obj/structure/window/reinforced,
@@ -62796,12 +62817,6 @@
 /obj/item/weapon/paper_bin,
 /turf/simulated/floor/tiled/dark,
 /area/security/security_office)
-"csp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled,
-/area/security/security_office)
 "csq" = (
 /obj/machinery/alarm{
 	dir = 8;
@@ -62813,12 +62828,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/security_office)
-"csr" = (
-/turf/simulated/wall,
-/area/security/security_office)
-"css" = (
-/turf/simulated/wall,
-/area/security/security_office)
 "cst" = (
 /obj/structure/bed/chair,
 /obj/item/device/radio/intercom{
@@ -62826,9 +62835,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/security_office)
-"csu" = (
-/turf/simulated/floor/tiled,
-/area/security/security_office)
 "csv" = (
 /obj/structure/table/standard,
 /obj/structure/window/reinforced{
@@ -62875,24 +62881,12 @@
 /obj/item/weapon/paper_bin,
 /turf/simulated/floor/tiled/dark,
 /area/security/security_office)
-"csz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled,
-/area/security/security_office)
 "csA" = (
 /obj/structure/noticeboard{
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled,
 /area/security/security_office)
-"csB" = (
-/turf/simulated/wall,
-/area/security/security_office)
-"csC" = (
-/turf/simulated/wall,
-/area/security/security_office)
 "csD" = (
 /obj/structure/table/standard,
 /obj/item/weapon/storage/box/donut,
@@ -62901,9 +62895,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/security_office)
-"csE" = (
-/turf/simulated/floor/tiled,
-/area/security/security_office)
 "csF" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 4
@@ -62986,9 +62977,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
 /area/security/security_office)
-"csN" = (
-/turf/simulated/wall,
-/area/security/security_office)
 "csO" = (
 /obj/machinery/vending/coffee,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -63106,12 +63094,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/brig)
-"csZ" = (
-/turf/simulated/wall,
-/area/security/security_office)
-"cta" = (
-/turf/simulated/wall,
-/area/security/security_office)
 "ctb" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced,
@@ -63135,28 +63117,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/security_office)
-"ctd" = (
-/turf/simulated/wall,
-/area/security/security_office)
-"cte" = (
-/turf/simulated/wall,
-/area/security/security_office)
-"ctf" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	icon_state = "rwindow";
-	dir = 8
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor,
-/area/security/security_office)
 "ctg" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Security Office";
@@ -63263,15 +63223,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/starboard)
-"ctu" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"ctv" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"ctw" = (
-/turf/simulated/wall,
-/area/journalistoffice)
 "ctx" = (
 /obj/machinery/door/firedoor,
 /obj/structure/window/reinforced/polarized{
@@ -63347,9 +63298,6 @@
 /obj/structure/grille,
 /turf/simulated/floor,
 /area/journalistoffice)
-"ctC" = (
-/turf/simulated/wall,
-/area/journalistoffice)
 "ctD" = (
 /obj/machinery/door/firedoor,
 /obj/structure/window/reinforced/polarized{
@@ -63367,16 +63315,6 @@
 /obj/structure/grille,
 /turf/simulated/floor/plating,
 /area/journalistoffice)
-"ctE" = (
-/obj/structure/flora/pottedplant/random,
-/turf/simulated/floor/wood,
-/area/journalistoffice)
-"ctF" = (
-/turf/simulated/floor/wood,
-/area/journalistoffice)
-"ctG" = (
-/turf/simulated/floor/wood,
-/area/journalistoffice)
 "ctH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -63425,22 +63363,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/journalistoffice)
-"ctL" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"ctM" = (
-/obj/machinery/door/firedoor,
-/obj/structure/window/reinforced/polarized{
-	dir = 8;
-	id = "journalist"
-	},
-/obj/structure/window/reinforced/polarized{
-	dir = 4;
-	id = "journalist"
-	},
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/journalistoffice)
 "ctN" = (
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -63448,9 +63370,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/journalistoffice)
-"ctO" = (
-/turf/simulated/floor/wood,
-/area/journalistoffice)
 "ctP" = (
 /obj/structure/bed/chair,
 /turf/simulated/floor/wood,
@@ -63465,13 +63384,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/journalistoffice)
-"ctR" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
-/area/journalistoffice)
-"ctS" = (
-/turf/simulated/floor/wood,
-/area/journalistoffice)
 "ctT" = (
 /obj/machinery/light_switch{
 	pixel_x = 24
@@ -63480,9 +63392,6 @@
 /obj/item/glass_jar/peter,
 /turf/simulated/floor/wood,
 /area/journalistoffice)
-"ctU" = (
-/turf/simulated/wall,
-/area/journalistoffice)
 "ctV" = (
 /obj/machinery/door/firedoor,
 /obj/structure/window/reinforced/polarized{
@@ -63540,16 +63449,10 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/wood,
 /area/journalistoffice)
-"cub" = (
-/turf/simulated/floor/wood,
-/area/journalistoffice)
 "cuc" = (
 /obj/structure/closet,
 /turf/simulated/floor/wood,
 /area/journalistoffice)
-"cud" = (
-/turf/simulated/wall,
-/area/journalistoffice)
 "cue" = (
 /obj/machinery/door/firedoor,
 /obj/structure/window/reinforced/polarized{
@@ -63615,9 +63518,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/journalistoffice)
-"cuk" = (
-/turf/simulated/floor/wood,
-/area/journalistoffice)
 "cul" = (
 /obj/machinery/light{
 	dir = 4;
@@ -63626,12 +63526,6 @@
 /obj/structure/filingcabinet/filingcabinet,
 /turf/simulated/floor/wood,
 /area/journalistoffice)
-"cum" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"cun" = (
-/turf/simulated/wall,
-/area/journalistoffice)
 "cuo" = (
 /obj/machinery/requests_console{
 	department = "Journalist's Office";
@@ -63691,27 +63585,6 @@
 /obj/structure/flora/pottedplant/random,
 /turf/simulated/floor/wood,
 /area/journalistoffice)
-"cuv" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"cuw" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"cux" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"cuy" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"cuz" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"cuA" = (
-/turf/simulated/wall,
-/area/journalistoffice)
-"cuB" = (
-/turf/simulated/wall,
-/area/journalistoffice)
 "cuC" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance{
@@ -63719,9 +63592,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/journalistoffice)
-"cuD" = (
-/turf/simulated/wall,
-/area/journalistoffice)
 "cuE" = (
 /turf/simulated/wall,
 /area/journalistoffice)
@@ -63819,15 +63689,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/library)
-"cuM" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/library)
 "cuN" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced{
@@ -63872,35 +63733,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
-"cuR" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/library)
-"cuS" = (
-/obj/structure/table/standard,
-/turf/simulated/floor/wood,
-/area/library)
-"cuT" = (
-/obj/structure/table/standard,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/library)
-"cuU" = (
-/obj/structure/table/standard,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/library)
 "cuV" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
@@ -64032,36 +63864,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
-"cvf" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/library)
-"cvg" = (
-/obj/structure/table/standard,
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/library)
 "cvh" = (
 /obj/structure/window/reinforced{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"cvi" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/carpet,
-/area/library)
 "cvj" = (
 /obj/structure/table/wood,
 /obj/machinery/door/window/westright{
@@ -64070,13 +63878,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"cvk" = (
-/obj/structure/bed/chair/office/light,
-/obj/effect/landmark/start{
-	name = "Librarian"
-	},
-/turf/simulated/floor/carpet,
-/area/library)
 "cvl" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -64104,23 +63905,6 @@
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/tiled/dark,
 /area/library)
-"cvp" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/machinery/door/firedoor,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/library)
-"cvq" = (
-/obj/structure/table/standard,
-/obj/structure/window/reinforced,
-/turf/simulated/floor/wood,
-/area/library)
 "cvr" = (
 /obj/machinery/door/window/southright{
 	name = "Library Display Area";
@@ -64128,14 +63912,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"cvs" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
-/obj/structure/table/standard,
-/turf/simulated/floor/wood,
-/area/library)
 "cvt" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -64268,13 +64044,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"cvK" = (
-/obj/structure/table/wood,
-/obj/machinery/librarypubliccomp{
-	pixel_y = 8
-	},
-/turf/simulated/floor/wood,
-/area/library)
 "cvL" = (
 /obj/structure/table/wood,
 /obj/machinery/librarypubliccomp{
@@ -64311,10 +64080,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/library)
-"cvO" = (
-/obj/structure/bookcase/libraryspawn/religion,
-/turf/simulated/floor/carpet,
-/area/library)
 "cvP" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
@@ -64324,33 +64089,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"cvQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/carpet,
-/area/library)
-"cvR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/carpet,
-/area/library)
-"cvS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/carpet,
-/area/library)
 "cvT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -64379,20 +64117,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"cvW" = (
-/obj/structure/bed/chair/office/light,
-/turf/simulated/floor/wood,
-/area/library)
-"cvX" = (
-/obj/structure/bed/chair/office/light,
-/turf/simulated/floor/wood,
-/area/library)
-"cvY" = (
-/obj/structure/bed/chair/office/light{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/library)
 "cvZ" = (
 /obj/item/device/radio/intercom{
 	dir = 4;
@@ -64405,36 +64129,6 @@
 /obj/structure/bookcase/libraryspawn/religion,
 /turf/simulated/floor/carpet,
 /area/library)
-"cwb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/wood,
-/area/library)
-"cwc" = (
-/obj/structure/bed/chair/office/light,
-/obj/effect/landmark/start{
-	name = "Librarian"
-	},
-/turf/simulated/floor/carpet,
-/area/library)
-"cwd" = (
-/obj/structure/table/wood,
-/turf/simulated/floor/carpet,
-/area/library)
-"cwe" = (
-/obj/structure/table/wood,
-/turf/simulated/floor/carpet,
-/area/library)
-"cwf" = (
-/obj/structure/bed/chair/office/light{
-	dir = 1
-	},
-/turf/simulated/floor/carpet,
-/area/library)
-"cwg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/wood,
-/area/library)
 "cwh" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -64445,15 +64139,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"cwi" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/library)
 "cwj" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -64496,40 +64181,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood,
 /area/library)
-"cwo" = (
-/obj/structure/bed/chair/office/light{
-	dir = 1
-	},
-/turf/simulated/floor/carpet,
-/area/library)
-"cwp" = (
-/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
-/turf/simulated/floor/carpet,
-/area/library)
 "cwq" = (
 /obj/structure/table/wood,
 /turf/simulated/floor/carpet,
 /area/library)
-"cwr" = (
-/obj/structure/bed/chair/office/light{
-	dir = 8
-	},
-/turf/simulated/floor/carpet,
-/area/library)
-"cws" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/wood,
-/area/library)
-"cwt" = (
-/obj/structure/bed/chair/office/light{
-	dir = 1
-	},
-/obj/effect/landmark/start{
-	name = "Librarian"
-	},
-/turf/simulated/floor/carpet,
-/area/library)
 "cwu" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -64550,21 +64205,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/library)
-"cwx" = (
-/obj/structure/bed/chair/office/light,
-/turf/simulated/floor/carpet,
-/area/library)
 "cwy" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/green,
 /turf/simulated/floor/carpet,
 /area/library)
-"cwz" = (
-/obj/structure/bed/chair/office/light{
-	dir = 8
-	},
-/turf/simulated/floor/carpet,
-/area/library)
 "cwA" = (
 /obj/machinery/camera/network/service{
 	c_tag = "Library - East";
@@ -64586,10 +64231,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/library)
-"cwC" = (
-/obj/structure/bookcase/libraryspawn/adult,
-/turf/simulated/floor/wood,
-/area/library)
 "cwD" = (
 /obj/structure/bookcase/libraryspawn/adult,
 /turf/simulated/floor/wood,
@@ -64604,57 +64245,16 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood,
 /area/library)
-"cwF" = (
-/obj/structure/bookcase/libraryspawn/reference,
-/turf/simulated/floor/carpet,
-/area/library)
-"cwG" = (
-/obj/structure/bookcase/libraryspawn/reference,
-/turf/simulated/floor/carpet,
-/area/library)
-"cwH" = (
-/obj/structure/bookcase/libraryspawn/reference,
-/turf/simulated/floor/carpet,
-/area/library)
 "cwI" = (
 /obj/structure/bookcase/libraryspawn/reference,
 /turf/simulated/floor/carpet,
 /area/library)
-"cwJ" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/library)
-"cwK" = (
-/obj/structure/bed/chair/office/light{
-	dir = 8
-	},
-/turf/simulated/floor/carpet,
-/area/library)
 "cwL" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/pill_bottle/dice/gaming,
 /obj/item/weapon/storage/pill_bottle/dice,
 /turf/simulated/floor/carpet,
 /area/library)
-"cwM" = (
-/obj/structure/bed/chair/office/light{
-	dir = 1
-	},
-/turf/simulated/floor/carpet,
-/area/library)
-"cwN" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/library)
 "cwO" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/green,
@@ -64693,12 +64293,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"cwT" = (
-/obj/structure/bed/chair/office/light{
-	dir = 1
-	},
-/turf/simulated/floor/carpet,
-/area/library)
 "cwU" = (
 /obj/structure/table/wood,
 /obj/item/weapon/deck/cards,
@@ -64706,12 +64300,6 @@
 /obj/item/weapon/deck/tarot,
 /turf/simulated/floor/carpet,
 /area/library)
-"cwV" = (
-/obj/structure/bed/chair/office/light{
-	dir = 8
-	},
-/turf/simulated/floor/carpet,
-/area/library)
 "cwW" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced{
@@ -64778,26 +64366,14 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"cxd" = (
-/obj/structure/bookcase/libraryspawn/nonfiction,
-/turf/simulated/floor/carpet,
-/area/library)
 "cxe" = (
 /obj/structure/bookcase/libraryspawn/nonfiction,
 /turf/simulated/floor/carpet,
 /area/library)
-"cxf" = (
-/obj/structure/bookcase/libraryspawn/fiction,
-/turf/simulated/floor/carpet,
-/area/library)
 "cxg" = (
 /obj/structure/bookcase/libraryspawn/fiction,
 /turf/simulated/floor/carpet,
 /area/library)
-"cxh" = (
-/obj/structure/bed/chair/office/light,
-/turf/simulated/floor/carpet,
-/area/library)
 "cxi" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced{
@@ -65006,24 +64582,6 @@
 	temperature = 253.15
 	},
 /area/crew_quarters/kitchen)
-"cxA" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/freezer{
-	name = "freezer storage tiles";
-	temperature = 253.15
-	},
-/area/crew_quarters/kitchen)
-"cxB" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/freezer{
-	name = "freezer storage tiles";
-	temperature = 253.15
-	},
-/area/crew_quarters/kitchen)
 "cxC" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -65127,10 +64685,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
-"cxK" = (
-/obj/structure/lattice/catwalk,
-/turf/simulated/open,
-/area/maintenance/disposal)
 "cxL" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/sign/drop{
@@ -94931,9 +94485,9 @@ bUz
 bPO
 bPK
 cbD
-cxK
+cxN
 ccf
-cxK
+cxN
 cdh
 aaa
 aab
@@ -95404,9 +94958,9 @@ aVI
 aXq
 bEu
 cuL
-cuR
-cuR
-cvp
+cwW
+cwW
+cxi
 bFv
 bFv
 bFv
@@ -95660,17 +95214,17 @@ bxs
 bCz
 bDu
 bEt
-cuM
-cuS
-cvg
-cvq
+cuN
+cwX
+afA
+afB
 cvy
 bGy
 cvN
 cvZ
 bGy
 bFv
-cwC
+cwD
 cwQ
 cwZ
 bPI
@@ -95917,17 +95471,17 @@ bxs
 bCA
 aXt
 bEt
-cuM
-cuT
+cuN
+aeG
 bGA
 cvr
 bKA
 bGy
-cvO
-cvO
+cwa
+cwa
 bGy
 bFv
-cwC
+cwD
 cwR
 cxa
 bPI
@@ -96175,9 +95729,9 @@ bCB
 bDv
 cuH
 bFx
-cuU
+afz
 cvh
-cvs
+afO
 bKA
 bGy
 bGy
@@ -96433,18 +95987,18 @@ cuG
 cuI
 cuO
 cuV
-cvi
-cvi
+cvt
+cvt
 cvz
 cvE
 cvP
-cwb
-cwb
+cwn
+cwn
 cwv
 cwE
 cwS
 cxc
-cwJ
+cxj
 bPI
 bRS
 cxs
@@ -96694,19 +96248,19 @@ bGy
 bGy
 bGA
 cvF
-cvQ
-cvk
-cwf
+cvT
+afP
+afU
 bGy
-cwF
+cwI
 bGy
-cxd
+cxe
 bGy
 bPI
 cxo
 cxt
 bRS
-cxA
+cxC
 cxG
 bPI
 bPJ
@@ -96891,13 +96445,13 @@ aja
 aja
 aja
 aja
-crQ
+cth
 crZ
-crQ
-csr
-csr
-csr
-csr
+cth
+cti
+cti
+cti
+cti
 asw
 auk
 avI
@@ -96951,19 +96505,19 @@ bGA
 bGA
 bGA
 bGA
-cvQ
-cwd
-cwp
+cvT
+cwq
+cwy
 bGy
-cwF
+cwI
 bGy
-cxd
+cxe
 bGy
 bPI
 cxp
 cxu
 bRS
-cxA
+cxC
 bTf
 bPI
 bPJ
@@ -97154,7 +96708,7 @@ csj
 cst
 csD
 csO
-csr
+cti
 asx
 auk
 avJ
@@ -97208,19 +96762,19 @@ cvj
 cvu
 cvA
 bKx
-cvQ
-cwd
-cwd
+cvT
+cwq
+cwq
 bGy
-cwF
+cwI
 bGy
-cxf
+cxg
 bGy
 bPI
 cxq
 bRw
 bRT
-cxA
+cxC
 bTh
 bPI
 bPJ
@@ -97407,10 +96961,10 @@ cmy
 crO
 crS
 csb
-crU
-crU
-crU
-crU
+csP
+csP
+csP
+csP
 ctb
 asy
 aul
@@ -97461,17 +97015,17 @@ bDA
 cuJ
 bFv
 cuZ
-cvk
+afP
 bGy
 cvB
 cvG
-cvQ
-cwf
-cwr
+cvT
+afU
+afV
 bGy
-cwF
+cwI
 bGy
-cxf
+cxg
 cxk
 bPI
 bPI
@@ -97723,10 +97277,10 @@ bGy
 cvC
 cvH
 cvU
-cwg
-cwg
-cwg
-cwJ
+cww
+cww
+cww
+cxj
 bGA
 bGA
 bGA
@@ -97919,13 +97473,13 @@ crF
 cmA
 cmA
 cmH
-crU
+csP
 csd
 csm
 csw
 csG
 csR
-csr
+cti
 asA
 aum
 avK
@@ -97982,9 +97536,9 @@ cvI
 cvV
 cwh
 bGy
-cwx
-cwr
-cwf
+afR
+afW
+afU
 bGy
 cxl
 bFv
@@ -98182,7 +97736,7 @@ csn
 csx
 csH
 csS
-csr
+cti
 asB
 aun
 avM
@@ -98236,13 +97790,13 @@ cvm
 bFv
 bFv
 cvJ
-cvW
-cwi
-cwt
-cwp
+afS
+cwj
+afP
+cwy
 cwL
 cwU
-cwx
+afU
 bOJ
 bFv
 bMj
@@ -98425,7 +97979,7 @@ aaV
 adW
 aeC
 aja
-crf
+crg
 crl
 crs
 crA
@@ -98439,7 +97993,7 @@ cso
 csy
 csI
 csT
-crQ
+cth
 asC
 auo
 avN
@@ -98492,13 +98046,13 @@ cvc
 cvn
 bII
 bFv
-cvK
-cvW
-cwi
+cvL
+afQ
+cwj
 bGy
-cwr
-cwf
-cwr
+afW
+afR
+afW
 bGy
 cxm
 bFv
@@ -98692,9 +98246,9 @@ cmC
 cmI
 crX
 csg
-csp
-csp
-csp
+csJ
+csJ
+csJ
 csU
 ctg
 cnQ
@@ -98749,8 +98303,8 @@ cvd
 bHR
 cvw
 bFv
-cvK
-cvY
+cvL
+afT
 cwk
 cwu
 cwA
@@ -98939,12 +98493,12 @@ aaV
 adY
 clC
 aja
-crf
+crg
 crm
 cru
-crC
+crN
 cmD
-crC
+crN
 cmD
 aja
 crY
@@ -98953,7 +98507,7 @@ csq
 csA
 csK
 csV
-crQ
+cth
 asE
 aup
 avK
@@ -99011,9 +98565,9 @@ bFv
 cwl
 bFv
 cwB
-cuR
-cuR
-cvp
+cwW
+cwW
+cxi
 bFv
 bFv
 bPJ
@@ -99206,11 +98760,11 @@ afe
 afe
 afe
 afe
-csr
-csr
+cti
+cti
 csL
 csW
-csr
+cti
 asF
 aun
 avM
@@ -102565,13 +102119,13 @@ asL
 axP
 aLc
 axP
-ctu
+cuE
 ctD
-ctM
-ctM
+ctV
+ctV
 cue
-ctu
-ctu
+cuE
+cuE
 aYW
 bah
 bbv
@@ -102822,13 +102376,13 @@ asL
 aJs
 aLc
 aMV
-ctu
-ctE
+cuE
+cuu
 ctN
 ctW
 cuf
 cuo
-ctu
+cuE
 aYX
 bah
 bbw
@@ -103079,13 +102633,13 @@ asL
 axP
 aLd
 aMW
-ctu
-ctF
-ctF
+cuE
+cut
+cut
 ctX
 cug
 cup
-ctu
+cuE
 aYY
 bah
 bbx
@@ -103337,12 +102891,12 @@ aJt
 aLe
 aMX
 ctx
-ctF
+cut
 ctP
 ctY
 cuh
 cuq
-ctu
+cuE
 aYY
 bah
 bby
@@ -103599,7 +103153,7 @@ ctQ
 ctZ
 cui
 cur
-ctu
+cuE
 aYY
 bah
 bbz
@@ -103852,11 +103406,11 @@ aLf
 aMZ
 ctz
 ctI
-ctR
-ctR
+cua
+cua
 cuj
 cus
-ctu
+cuE
 aYZ
 bah
 bbA
@@ -104109,10 +103663,10 @@ aLg
 aNa
 ctA
 ctJ
-ctF
-ctF
-ctF
-ctF
+cut
+cut
+cut
+cut
 cuC
 aYY
 bah
@@ -104369,8 +103923,8 @@ ctK
 ctT
 cuc
 cul
-ctE
-ctu
+cuu
+cuE
 aZa
 bah
 bbC
@@ -104621,13 +104175,13 @@ aGb
 awc
 aLh
 ctt
-ctu
-ctu
-ctu
-ctu
-ctu
-ctu
-ctu
+cuE
+cuE
+cuE
+cuE
+cuE
+cuE
+cuE
 aZb
 bah
 bbD
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 87ff60e9ab9..d0291fb2c48 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -5754,9 +5754,6 @@
 "ks" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /obj/effect/floor_decal/industrial/warning/cee,
-/obj/machinery/light{
-	dir = 8
-	},
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
 "kt" = (
@@ -19321,17 +19318,14 @@
 /turf/simulated/floor/plating,
 /area/mine/explored)
 "JI" = (
-/obj/machinery/alarm{
-	dir = 4;
-	icon_state = "alarm0";
-	pixel_x = -22;
-	pixel_y = 0
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/corner/red{
 	icon_state = "corner_white";
 	dir = 9
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/exit)
 "JJ" = (
@@ -19401,6 +19395,16 @@
 /obj/machinery/space_heater,
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/exit)
+"JQ" = (
+/obj/effect/floor_decal/corner/red/full,
+/obj/machinery/alarm{
+	dir = 4;
+	icon_state = "alarm0";
+	pixel_x = -22;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/secondary/exit)
 
 (1,1,1) = {"
 aa
@@ -48035,7 +48039,7 @@ jx
 kr
 Jf
 lB
-kZ
+JQ
 lb
 Jz
 Jz