Semi random changes PR + #610 follow-up

_maps/map_files/ALV Belryth/ALV Belryth.dmm

@@ -682,7 +682,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/firehead,
 /obj/machinery/door/bulkhead/command{
-	name = "Chief Medical Officer's Quarters"
+	name = "Head Physician's Office"
 	},
 /obj/effect/mapping_helpers/bulkhead/access/all/medical/cmo,
 /obj/structure/cable,
@@ -873,7 +873,7 @@
 /area/station/maintenance/department/crew_quarters/dorms)
 "avi" = (
 /obj/machinery/door/bulkhead/command{
-	name = "Captain's Quarters";
+	name = "Shipmaster's Quarters";
 	dir = 8
 	},
 /obj/effect/mapping_helpers/bulkhead/access/all/command/captain,
@@ -3970,7 +3970,7 @@
 /area/station/commons/lounge)
 "bNt" = (
 /obj/machinery/door/bulkhead/command{
-	name = "Head of Personnel's Office"
+	name = "Executive Officer's Office"
 	},
 /obj/effect/mapping_helpers/bulkhead/access/all/command/hop,
 /obj/machinery/door/firehead,
@@ -4661,6 +4661,11 @@
 	dir = 8
 	},
 /obj/effect/mapping_helpers/paint_wall/security,
+/obj/machinery/door/poddoor/shutters{
+	id = "hosshutter";
+	name = "Privacy Shutters";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/station/security/office)
 "chw" = (
@@ -6673,7 +6678,7 @@
 /obj/effect/mapping_helpers/bulkhead/access/all/supply/qm,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/bulkhead/command{
-	name = "Quartermaster's Office";
+	name = "Logistics Manager's Office";
 	dir = 4
 	},
 /obj/structure/cable,
@@ -11705,15 +11710,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/iron/dark/textured,
 /area/station/cargo/lobby)
