OM Office Remap (#20935)

partly continues the work in my merge conflict ridden offices remap, but
just for the OM this time around.


![image](https://github.com/user-attachments/assets/ba5ed18c-c4f2-42fe-a946-e5408150f238)
This commit is contained in:
beepbopbeepbop
2025-07-10 21:40:13 +00:00
committed by GitHub
parent 6021ed948f
commit b7849ebd15
4 changed files with 229 additions and 115 deletions
-1
View File
@@ -369,7 +369,6 @@
uniform = /obj/item/clothing/under/rank/operations_manager
shoes = /obj/item/clothing/shoes/sneakers/brown
id = /obj/item/card/id/silver
l_hand = /obj/item/clipboard
glasses = /obj/item/clothing/glasses/sunglasses
tab_pda = /obj/item/modular_computer/handheld/pda/supply/om
@@ -14,10 +14,8 @@
new /obj/item/device/radio/headset/operations_manager(src)
new /obj/item/device/radio/headset/operations_manager/alt(src)
new /obj/item/storage/box/fancy/keypouch/cargo(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/suit/fire(src)
new /obj/item/tank/emergency_oxygen(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/glasses/welding(src)
new /obj/item/clothing/head/softcap/cargo(src)
new /obj/item/clothing/head/bandana/cargo(src)
new /obj/item/clothing/head/beret/cargo(src)
@@ -26,11 +24,13 @@
new /obj/item/device/orbital_dropper/drill(src)
new /obj/item/device/megaphone/cargo(src)
new /obj/item/storage/stickersheet/goldstar(src)
new /obj/item/device/flashlight/marshallingwand(src)
new /obj/item/gun/energy/disruptorpistol/miniature(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/storage/belt/utility/full(src)
new /obj/item/device/multitool(src)
new /obj/item/device/memorywiper(src)
new /obj/item/device/price_scanner(src)
new /obj/item/device/robotanalyzer(src)
// Hangar Technician
/obj/structure/closet/secure_closet/hangar_tech
@@ -0,0 +1,59 @@
################################
# 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
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################
# Your name.
author: notagonk
# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Remaps the Operations Manager's office to a modern standard, including their locker contents."
- qol: "Instead of spawning with a clipboard, the Operations Manager can now find it in their office."
+165 -109
View File
@@ -1027,26 +1027,17 @@
/turf/unsimulated/floor/plating,
/area/antag/mercenary)
"agE" = (
/obj/structure/table/standard,
/obj/machinery/light{
dir = 8
},
/obj/item/modular_computer/laptop/preset/supply/om,
/obj/item/stamp/denied{
pixel_x = 5;
pixel_y = 13
},
/obj/item/stamp/op{
pixel_x = -5;
pixel_y = 13
/obj/item/modular_computer/console/preset/command{
dir = 4
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/requests_console/west{
announcementConsole = 1;
department = "Operations Manager";
departmentType = 5;
name = "Operations Manager Request Console"
},
/turf/simulated/floor/tiled,
/turf/simulated/floor/tiled/full,
/area/operations/qm)
"agG" = (
/obj/structure/cable/green{
@@ -21185,11 +21176,8 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
"cTU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/full,
/turf/simulated/floor/carpet,
/area/operations/qm)
"cTY" = (
/obj/machinery/door/firedoor,
@@ -31364,11 +31352,19 @@
/turf/simulated/floor/tiled/dark,
/area/horizon/custodial)
"esU" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
},
/obj/effect/floor_decal/spline/fancy/wood,
/obj/structure/coatrack{
pixel_x = -5;
pixel_y = 22
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/effect/floor_decal/spline/fancy/wood{
dir = 9
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/wood,
/area/operations/qm)
@@ -34578,15 +34574,17 @@
/turf/simulated/floor/tiled,
/area/hallway/primary/central_one)
"eRn" = (
/obj/structure/coatrack{
pixel_x = 4
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/obj/machinery/light{
dir = 4
},
/obj/structure/disposalpipe/up{
dir = 8
},
/obj/structure/engineer_maintenance/electric{
dir = 4
},
/obj/machinery/disposal/small/west,
/obj/structure/engineer_maintenance/pipe,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 6
},
@@ -44568,8 +44566,8 @@
name = "Operations Manager";
req_access = list(41)
},
/obj/effect/map_effect/door_helper/unres,
/turf/simulated/floor/wood,
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/full,
/area/operations/qm)
"goK" = (
/turf/simulated/floor/tiled/dark,
@@ -63614,23 +63612,27 @@
/turf/unsimulated/floor,
/area/centcom/holding)
"jaT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/structure/bed/stool/chair/padded/black{
dir = 8
},
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
},
/obj/structure/table/wood,
/obj/machinery/newscaster/east,
/obj/machinery/power/outlet{
pixel_y = 3;
pixel_x = 9
},
/obj/item/storage/box/fancy/donut{
pixel_y = 6
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/turf/simulated/floor/wood,
/area/operations/qm)
"jaY" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/wood,
/obj/structure/table/wood,
/obj/item/modular_computer/laptop/preset/supply/om,
/turf/simulated/floor/carpet,
/area/operations/qm)
"jbb" = (
/obj/structure/window/shuttle/unique/tcfl{
@@ -64613,10 +64615,8 @@
},
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
/obj/effect/map_effect/door_helper/unres{
dir = 1
},
/turf/simulated/floor/wood,
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/full,
/area/operations/qm)
"jiL" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -67757,13 +67757,37 @@
/turf/simulated/floor/tiled,
/area/security/checkpoint2)
"jFA" = (
/obj/machinery/power/apc/low/west,
/obj/structure/table/reinforced/steel,
/obj/effect/floor_decal/industrial/hatch/grey,
/obj/machinery/chemical_dispenser/bar_soft/full{
dir = 4;
pixel_y = 4;
pixel_x = -2
},
/obj/item/storage/box/drinkingglasses{
pixel_y = 4;
pixel_x = 8
},
/obj/machinery/light{
dir = 1
},
/obj/machinery/button/switch/windowtint{
id = "OM Windows";
pixel_x = 4;
pixel_y = 25;
req_access = list(41);
dir = 1
},
/obj/machinery/light_switch{
pixel_x = -4;
pixel_y = 25;
dir = 1
},
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/machinery/power/apc/low/north,
/obj/machinery/alarm/west,
/obj/structure/closet/secure_closet/operations_manager,
/turf/simulated/floor/tiled,
/turf/simulated/floor/tiled/full,
/area/operations/qm)
"jFB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -73159,21 +73183,15 @@
/turf/simulated/floor/plating,
/area/horizon/maintenance/deck_two/fore/port)
"ksT" = (
/obj/item/device/radio/intercom/south,
/obj/structure/table/standard,
/obj/item/paper_bin{
pixel_x = -3;
pixel_y = 3
},
/obj/item/pen{
pixel_x = -2
},
/obj/machinery/keycard_auth{
dir = 4;
pixel_x = -21;
pixel_y = 1
},
/turf/simulated/floor/tiled,
/obj/structure/closet/secure_closet/operations_manager,
/obj/effect/floor_decal/industrial/outline/operations,
/obj/machinery/light,
/turf/simulated/floor/tiled/full,
/area/operations/qm)
"ksZ" = (
/obj/effect/floor_decal/industrial/warning{
@@ -76190,11 +76208,13 @@
/turf/simulated/floor/tiled,
/area/security/checkpoint2)
"kQj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/trunk{
/obj/structure/bed/stool/chair/padded/brown{
dir = 1
},
/obj/machinery/camera/network/supply{
c_tag = "Operations - Manager's Office";
dir = 8
},
/obj/machinery/disposal/small/west,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
},
@@ -82396,8 +82416,11 @@
/turf/simulated/floor/shuttle/dark_blue,
/area/shuttle/escape_pod/pod4)
"lLI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/turf/simulated/floor/wood,
/area/operations/qm)
@@ -87203,12 +87226,12 @@
/area/merchant_station)
"mur" = (
/obj/structure/bed/stool/chair/office/dark{
dir = 8
dir = 4
},
/obj/effect/landmark/start{
name = "Operations Manager"
},
/turf/simulated/floor/tiled/full,
/turf/simulated/floor/carpet,
/area/operations/qm)
"muu" = (
/obj/item/holomenu/holodeck,
@@ -90064,10 +90087,12 @@
/turf/simulated/floor/tiled,
/area/horizon/crew_quarters/cryo/living_quarters_lift)
"mSw" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 10
/obj/structure/table/wood,
/obj/machinery/photocopier/faxmachine{
department = "Operations Manager's Office"
},
/turf/simulated/floor/wood,
/obj/machinery/firealarm/south,
/turf/simulated/floor/carpet,
/area/operations/qm)
"mSD" = (
/obj/effect/landmark/entry_point/port{
@@ -102971,13 +102996,36 @@
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_two/fore)
"oMJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
/obj/structure/table/wood,
/obj/item/paper_bin{
pixel_x = 5;
pixel_y = 4
},
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
/obj/item/stamp/denied{
pixel_x = -7;
pixel_y = 7
},
/turf/simulated/floor/wood,
/obj/item/folder/yellow{
pixel_x = 5;
pixel_y = 4
},
/obj/item/pen/multi{
pixel_x = 5;
pixel_y = 5
},
/obj/item/stamp/op{
pixel_x = -7;
pixel_y = 4
},
/obj/machinery/power/outlet{
pixel_y = -5;
pixel_x = -7
},
/obj/item/clipboard{
pixel_y = 3;
pixel_x = 5
},
/turf/simulated/floor/carpet,
/area/operations/qm)
"oMK" = (
/obj/effect/decal/fake_object{
@@ -111160,17 +111208,15 @@
/turf/simulated/floor/tiled/white,
/area/medical/gen_treatment)
"pVb" = (
/obj/structure/table/standard,
/obj/machinery/newscaster/east,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 5
},
/obj/item/device/flashlight/lamp{
pixel_x = 3;
pixel_y = 10
/obj/structure/bed/stool/chair/padded/brown,
/obj/machinery/light{
dir = 4
},
/obj/random/pottedplant_small{
pixel_x = -9
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/wood,
/area/operations/qm)
@@ -129567,11 +129613,16 @@
/turf/simulated/open,
/area/horizon/maintenance/deck_two/fore/port)
"sFh" = (
/obj/item/modular_computer/console/preset/command{
dir = 4
/obj/effect/floor_decal/industrial/hatch/grey,
/obj/structure/filingcabinet/filingcabinet{
pixel_x = -9;
pixel_y = 1
},
/obj/machinery/firealarm/west,
/turf/simulated/floor/tiled,
/obj/machinery/papershredder{
pixel_x = 6
},
/obj/machinery/alarm/west,
/turf/simulated/floor/tiled/full,
/area/operations/qm)
"sFi" = (
/obj/structure/shuttle_part/scc_space_ship{
@@ -132338,14 +132389,19 @@
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
/area/hallway/engineering/rust)
"tbw" = (
/obj/effect/floor_decal/spline/fancy/wood/cee{
dir = 8
},
/obj/structure/cable/green{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/turf/simulated/floor/tiled/full,
/turf/simulated/floor/wood,
/area/operations/qm)
"tby" = (
/obj/effect/floor_decal/corner/dark_blue{
@@ -160224,25 +160280,12 @@
/turf/simulated/floor/tiled/dark/full,
/area/engineering/engine_room)
"wYO" = (
/obj/machinery/camera/network/supply{
c_tag = "Operations - Quartermaster's Office";
dir = 1
/obj/item/device/radio/intercom/south{
pixel_y = 0;
pixel_x = 1
},
/obj/structure/table/standard,
/obj/machinery/photocopier/faxmachine{
department = "Operations Manager's Office"
},
/obj/machinery/button/switch/windowtint{
id = "OM Windows";
pixel_x = 10;
pixel_y = -15;
req_access = list(41)
},
/obj/machinery/light_switch{
pixel_x = 3;
pixel_y = -15
},
/turf/simulated/floor/tiled/full,
/obj/machinery/hologram/holopad/long_range,
/turf/simulated/floor/carpet,
/area/operations/qm)
"wYQ" = (
/obj/machinery/door/airlock/centcom{
@@ -165952,8 +165995,13 @@
/turf/simulated/floor/plating,
/area/maintenance/wing/starboard/deck1)
"xNx" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/spline/fancy/wood,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 10
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/wood,
/area/operations/qm)
"xNz" = (
@@ -169330,10 +169378,18 @@
/turf/simulated/floor/carpet,
/area/horizon/security/investigators_office)
"yki" = (
/obj/structure/bed/stool/chair/padded/black,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
},
/obj/effect/floor_decal/spline/fancy/wood/corner{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/turf/simulated/floor/wood,
/area/operations/qm)
"ykn" = (
@@ -256643,9 +256699,9 @@ bCl
rvG
esU
oMJ
xzC
jaY
mSw
rvG
gef
hHn
cNr
nZP
@@ -256900,7 +256956,7 @@ gLd
rvG
yki
lLI
jaY
xzC
xNx
jiK
jZU