Various fixes part 2. Electric boogaloo :

_maps/RandomRuins/SpaceRuins/oldstation.dmm

@@ -4847,10 +4847,13 @@
 /area/ruin/space/ancientstation/beta/medbay)
 "ui" = (
 /obj/effect/decal/cleanable/shreds,
-/obj/structure/alien/weeds,
 /obj/structure/closet/crate/secure/science{
 	req_access = list("away_science")
 	},
+/obj/item/encryptionkey/headset_uncommon,
+/obj/item/encryptionkey/headset_uncommon,
+/obj/item/encryptionkey/headset_uncommon,
+/obj/structure/alien/weeds,
 /obj/item/transfer_valve,
 /obj/item/raw_anomaly_core/bluespace,
 /obj/item/raw_anomaly_core/random,
@@ -8624,13 +8627,13 @@
 /turf/open/floor/iron/solarpanel/airless,
 /area/ruin/space/solars/ancientstation/charlie/solars)
 "Uh" = (
-/obj/machinery/power/supermatter_crystal/shard,
 /obj/structure/closet/crate/engineering{
 	name = "supermatter shard crate";
 	secure = 1;
 	locked = 1;
 	icon_state = "engi_secure_crate"
 	},
+/obj/machinery/power/supermatter_crystal/shard/oldstation,
 /turf/open/floor/iron/white/textured,
 /area/ruin/space/ancientstation/delta/proto)
 "Uj" = (

_maps/map_files/Theseus/Theseus.dmm

@@ -4443,6 +4443,15 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/range)
+"bqW" = (
+/obj/effect/turf_decal/tile/neutral/full,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/closet/emcloset,
+/turf/open/floor/iron,
+/area/station/security/processing)
 "brm" = (
 /obj/machinery/chem_master/condimaster{
 	name = "CondiMaster Neo"
@@ -9450,7 +9459,6 @@
 /obj/machinery/door/airlock/external{
 	name = "Gulag Shuttle Airlock"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/security/brig,
 /turf/open/floor/plating,
 /area/station/security/processing)
 "cQj" = (
@@ -19743,10 +19751,6 @@
 /turf/open/floor/iron,
 /area/station/construction)
 "fVH" = (
-/obj/machinery/computer/prisoner/gulag_teleporter_computer{
-	dir = 8
-	},
-/obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 4
 	},
@@ -19756,6 +19760,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/gulag_teleporter,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/directional/east,
 /turf/open/floor/iron,
 /area/station/security/processing)
 "fVQ" = (
@@ -21898,21 +21905,16 @@
 /turf/open/floor/iron/dark,
 /area/station/security/warden)
 "gFe" = (
-/obj/machinery/gulag_teleporter,
-/obj/effect/turf_decal/bot,
-/obj/machinery/gulag_item_reclaimer{
-	pixel_x = 31
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/neutral/half{
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/station/security/processing)
 "gFf" = (
@@ -33984,6 +33986,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/spawner/xmastree,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "kgT" = (
@@ -42128,13 +42131,15 @@
 /turf/closed/wall,
 /area/station/commons/fitness/recreation/entertainment)
 "mxA" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/delivery,
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 6
 	},
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
+/obj/machinery/computer/prisoner/gulag_teleporter_computer{
+	dir = 8
+	},
+/obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/station/security/processing)
 "mxD" = (
@@ -55293,12 +55298,13 @@
 /area/station/hallway/primary/central/fore)
 "qtB" = (
 /obj/structure/table,
-/obj/item/knife{
+/obj/item/knife/kitchen{
 	pixel_x = -1;
 	pixel_y = 5
 	},
-/obj/item/knife{
-	pixel_x = -10
+/obj/item/knife/kitchen{
+	pixel_x = -10;
+	pixel_y = 0
 	},
 /obj/item/reagent_containers/cup/rag{
 	pixel_y = 5;
@@ -58457,6 +58463,17 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/central)
+"roL" = (
+/obj/machinery/door/airlock/security,
+/obj/effect/mapping_helpers/airlock/access/all/security/brig,
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/red/filled/end{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/station/maintenance/port/fore)
 "rpb" = (
 /turf/open/floor/engine/plasma,
 /area/station/engineering/atmos)
@@ -67254,7 +67271,6 @@
 /turf/open/floor/carpet,
 /area/station/hallway/secondary/exit/departure_lounge)
 "tQX" = (
-/obj/item/kirbyplants/random,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
@@ -67263,6 +67279,10 @@
 	},
 /obj/structure/cable,
 /obj/machinery/camera/directional/east,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/gulag_item_reclaimer{
+	pixel_x = 31
+	},
 /turf/open/floor/iron,
 /area/station/security/processing)
 "tQY" = (
@@ -77835,7 +77855,6 @@
 /obj/machinery/door/airlock/external{
 	name = "Gulag Shuttle Airlock"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/security/brig,
 /obj/machinery/light/floor/has_bulb,
 /turf/open/floor/plating,
 /area/station/security/processing)
@@ -109295,7 +109314,7 @@ fTB
 ctl
 fTB
 rtt
-cze
+bqW
 mBO
 gxT
 xhM
@@ -110066,7 +110085,7 @@ ijL
 ijL
 ijL
 ijL
-ijL
+roL
 ijL
 ijL
 xhM

code/datums/id_trim/jobs.dm

@@ -175,7 +175,7 @@
 	template_access = list(
 		ACCESS_CAPTAIN,
 		ACCESS_CHANGE_IDS,
-		ACCESS_QM,
+		ACCESS_HOP,
 	)
 	job = /datum/job/bitrunner
 

code/modules/research/techweb/all_nodes.dm

@@ -533,7 +533,6 @@
 	design_ids = list(
 		"surgery_heal_brute_upgrade",
 		"surgery_heal_burn_upgrade",
-		"surgery_heal_robot_upgrade", // monkestation edit: robot surgeries
 		"surgery_filter_upgrade", // monke edit: improved blood filter surgery
 	)
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
@@ -547,7 +546,6 @@
 	design_ids = list(
 		"surgery_heal_brute_upgrade_femto",
 		"surgery_heal_burn_upgrade_femto",
-		"surgery_heal_robot_upgrade_femto", // monkestation edit: robot surgeries
 		"surgery_heal_combo",
 		"surgery_lobotomy",
 		"surgery_wing_reconstruction",

monkestation/code/game/objects/items/devices/radio/encryptionkey.dm

@@ -8,3 +8,10 @@
 /obj/item/encryptionkey/headset_uncommon
 	name = "dusty encryption key"
 	channels = list(RADIO_CHANNEL_UNCOMMON = 1)
+
+/obj/item/encryptionkey/heads/blueshield
+	name = "\proper the blueshield's encryption key"
+	icon_state = "cypherkey_centcom"
+	channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1)
+	greyscale_config = /datum/greyscale_config/encryptionkey_centcom
+	greyscale_colors = "#1d2657#dca01b"

monkestation/code/modules/blueshield/clothing.dm

@@ -204,7 +204,7 @@
 /obj/item/radio/headset/headset_bs
 	name = "\proper the blueshield's headset"
 	desc = "The headset of the guy who keeps the administration alive."
-	icon = 'monkestation/code/modules/blueshield/icons/radio.dmi'
+	icon = 'monkestation/icons/obj/radio.dmi'
 	worn_icon = 'monkestation/code/modules/blueshift/icons/mob/clothing/ears.dmi'
 	icon_state = "bshield_headset"
 	worn_icon_state = "bshield_headset"

monkestation/code/modules/blueshield/devices/sensor.dm

@@ -1,7 +1,7 @@
 /obj/item/sensor_device/blueshield
 	name = "blueshield's handheld monitor"
 	desc = "A unique model of handheld crew monitor that seems to have been customized for Executive Protection purposes."
-	icon = 'monkestation/code/modules/blueshield/icons/device.dmi'
+	icon = 'monkestation/icons/obj/device.dmi'
 	icon_state = "blueshield_scanner"
 
 /obj/item/sensor_device/blueshield/attack_self(mob/user)

monkestation/code/modules/blueshield/gun.dm

@@ -104,7 +104,7 @@
 	burst_size = 4
 	fire_delay = 1
 
-	icon = 'monkestation/code/modules/blueshield/icons/gun.dmi'
+	icon = 'monkestation/icons/obj/weapons/guns/tech9.dmi'
 	icon_state = "tech9"
 
 	fire_sound = 'monkestation/code/modules/blueshift/sounds/pistol_light.ogg'

monkestation/code/modules/blueshield/modsuit/suit.dm

@@ -1,6 +1,6 @@
 /obj/item/mod/control/pre_equipped/blueshield
-	worn_icon = 'monkestation/code/modules/blueshield/icons/worn_praetorian.dmi'
-	icon = 'monkestation/code/modules/blueshield/icons/praetorian.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/worn_modsuit.dmi'
+	icon = 'monkestation/icons/obj/clothing/modsuits/modsuit.dmi'
 	icon_state = "praetorian-control"
 	theme = /datum/mod_theme/blueshield
 	applied_cell = /obj/item/stock_parts/cell/high

monkestation/code/modules/blueshield/modsuit/theme.dm

@@ -22,8 +22,8 @@
 	)
 	skins = list(
 		"praetorian" = list(
-			MOD_ICON_OVERRIDE = 'monkestation/code/modules/blueshield/icons/praetorian.dmi',
-			MOD_WORN_ICON_OVERRIDE = 'monkestation/code/modules/blueshield/icons/worn_praetorian.dmi',
+			MOD_ICON_OVERRIDE = 'monkestation/icons/obj/clothing/modsuits/modsuit.dmi',
+			MOD_WORN_ICON_OVERRIDE = 'monkestation/icons/mob/clothing/worn_modsuit.dmi',
 			HELMET_FLAGS = list(
 				UNSEALED_LAYER = null,
 				UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,

monkestation/code/modules/jobs/departments/departments.dm

@@ -0,0 +1,15 @@
+/datum/job_department/central_command
+	department_name = DEPARTMENT_CENTRAL_COMMAND
+	department_bitflags = DEPARTMENT_BITFLAG_CENTRAL_COMMAND
+	department_head = /datum/job/captain
+	department_experience_type = EXP_TYPE_CENTRAL_COMMAND
+	display_order = 1
+	label_class = "command"
+	ui_color = "#86ff82"
+
+/datum/job_department/late
+	department_name = DEPARTMENT_LATE
+	department_bitflags = DEPARTMENT_BITFLAG_LATE
+	display_order = 10
+	label_class = "latejoin"
+	ui_color = "#0b6b2b"

monkestation/code/modules/blueshield/job.dm → monkestation/code/modules/jobs/job_types/blueshield.dm

@@ -77,12 +77,3 @@
 
 	head = /obj/item/clothing/head/helmet/space/plasmaman/blueshield
 	uniform = /obj/item/clothing/under/plasmaman/blueshield
-
-/datum/job_department/central_command
-	department_name = DEPARTMENT_CENTRAL_COMMAND
-	department_bitflags = DEPARTMENT_BITFLAG_CENTRAL_COMMAND
-	department_head = /datum/job/captain
-	department_experience_type = EXP_TYPE_CENTRAL_COMMAND
-	display_order = 1
-	label_class = "command"
-	ui_color = "#86ff82"

monkestation/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm

@@ -2,3 +2,10 @@
 	name = "Reminder - air distrubtion."
 	default_raw_text = "<b>Reminder!</b><br><br>Blue on layer 4 is for air.<br> Red on layer 2 is for the scrubbers.<br><br>\
 	The dispenser prints our pipes with this in mind so they dont get accidentally connected. Doesn't matter if 'purple is a pretty colour', it won't connect."
+
+/obj/machinery/power/supermatter_crystal/shard/oldstation
+	name = "Worn Supermatter Shard"
+	desc = "This shard has lost some of its lustrous shine."
+	radio_key = /obj/item/encryptionkey/headset_uncommon
+	emergency_channel = "Uncommon"
+	warning_channel = "Uncommon"

monkestation/code/modules/research/techweb/all_nodes.dm

@@ -350,3 +350,22 @@
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500)
 	hidden = TRUE
 
+/datum/techweb_node/improved_robotic_tend_wounds
+	id = "improved_robotic_surgery"
+	display_name = "Improved Robotic Repair Surgeries"
+	description = "As it turns out, you don't actually need to cut out entire support rods if it's just scratched!"
+	prereq_ids = list("engineering")
+	design_ids = list(
+		"surgery_heal_robot_upgrade",
+	)
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 900)
+
+/datum/techweb_node/advanced_robotic_tend_wounds
+	id = "advanced_robotic_surgery"
+	display_name = "Advanced Robotic Surgeries"
+	description = "Did you know Hephaestus actually has a free online tutorial for synthetic trauma repairs? It's true!"
+	prereq_ids = list("improved_robotic_surgery")
+	design_ids = list(
+		"surgery_heal_robot_upgrade_femto",
+	)
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1300) // less expensive than the organic surgery research equivalent since its JUST tend wounds