-"fpM" = (
-/obj/machinery/door/poddoor/shutters{
-	id = "evashutters";
-	name = "E.V.A. Storage Shutters"
-	},
-/obj/machinery/door/firehead,
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
 "fpS" = (
 /obj/effect/mapping_helpers/paint_wall/security,
 /turf/closed/wall/r_wall,
@@ -14137,8 +14133,8 @@
 /turf/open/floor/plating,
 /area/station/maintenance/department/crew_quarters/dorms)
 "gmF" = (
-/obj/machinery/door/bulkhead/command{
-	name = "Head of Security's Quarters"
+/obj/machinery/door/bulkhead/command/head_of_security{
+	name = "Colonel's Quarters"
 	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -15289,7 +15285,7 @@
 /obj/effect/mapping_helpers/bulkhead/access/all/engineering/ce,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/bulkhead/command/chief_engineer{
-	name = "Chief Engineer's Office"
+	name = "Lead Technician's Office"
 	},
 /turf/open/floor/iron/dark/textured,
 /area/station/command/heads_quarters/ce)
@@ -16054,7 +16050,7 @@
 "hjp" = (
 /obj/machinery/door/firehead,
 /obj/machinery/door/bulkhead/command{
-	name = "Captain's Office"
+	name = "Shipmaster's Office"
 	},
 /obj/effect/mapping_helpers/bulkhead/access/all/command/captain,
 /obj/structure/cable,
@@ -21188,12 +21184,12 @@
 /turf/open/floor/iron/smooth,
 /area/station/security/desk)
 "jgk" = (
-/obj/machinery/door/bulkhead/security{
-	name = "Secure Armoury"
-	},
 /obj/effect/mapping_helpers/bulkhead/access/all/security/armory,
 /obj/machinery/door/firehead,
 /obj/effect/turf_decal/delivery,
+/obj/machinery/door/bulkhead/command/head_of_security{
+	name = "Secure Armoury"
+	},
 /turf/open/floor/iron/dark/textured,
 /area/station/ai_monitored/security/armory)
 "jgO" = (
@@ -22587,7 +22583,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/bulkhead/command/chief_engineer{
-	name = "Chief Engineer's Office"
+	name = "Lead Technician's Office"
 	},
 /turf/open/floor/iron/dark/textured,
 /area/station/command/heads_quarters/ce)
@@ -28125,8 +28121,8 @@
 /turf/open/floor/plating,
 /area/station/maintenance/department/pathfinders/greater)
 "mcC" = (
-/obj/machinery/door/bulkhead/command{
-	name = "Head of Security's Quarters"
+/obj/machinery/door/bulkhead/command/head_of_security{
+	name = "Colonel's Quarters"
 	},
 /turf/open/floor/carpet/royalblack,
 /area/station/command/heads_quarters/hos)
@@ -30464,9 +30460,9 @@
 /turf/open/floor/carpet/green,
 /area/station/security/detectives_office)
 "mVs" = (
-/obj/machinery/door/bulkhead/security{
-	name = "Armoury";
-	dir = 4
+/obj/machinery/door/bulkhead/command/head_of_security{
+	dir = 4;
+	name = "Armoury"
 	},
 /obj/effect/mapping_helpers/bulkhead/access/all/security/armory,
 /obj/effect/turf_decal/delivery,
@@ -31723,7 +31719,7 @@
 	dir = 8
 	},
 /obj/machinery/door/bulkhead/command{
-	name = "Chief Medical Officer's Quarters";
+	name = "Head Physician's Quarters";
 	dir = 4
 	},
 /obj/effect/mapping_helpers/bulkhead/access/all/medical/cmo,
@@ -31775,7 +31771,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/firehead,
 /obj/machinery/door/bulkhead/command{
-	name = "Chief Medical Officer's Quarters"
+	name = "Head Physician's Office"
 	},
 /obj/effect/mapping_helpers/bulkhead/access/all/medical/cmo,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -33317,7 +33313,7 @@
 /obj/effect/turf_decal/delivery/engi,
 /obj/machinery/door/firehead,
 /obj/machinery/door/bulkhead/command/chief_engineer{
-	name = "Chief Engineer's Quarters"
+	name = "Lead Technician's Quarters"
 	},
 /turf/open/floor/iron/dark/textured,
 /area/station/command/heads_quarters/ce)
@@ -36383,7 +36379,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/firehead,
 /obj/machinery/door/bulkhead/command{
-	name = "Quartermaster's Quarters"
+	name = "Logistics Manager's Quarters"
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -38715,6 +38711,11 @@
 "qqH" = (
 /obj/effect/turf_decal/box,
 /obj/machinery/suit_storage_unit/hardsuit/hos,
+/obj/machinery/button/door/directional/west{
+	id = "hosshutter";
+	name = "Privacy Shutter Toggle";
+	pixel_y = 6
+	},
 /turf/open/floor/iron/dark/textured,
 /area/station/command/heads_quarters/hos)
 "qqW" = (
@@ -40841,12 +40842,13 @@
 "rkn" = (
 /obj/effect/mapping_helpers/bulkhead/access/all/security/hos,
 /obj/effect/turf_decal/delivery,
-/obj/machinery/door/bulkhead/command/glass{
-	dir = 4
-	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/bulkhead/command/head_of_security{
+	dir = 4;
+	name = "Colonel's Office"
+	},
 /turf/open/floor/iron/dark/textured,
 /area/station/security/office)
 "rkw" = (
@@ -45468,13 +45470,15 @@
 /turf/open/floor/iron/dark/textured,
 /area/station/maintenance/department/medical/central)
 "tla" = (
-/obj/machinery/door/bulkhead/maintenance,
 /obj/machinery/door/firehead,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/door/bulkhead/command{
+	name = "Maintenance Access"
+	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/command)
 "tln" = (
@@ -47589,24 +47593,6 @@
 	},
 /turf/open/floor/iron/white/small,
 /area/station/pathfinders/storage)
-"ucn" = (
-/obj/structure/curtain/cloth/fancy/mechanical/start_closed{
-	desc = "A set of curtains serving as a fancy theater backdrop. They can only be opened by a button.";
-	id = "theater_curtains";
-	name = "Theater Curtains"
-	},
-/obj/machinery/light/floor,
-/obj/machinery/door/firehead{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/orange/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/orange/line{
-	dir = 4
-	},
-/turf/open/floor/iron/dark/textured,
-/area/station/service/theater)
 "ucs" = (
 /obj/effect/turf_decal/trimline/red/filled/line,
 /obj/effect/turf_decal/stripes/line,
@@ -50951,7 +50937,7 @@
 /turf/open/floor/iron/dark/textured,
 /area/station/engineering/gravity_generator)
 "vAT" = (
-/obj/machinery/door/bulkhead/security{
+/obj/machinery/door/bulkhead/command/head_of_security{
 	name = "Armoury"
 	},
 /obj/effect/mapping_helpers/bulkhead/access/all/security/armory,
@@ -54836,7 +54822,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/door/bulkhead/command/chief_engineer{
 	dir = 4;
-	name = "Chief Engineer's Quarters"
+	name = "Lead Technician's Quarters"
 	},
 /turf/open/floor/iron/dark/textured,
 /area/station/command/heads_quarters/ce)
@@ -55016,7 +55002,7 @@
 /area/station/command/internal_affairs_office)
 "xmN" = (
 /obj/machinery/door/bulkhead/command{
-	name = "Head of Personnel's Quarters";
+	name = "Executive Officer's Quarters";
 	dir = 4
 	},
 /obj/machinery/door/firehead{
@@ -151036,11 +151022,11 @@ bFv
 ycj
 dny
 djB
-ucn
 cHc
 cHc
 cHc
-ucn
+cHc
+cHc
 djB
 pDE
 iTx
@@ -226592,7 +226578,7 @@ ihb
 gHl
 nTb
 vrh
-fpM
+hRz
 pVk
 uSZ
 bse

code/game/area/areas/station.dm

@@ -465,37 +465,37 @@
 	icon_state = "heads_quarters"
 
 /area/station/command/heads_quarters/captain
-	name = "\improper Captain's Office"
+	name = "\improper Shipmaster's Office"
 	icon_state = "captain"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/station/command/heads_quarters/captain/private
-	name = "\improper Captain's Quarters"
+	name = "\improper Shipmaster's Quarters"
 	icon_state = "captain_private"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/station/command/heads_quarters/ce
-	name = "\improper Chief Engineer's Office"
+	name = "\improper Lead Technician's Office"
 	icon_state = "ce_office"
 
 /area/station/command/heads_quarters/cmo
-	name = "\improper Chief Medical Officer's Office"
+	name = "\improper Head Physician's Office"
 	icon_state = "cmo_office"
 
 /area/station/command/heads_quarters/hop
-	name = "\improper Head of Personnel's Office"
+	name = "\improper Executive Officer's Office"
 	icon_state = "hop_office"
 
 /area/station/command/heads_quarters/hos
-	name = "\improper Head of Security's Office"
+	name = "\improper Colonel's Office"
 	icon_state = "hos_office"
 
 /area/station/command/heads_quarters/rd
 	name = "\improper Research Director's Office"
 	icon_state = "rd_office"
 
 /area/station/command/heads_quarters/qm
-	name = "\improper Quartermaster's Office"
+	name = "\improper Logistics Manager's Office"
 	icon_state = "qm_office"
 
 /area/station/command/heads_quarters/pl

code/game/machinery/doors/bulkhead_types.dm

@@ -14,11 +14,17 @@
 	bulkhead_paint = "#F6F6F6"
 	stripe_paint = "#BB8425"
 
+/obj/machinery/door/bulkhead/command/head_of_security
+	assemblytype = /obj/structure/door_assembly/door_assembly_com/hos
+	normal_integrity = 450
+	bulkhead_paint = "#F6F6F6"
+	stripe_paint = "#7F2820"
+
 /obj/machinery/door/bulkhead/security
 	assemblytype = /obj/structure/door_assembly/door_assembly_sec
 	normal_integrity = 450
-	bulkhead_paint = "#9F2828"
-	stripe_paint = "#D27428"
+	bulkhead_paint = "#7F2820"
+	stripe_paint = "#1E2425"
 
 /obj/machinery/door/bulkhead/engineering
 	assemblytype = /obj/structure/door_assembly/door_assembly_eng
@@ -124,6 +130,11 @@
 	glass = TRUE
 	normal_integrity = 400
 
+/obj/machinery/door/bulkhead/command/head_of_security/glass
+	opacity = FALSE
+	glass = TRUE
+	normal_integrity = 400
+
 /obj/machinery/door/bulkhead/engineering/glass
 	opacity = FALSE
 	glass = TRUE

code/game/objects/effects/decals/turfdecal/markings.dm

@@ -238,7 +238,7 @@
 	icon_state = "siding_end"
 
 /obj/effect/turf_decal/siding/red
-	color = "#DE3A3A"
+	color = "#912e25"
 
 /obj/effect/turf_decal/siding/red/corner
 	icon_state = "siding_corner"

code/game/objects/effects/spawners/random/trash.dm

@@ -69,7 +69,6 @@
 	name = "botanical waste spawner"
 	icon_state = "peel"
 	loot = list(
-		/obj/item/grown/bananapeel = 6,
 		/obj/item/grown/corncob = 3,
 		/obj/item/food/grown/bungopit = 1,
 	)