From 43a685d46cdd5fd15e8df20a78a09e03c942bcbc Mon Sep 17 00:00:00 2001 From: Chloe Date: Sat, 28 Aug 2021 01:58:51 +0100 Subject: [PATCH] [Modular] [Ready] NSV Titan is kinda cool (#7776) * ah fuck I can't believe you've done this * whoops * no robots allowed. * E * Update syndicate_loadout.dm * gaming * a * bonk * I hate shutters I hate shutters I hate shutters * god * our house, in the middle of our house * giant screaming rat --- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 1444 ++++++++++------- .../objects/items/devices/radio/headset.dm | 1 + .../code/modules/jobs/job_types/blueshield.dm | 2 +- .../code/jobs/bridge_officer.dm | 1 + .../code/jobs/fleetmaster.dm | 16 +- .../code/jobs/operations_inspector.dm | 1 + .../central_command_module/code/obj/wall.dm | 19 + tgstation.dme | 1 + 8 files changed, 932 insertions(+), 553 deletions(-) create mode 100644 modular_skyrat/modules/central_command_module/code/obj/wall.dm diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 1a10b01b75a..d604fa7bd06 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -81,7 +81,7 @@ /area/centcom/holding/cafedorms) "acc" = ( /obj/structure/chair/comfy/brown, -/turf/open/floor/carpet/blue, +/turf/open/floor/carpet/purple, /area/centcom/ncvtitan) "adw" = ( /obj/effect/turf_decal/stripes/line{ @@ -89,6 +89,10 @@ }, /turf/open/floor/plating, /area/centcom/interlink) +"adY" = ( +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/centcom/ncvtitan) "aer" = ( /obj/structure/chair/sofa/corner, /turf/open/indestructible/hotelwood, @@ -355,6 +359,7 @@ dir = 1 }, /obj/machinery/light/directional/north, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "ahk" = ( @@ -1259,6 +1264,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "aoi" = ( @@ -1778,6 +1784,10 @@ /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/centcom/interlink) +"aso" = ( +/obj/effect/turf_decal/siding/thinplating, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/ncvtitan) "asp" = ( /obj/machinery/hydroponics/constructable, /turf/open/floor/plating/dirt/planet, @@ -2705,8 +2715,8 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aAN" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, +/obj/structure/bed/double, +/obj/item/bedsheet/centcom/double, /turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "aAS" = ( @@ -3554,7 +3564,8 @@ /area/centcom/holding/cafepark) "aHw" = ( /obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 + dir = 4; + name = "Bridge" }, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) @@ -3898,12 +3909,9 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aKM" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 5 - }, -/turf/open/floor/iron/dark/textured_corner{ - dir = 8 - }, +/obj/machinery/light/directional/east, +/obj/machinery/deepfryer, +/turf/open/floor/iron/cafeteria, /area/centcom/ncvtitan) "aKP" = ( /turf/open/floor/plating/beach/coastline_t/sandwater_inner{ @@ -5010,7 +5018,7 @@ /area/centcom/interlink) "aSw" = ( /obj/machinery/light/directional/south, -/turf/open/floor/glass, +/turf/open/floor/carpet/neon/simple/cyan/nodots, /area/centcom/ncvtitan) "aSy" = ( /obj/structure/bookcase/random, @@ -5108,6 +5116,7 @@ /area/centcom/interlink) "aTj" = ( /obj/machinery/light/directional/west, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "aTk" = ( @@ -5989,6 +5998,13 @@ }, /turf/open/floor/carpet, /area/centcom/interlink) +"bgO" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/carpet/royalblue, +/area/centcom/ncvtitan) "bhw" = ( /obj/structure/artilleryplaceholder{ icon_state = "10" @@ -5999,7 +6015,10 @@ /turf/open/floor/plating/airless, /area/centcom/ncvtitan) "bik" = ( -/obj/machinery/door/airlock/mining/glass, +/obj/machinery/door/airlock/mining/glass{ + name = "Docking Control" + }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "biw" = ( @@ -6149,12 +6168,13 @@ /turf/open/floor/plating, /area/centcom/ncvtitan) "bUU" = ( -/obj/effect/turf_decal/siding/green/corner{ +/obj/effect/turf_decal/siding/green{ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/restraints/handcuffs/cable/zipties, -/obj/item/assembly/flash/handheld, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen/blue, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "bXo" = ( @@ -6162,6 +6182,7 @@ name = "armory"; req_access_txt = "103" }, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "bZo" = ( @@ -6190,7 +6211,9 @@ /turf/open/floor/iron/brown/side, /area/centcom/interlink) "cjl" = ( -/obj/machinery/door/airlock, +/obj/machinery/door/airlock{ + name = "Dorm 3" + }, /turf/open/floor/carpet/orange, /area/centcom/ncvtitan) "cju" = ( @@ -6302,8 +6325,14 @@ /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, /obj/item/storage/toolbox/mechanical, +/obj/machinery/recharger, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) +"cHE" = ( +/obj/machinery/light/directional/south, +/obj/structure/cable, +/turf/open/floor/carpet/neon/simple/cyan/nodots, +/area/centcom/ncvtitan) "cJb" = ( /obj/machinery/autolathe/hacked, /obj/effect/turf_decal/delivery, @@ -6311,12 +6340,17 @@ /area/centcom/ncvtitan) "cKo" = ( /obj/structure/dresser, -/turf/open/floor/carpet/blue, +/turf/open/floor/carpet/purple, /area/centcom/ncvtitan) "cLe" = ( /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) +"cLG" = ( +/obj/item/clothing/under/costume/gondola, +/obj/item/clothing/mask/gondola, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "cMd" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -6328,6 +6362,10 @@ "cMJ" = ( /turf/closed/wall/mineral/titanium, /area/centcom/ncvtitan) +"cNs" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_large, +/area/centcom/ncvtitan) "cNZ" = ( /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 10 @@ -6353,10 +6391,17 @@ }, /turf/open/floor/iron/dark, /area/centcom/interlink) +"cRx" = ( +/obj/machinery/light/directional/north, +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "cSo" = ( /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "cUa" = ( @@ -6439,7 +6484,7 @@ "dAR" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, -/turf/open/floor/carpet/blue, +/turf/open/floor/carpet/purple, /area/centcom/ncvtitan) "dCg" = ( /obj/effect/turf_decal/stripes/line, @@ -6455,7 +6500,9 @@ /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "dDy" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Dorms" + }, /turf/open/floor/glass, /area/centcom/ncvtitan) "dFE" = ( @@ -6497,9 +6544,10 @@ "dLi" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ - name = "NSS Titan"; + name = "NCV Titan"; req_access_txt = "101" }, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/plating, /area/centcom/ncvtitan) "dLw" = ( @@ -6513,6 +6561,14 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) +"dLR" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 6 + }, +/turf/open/floor/iron/dark/textured_corner{ + dir = 1 + }, +/area/centcom/ncvtitan) "dMY" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -6589,7 +6645,7 @@ "ebB" = ( /obj/machinery/door/poddoor/ert, /obj/machinery/door/airlock/external{ - name = "NSS Titan"; + name = "NCV Titan"; req_access_txt = "101" }, /turf/open/floor/iron, @@ -6611,6 +6667,7 @@ "ejl" = ( /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; + name = "ERT Drop Bay"; req_access_txt = "101" }, /turf/open/floor/iron/dark, @@ -6697,6 +6754,10 @@ /obj/machinery/light/directional/west, /turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) +"eoH" = ( +/obj/structure/sign/warning/securearea, +/turf/closed/indestructible/titanium/nodiagonal, +/area/centcom/ncvtitan) "epR" = ( /obj/item/stack/package_wrap, /obj/item/hand_labeler, @@ -6706,6 +6767,7 @@ /area/centcom/ncvtitan) "esz" = ( /obj/machinery/light/directional/north, +/obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet/orange, /area/centcom/ncvtitan) "esX" = ( @@ -6725,7 +6787,7 @@ /area/centcom/ncvtitan) "eEK" = ( /obj/machinery/door/airlock/external{ - name = "NSS Titan"; + name = "NCV Titan"; req_access_txt = "101" }, /obj/machinery/door/poddoor/ert, @@ -6734,12 +6796,18 @@ "eJB" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, -/turf/open/floor/carpet/cyan, +/turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "eKg" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) +"eKy" = ( +/obj/structure/table/reinforced, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/north, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "eLC" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -6779,22 +6847,23 @@ /area/floorcluwne_maze) "eWC" = ( /obj/structure/table/wood, -/obj/item/folder/red{ - pixel_x = -3; - pixel_y = 2 - }, /obj/item/stamp/centcom{ pixel_x = 8 }, -/obj/item/pen/red{ - pixel_x = 6; - pixel_y = 11 - }, /obj/machinery/light/directional/east, +/obj/item/clipboard{ + pixel_x = -5; + pixel_y = -1 + }, +/obj/item/pen{ + pixel_x = 6; + pixel_y = 10 + }, /turf/open/floor/carpet/executive, /area/centcom/ncvtitan) "eZJ" = ( /obj/machinery/door/airlock/multi_tile/metal{ + name = "Brig"; req_access_txt = "101" }, /turf/open/floor/iron/smooth_large, @@ -6901,15 +6970,28 @@ }, /turf/open/floor/iron/grimy, /area/centcom/interlink) +"fBr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/caution/stand_clear, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/centcom/ncvtitan) "fGr" = ( /obj/effect/turf_decal/tile/red{ dir = 4 }, /turf/open/floor/iron/dark, /area/centcom/interlink) +"fHe" = ( +/obj/machinery/vending/clothing, +/turf/open/floor/carpet/neon/simple/cyan/nodots, +/area/centcom/ncvtitan) "fIc" = ( /obj/machinery/door/airlock/multi_tile/metal{ - dir = 4 + dir = 4; + name = "Docks" }, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) @@ -6952,6 +7034,11 @@ }, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) +"fNd" = ( +/obj/machinery/light/directional/west, +/obj/machinery/vending/cigarette, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "fUk" = ( /obj/machinery/button/door{ id = "dorm23"; @@ -7074,6 +7161,13 @@ /obj/effect/landmark/start/deck_crew, /turf/open/floor/iron/smooth, /area/centcom/ncvtitan) +"gpK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/centcom/ncvtitan) "gul" = ( /obj/structure/lattice, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -7187,11 +7281,7 @@ /turf/open/floor/iron, /area/centcom/interlink) "gTR" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, +/obj/structure/closet/secure_closet/freezer/kitchen, /turf/open/floor/iron/cafeteria, /area/centcom/ncvtitan) "gVy" = ( @@ -7262,8 +7352,13 @@ /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "hfm" = ( -/obj/machinery/shuttle_manipulator, -/turf/open/floor/circuit/green, +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/flashlight/seclite, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "hgc" = ( /obj/machinery/griddle, @@ -7275,13 +7370,15 @@ }, /turf/open/indestructible/hoteltile, /area/centcom/interlink) +"hhq" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "hhW" = ( /obj/effect/turf_decal/siding/thinplating{ - dir = 6 - }, -/turf/open/floor/iron/dark/textured_corner{ dir = 1 }, +/turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "hpS" = ( /obj/effect/turf_decal/tile/blue{ @@ -7307,12 +7404,7 @@ /area/centcom/ncvtitan) "hvB" = ( /obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/clipboard, -/obj/item/pen/red, +/obj/machinery/cell_charger_multi, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "hvQ" = ( @@ -7336,6 +7428,7 @@ name = "Office"; req_access_txt = "101" }, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "hAT" = ( @@ -7344,6 +7437,10 @@ }, /turf/open/floor/plating/airless, /area/centcom/ncvtitan) +"hCU" = ( +/obj/structure/filingcabinet/security, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "hES" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -7398,7 +7495,7 @@ /turf/open/floor/plating/airless, /area/centcom/ncvtitan) "hLF" = ( -/obj/machinery/computer/emergency_shuttle{ +/obj/machinery/computer/shuttle/ferry{ dir = 8 }, /turf/open/floor/iron/dark, @@ -7414,6 +7511,7 @@ /obj/effect/turf_decal/siding/red/corner{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "hQn" = ( @@ -7427,6 +7525,11 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) +"hTw" = ( +/obj/machinery/light/directional/west, +/obj/effect/spawner/randomsnackvend, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "iao" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -7501,6 +7604,14 @@ }, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) +"ilU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/centcom/ncvtitan) "ime" = ( /obj/machinery/washing_machine{ pixel_x = 2 @@ -7525,6 +7636,8 @@ /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "irD" = ( +/obj/machinery/shuttle_manipulator, +/obj/structure/cable, /turf/open/floor/circuit/green, /area/centcom/ncvtitan) "ity" = ( @@ -7537,6 +7650,13 @@ /obj/effect/landmark/start/bridge_officer, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) +"ivg" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/centcom/ncvtitan) "iwb" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/smooth_large, @@ -7545,11 +7665,7 @@ /turf/open/floor/carpet, /area/centcom/interlink) "iCF" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets/donkpocketberry, -/obj/item/storage/box/donkpockets/donkpocketberry, -/obj/item/storage/box/donkpockets/donkpocketberry, -/obj/item/storage/box/donkpockets/donkpocketberry, +/obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/iron/cafeteria, /area/centcom/ncvtitan) "iEA" = ( @@ -7582,6 +7698,11 @@ "iLk" = ( /turf/open/indestructible/hotelwood, /area/centcom/interlink) +"iLI" = ( +/obj/machinery/power/smes/magical, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "iTZ" = ( /turf/open/indestructible/hoteltile, /area/centcom/interlink) @@ -7682,13 +7803,12 @@ /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "jmA" = ( -/obj/effect/turf_decal/siding/green{ - dir = 1 +/obj/effect/turf_decal/siding/green/corner{ + dir = 4 }, /obj/structure/table/reinforced, -/obj/item/crowbar/red, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/mask/gas, +/obj/item/storage/fancy/donut_box, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "joB" = ( @@ -7783,7 +7903,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/machinery/door/airlock/external{ - name = "NSS Titan"; + name = "NCV Titan"; req_access_txt = "101" }, /turf/open/floor/plating, @@ -7887,6 +8007,10 @@ }, /turf/open/floor/iron, /area/centcom/interlink) +"kdy" = ( +/obj/structure/cable, +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/ncvtitan) "kfp" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -7903,6 +8027,12 @@ }, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) +"kgc" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Dorms" + }, +/turf/open/floor/iron/smooth_large, +/area/centcom/ncvtitan) "khB" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/ppflowers, @@ -7948,6 +8078,7 @@ name = "Administrative Office"; req_access_txt = "109" }, +/obj/structure/cable, /turf/open/floor/wood, /area/centcom/ncvtitan) "klo" = ( @@ -7961,7 +8092,7 @@ /area/centcom/interlink) "kmI" = ( /obj/machinery/light/directional/north, -/turf/open/floor/glass, +/turf/open/floor/carpet/neon/simple/cyan/nodots, /area/centcom/ncvtitan) "kmN" = ( /obj/structure/rack, @@ -7989,13 +8120,17 @@ /turf/open/floor/plating, /area/centcom/interlink) "kou" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Diner" + }, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "koA" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "kqG" = ( @@ -8061,9 +8196,7 @@ /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "kzy" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/turf/open/floor/carpet/blue, +/turf/open/floor/carpet/purple, /area/centcom/ncvtitan) "kAy" = ( /obj/structure/chair/sofa/right{ @@ -8150,7 +8283,7 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, -/turf/open/floor/carpet/blue, +/turf/open/floor/carpet/purple, /area/centcom/ncvtitan) "kVz" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -8163,13 +8296,10 @@ /obj/structure/chair/stool, /turf/open/floor/iron, /area/centcom/interlink) -"kWe" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/donkpockets/donkpocketgondola, -/obj/item/storage/box/donkpockets/donkpocketgondola, -/obj/item/storage/box/donkpockets/donkpocketgondola, -/obj/item/storage/box/donkpockets/donkpocketgondola, -/turf/open/floor/iron/cafeteria, +"kVR" = ( +/obj/machinery/light/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "kWH" = ( /turf/open/floor/iron/grimy, @@ -8232,19 +8362,14 @@ /turf/open/floor/carpet/neon/simple/cyan/nodots, /area/centcom/ncvtitan) "lfm" = ( -/obj/effect/turf_decal/siding/green{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/red, -/obj/item/pen/red, -/turf/open/floor/iron/dark/textured_large, +/obj/structure/cable, +/turf/open/floor/circuit/green, /area/centcom/ncvtitan) "lfY" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "lgV" = ( @@ -8259,16 +8384,23 @@ }, /turf/open/floor/iron/white, /area/centcom/interlink) +"lin" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/open/floor/iron/smooth, +/area/centcom/ncvtitan) "liz" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "ljZ" = ( /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; + name = "Auxillery Construction"; req_access_txt = "101" }, /turf/open/floor/plating, @@ -8301,6 +8433,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/storage/secure/safe{ + pixel_x = -23 + }, /turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "lmF" = ( @@ -8309,6 +8444,9 @@ }, /turf/open/floor/carpet/green, /area/centcom/interlink) +"lnx" = ( +/turf/closed/indestructible/titanium, +/area/centcom/ncvtitan) "lpi" = ( /obj/structure/artilleryplaceholder{ icon_state = "6" @@ -8330,6 +8468,11 @@ }, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) +"ltP" = ( +/obj/machinery/light/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "luy" = ( /obj/effect/turf_decal/trimline/darkblue/line{ dir = 4 @@ -8366,6 +8509,10 @@ }, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) +"lLq" = ( +/obj/item/toy/plush/borbplushie, +/turf/open/space/basic, +/area/space) "lMu" = ( /obj/machinery/light{ dir = 4 @@ -8385,6 +8532,7 @@ /obj/effect/turf_decal/siding/red{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/glass, /area/centcom/ncvtitan) "lUk" = ( @@ -8407,9 +8555,23 @@ }, /turf/open/floor/iron/dark, /area/centcom/interlink) +"lUQ" = ( +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/centcom/ncvtitan) +"maM" = ( +/obj/effect/turf_decal/trimline/green/filled/warning, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/centcom/ncvtitan) "mcJ" = ( /obj/machinery/light/directional/north, -/turf/open/floor/carpet/blue, +/obj/structure/closet/secure_closet/personal/cabinet, +/turf/open/floor/carpet/purple, /area/centcom/ncvtitan) "mdL" = ( /obj/structure/table/wood, @@ -8417,21 +8579,12 @@ /area/centcom/ncvtitan) "meY" = ( /obj/machinery/vending/games, -/turf/open/floor/glass, +/turf/open/floor/carpet/neon/simple/cyan/nodots, /area/centcom/ncvtitan) "mih" = ( /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron, /area/centcom/interlink) -"mkW" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/donkpockets/donkpocketpizza, -/obj/item/storage/box/donkpockets/donkpocketpizza, -/obj/item/storage/box/donkpockets/donkpocketpizza, -/obj/item/storage/box/donkpockets/donkpocketpizza, -/obj/item/storage/box/donkpockets/donkpocketpizza, -/turf/open/floor/iron/cafeteria, -/area/centcom/ncvtitan) "mlM" = ( /obj/machinery/vending/dinnerware, /turf/open/floor/iron/cafeteria, @@ -8439,6 +8592,10 @@ "mmy" = ( /turf/open/floor/plating/grass/planet, /area/centcom/interlink) +"mni" = ( +/obj/structure/cable, +/turf/open/floor/carpet/royalblue, +/area/centcom/ncvtitan) "mnr" = ( /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 @@ -8470,7 +8627,7 @@ /area/centcom/interlink) "mqG" = ( /obj/structure/chair/comfy/brown, -/turf/open/floor/carpet/cyan, +/turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "mro" = ( /obj/structure/chair/sofa/bench/left, @@ -8536,7 +8693,7 @@ "mHc" = ( /obj/structure/bed, /obj/item/bedsheet/dorms, -/turf/open/floor/carpet/cyan, +/turf/open/floor/carpet/orange, /area/centcom/ncvtitan) "mHF" = ( /obj/structure/sink{ @@ -8550,12 +8707,11 @@ /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "mJf" = ( -/obj/effect/turf_decal/siding/green/corner{ - dir = 8 - }, +/obj/effect/turf_decal/siding/green, /obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen/blue, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "mLn" = ( @@ -8602,6 +8758,10 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/centcom/interlink) +"mRK" = ( +/obj/machinery/vending/access/command, +/turf/open/floor/carpet/neon/simple/cyan/nodots, +/area/centcom/ncvtitan) "mRW" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -8642,6 +8802,10 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) +"mUo" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "mUw" = ( /obj/structure/dresser, /turf/open/floor/wood, @@ -8649,6 +8813,7 @@ "mVg" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/light/floor, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "mZd" = ( @@ -8658,11 +8823,16 @@ }, /turf/open/floor/wood, /area/centcom/interlink) +"mZH" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "nap" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/red{ dir = 8 }, +/obj/machinery/recharger, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "ncg" = ( @@ -8692,6 +8862,16 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/freezer, /area/centcom/ncvtitan) +"ndr" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/zipties, +/obj/item/storage/box/zipties, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) +"ndC" = ( +/obj/machinery/vending/boozeomat/all_access, +/turf/open/floor/carpet/neon/simple/cyan/nodots, +/area/centcom/ncvtitan) "nez" = ( /turf/open/floor/iron/dark/textured_edge{ dir = 8 @@ -8736,14 +8916,14 @@ /area/centcom/interlink) "njK" = ( /obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/glass, +/turf/open/floor/carpet/neon/simple/cyan/nodots, /area/centcom/ncvtitan) "nlM" = ( /obj/effect/turf_decal/siding/thinplating{ - dir = 10 + dir = 5 }, /turf/open/floor/iron/dark/textured_corner{ - dir = 4 + dir = 8 }, /area/centcom/ncvtitan) "npu" = ( @@ -8759,6 +8939,11 @@ /obj/structure/table/glass, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) +"nra" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/north, +/turf/open/floor/carpet/royalblue, +/area/centcom/ncvtitan) "nuy" = ( /obj/structure/artilleryplaceholder/decorative{ icon_state = "34" @@ -8831,6 +9016,7 @@ dir = 1 }, /obj/machinery/door/airlock/multi_tile/metal{ + name = "Exports"; req_access_txt = "101" }, /turf/open/floor/plating, @@ -8851,6 +9037,12 @@ "nKj" = ( /turf/open/floor/plastic, /area/centcom/interlink) +"nLd" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Imports" + }, +/turf/open/floor/iron/textured, +/area/centcom/ncvtitan) "nOT" = ( /obj/structure/dresser, /turf/open/floor/carpet/orange, @@ -8905,6 +9097,7 @@ /obj/effect/turf_decal/siding/red/corner{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "odB" = ( @@ -8917,15 +9110,15 @@ /area/centcom/interlink) "oee" = ( /obj/effect/turf_decal/siding/thinplating{ - dir = 8 + dir = 4 }, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "oeW" = ( /obj/effect/turf_decal/siding/thinplating{ - dir = 1 + dir = 9 }, -/turf/open/floor/iron/dark/textured_large, +/turf/open/floor/iron/dark/textured_corner, /area/centcom/ncvtitan) "ofs" = ( /obj/structure/table/reinforced, @@ -8946,6 +9139,10 @@ }, /turf/open/floor/iron/dark, /area/centcom/interlink) +"opW" = ( +/obj/structure/cable, +/turf/open/floor/carpet/neon/simple/cyan/nodots, +/area/centcom/ncvtitan) "orC" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -8956,9 +9153,9 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/yellow, -/obj/item/pen/blue, +/obj/item/crowbar/red, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/gas, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "osu" = ( @@ -9004,15 +9201,14 @@ /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "oEK" = ( -/obj/structure/chair/comfy/brown{ - color = "#c45c57"; - desc = "Remarkably soft, with plush cozy cushions, premium memory-foam and covered in stain-resistant fabric. Made by Kat-Kea???!"; - dir = 4; - name = "Premium Cozy Chair" - }, -/obj/effect/turf_decal/siding/thinplating{ +/obj/effect/turf_decal/siding/green{ dir = 8 }, +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/pen/red, +/obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "oFj" = ( @@ -9041,6 +9237,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "oHE" = ( @@ -9053,6 +9250,7 @@ /turf/open/floor/plating/airless, /area/centcom/ncvtitan) "oIA" = ( +/obj/structure/cable, /turf/open/floor/wood, /area/centcom/ncvtitan) "oMJ" = ( @@ -9073,7 +9271,9 @@ /turf/open/floor/iron/dark/smooth_large, /area/centcom/ncvtitan) "oQJ" = ( -/obj/machinery/door/airlock/service, +/obj/machinery/door/airlock/service{ + name = "Dorms" + }, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "oQQ" = ( @@ -9251,6 +9451,14 @@ }, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) +"pOo" = ( +/obj/item/storage/box/donkpockets/donkpocketgondola, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) +"pOy" = ( +/obj/structure/cable, +/turf/open/floor/carpet/executive, +/area/centcom/ncvtitan) "pOQ" = ( /obj/structure/artilleryplaceholder{ icon_state = "11" @@ -9284,6 +9492,7 @@ }, /obj/effect/turf_decal/caution, /obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "pUb" = ( @@ -9432,8 +9641,12 @@ /turf/open/floor/plastic, /area/centcom/interlink) "qqt" = ( -/obj/effect/turf_decal/siding/thinplating, -/turf/open/floor/iron/dark/textured_large, +/obj/effect/turf_decal/siding/thinplating{ + dir = 10 + }, +/turf/open/floor/iron/dark/textured_corner{ + dir = 4 + }, /area/centcom/ncvtitan) "qqE" = ( /obj/machinery/door/airlock{ @@ -9454,9 +9667,17 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/gun/grenadelauncher, +/obj/item/gun/grenadelauncher{ + pixel_y = -10 + }, +/obj/machinery/recharger, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) +"qua" = ( +/obj/effect/landmark/start/deck_crew, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "quD" = ( /obj/structure/railing{ dir = 8 @@ -9477,6 +9698,11 @@ }, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) +"qvu" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/north, +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/ncvtitan) "qxa" = ( /obj/structure/closet/crate/bin{ pixel_x = -6; @@ -9548,7 +9774,9 @@ /turf/open/floor/iron/white, /area/centcom/interlink) "qLX" = ( -/obj/machinery/door/airlock/service, +/obj/machinery/door/airlock/service{ + name = "Kitchen" + }, /turf/open/floor/iron/cafeteria, /area/centcom/ncvtitan) "qMC" = ( @@ -9595,15 +9823,24 @@ /area/centcom/ncvtitan) "qYJ" = ( /obj/machinery/light/directional/east, +/obj/structure/table, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets/donkpocketberry, +/obj/item/storage/box/donkpockets/donkpocketpizza, +/obj/item/storage/box/donkpockets/donkpocketspicy, +/obj/item/storage/box/donkpockets/donkpocketteriyaki, /turf/open/floor/iron/cafeteria, /area/centcom/ncvtitan) "qZp" = ( /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "rie" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 +/obj/effect/turf_decal/siding/green/corner{ + dir = 8 }, +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "riK" = ( @@ -9629,9 +9866,9 @@ /turf/open/floor/plating/airless, /area/centcom/ncvtitan) "rlP" = ( -/obj/effect/turf_decal/siding/green, +/obj/effect/turf_decal/siding/green/corner, /obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, +/obj/item/storage/secure/briefcase, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "rmb" = ( @@ -9664,6 +9901,10 @@ }, /turf/open/floor/iron/white, /area/centcom/interlink) +"rpJ" = ( +/obj/structure/cable, +/turf/open/floor/glass, +/area/centcom/ncvtitan) "rtY" = ( /obj/structure/flora/ausbushes/brflowers{ pixel_x = -3; @@ -9695,7 +9936,7 @@ /turf/open/floor/iron/cafeteria, /area/centcom/ncvtitan) "rvB" = ( -/obj/machinery/computer/shuttle/ferry{ +/obj/machinery/computer/emergency_shuttle{ dir = 8 }, /turf/open/floor/iron/dark, @@ -9782,10 +10023,13 @@ }, /area/centcom/ncvtitan) "rJG" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 9 +/obj/effect/turf_decal/siding/green/corner{ + dir = 1 }, -/turf/open/floor/iron/dark/textured_corner, +/obj/structure/table/reinforced, +/obj/item/restraints/handcuffs/cable/zipties, +/obj/item/assembly/flash/handheld, +/turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "rKz" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -9798,8 +10042,15 @@ "rLz" = ( /turf/open/floor/iron/smooth_large, /area/centcom/interlink) +"rMb" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/north, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "rNe" = ( -/turf/open/floor/carpet/blue, +/obj/structure/bed, +/obj/item/bedsheet/dorms, +/turf/open/floor/carpet/purple, /area/centcom/ncvtitan) "rNg" = ( /obj/structure/chair/sofa/bench/left{ @@ -9879,8 +10130,10 @@ /turf/open/floor/plating, /area/centcom/interlink) "rXF" = ( -/obj/machinery/door/airlock, -/turf/open/floor/carpet/cyan, +/obj/machinery/door/airlock{ + name = "Dorm 2" + }, +/turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "rZb" = ( /obj/machinery/door/airlock/hatch{ @@ -9900,6 +10153,17 @@ /obj/item/kirbyplants/random, /turf/open/floor/carpet, /area/centcom/interlink) +"sbG" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/iron/smooth_large, +/area/centcom/ncvtitan) +"sdG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/closet/firecloset/full, +/turf/open/floor/iron/smooth_large, +/area/centcom/ncvtitan) "sdJ" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron/smooth_large, @@ -10001,12 +10265,24 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/smooth, /area/centcom/ncvtitan) +"sHy" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/centcom/ncvtitan) "sHK" = ( /obj/structure/artilleryplaceholder{ icon_state = "19" }, /turf/open/floor/plating/airless, /area/centcom/ncvtitan) +"sIJ" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/ncvtitan) "sKu" = ( /obj/structure/chair/comfy/brown, /obj/machinery/light{ @@ -10049,10 +10325,6 @@ /area/centcom/interlink) "sWw" = ( /obj/structure/table/reinforced, -/obj/item/storage/box/donkpockets/donkpocketberry, -/obj/item/storage/box/donkpockets/donkpocketberry, -/obj/item/storage/box/donkpockets/donkpocketberry, -/obj/item/storage/box/donkpockets/donkpocketberry, /turf/open/floor/iron/cafeteria, /area/centcom/ncvtitan) "sYI" = ( @@ -10069,9 +10341,7 @@ "tad" = ( /obj/effect/turf_decal/siding/green, /obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/white, -/obj/item/pen/blue, +/obj/item/storage/firstaid/regular, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "taJ" = ( @@ -10127,7 +10397,7 @@ /area/centcom/interlink) "tjD" = ( /obj/structure/sign/warning/explosives, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/indestructible/titanium/nodiagonal, /area/centcom/ncvtitan) "tkY" = ( /obj/effect/turf_decal/stripes/corner{ @@ -10142,6 +10412,13 @@ }, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) +"tmK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "toK" = ( /obj/docking_port/stationary{ dheight = 3; @@ -10197,7 +10474,7 @@ /area/centcom/ncvtitan) "twB" = ( /obj/structure/dresser, -/turf/open/floor/carpet/cyan, +/turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "twX" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -10222,6 +10499,11 @@ }, /turf/open/floor/iron/white, /area/centcom/interlink) +"tyz" = ( +/obj/machinery/light/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "tza" = ( /obj/structure/artilleryplaceholder{ icon_state = "23" @@ -10258,6 +10540,7 @@ }, /obj/effect/turf_decal/caution, /obj/machinery/light/directional/south, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "tGP" = ( @@ -10305,7 +10588,9 @@ /turf/open/floor/iron, /area/centcom/interlink) "tOf" = ( -/turf/open/floor/carpet/cyan, +/obj/structure/bed, +/obj/item/bedsheet/dorms, +/turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "tQa" = ( /obj/machinery/cryopod, @@ -10347,10 +10632,8 @@ /turf/open/floor/iron, /area/centcom/ncvtitan) "ucn" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, -/turf/open/floor/carpet/cyan, +/obj/machinery/vending/wardrobe/cargo_wardrobe, +/turf/open/floor/iron/dark, /area/centcom/ncvtitan) "ufa" = ( /obj/machinery/door/window/brigdoor/security/cell{ @@ -10423,6 +10706,13 @@ /obj/structure/dresser, /turf/open/floor/carpet, /area/centcom/interlink) +"upr" = ( +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 4 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/ncvtitan) "uuq" = ( /turf/open/floor/iron/freezer, /area/centcom/ncvtitan) @@ -10449,6 +10739,7 @@ "uyf" = ( /obj/structure/filingcabinet/filingcabinet, /obj/effect/turf_decal/bot, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "uyr" = ( @@ -10457,6 +10748,14 @@ }, /turf/open/floor/iron, /area/centcom/interlink) +"uAM" = ( +/mob/living/simple_animal/pet/gondola{ + desc = "Gondola is the silent walker. Having no hands he embodies the Taoist principle of wu-wei (non-action) while his smiling facial expression shows his utter and complete acceptance of the world as it is. This one defends a box of gondola flavoured donks."; + name = "Guardian of the Gondola Pockets"; + real_name = "Guardian of the Gondola Pockets" + }, +/turf/open/floor/iron/dark, +/area/centcom/ncvtitan) "uCW" = ( /obj/machinery/light{ dir = 8 @@ -10505,12 +10804,6 @@ "uQr" = ( /turf/open/floor/plating, /area/centcom/ncvtitan) -"uVE" = ( -/obj/effect/turf_decal/siding/green/corner, -/obj/structure/table/reinforced, -/obj/item/storage/secure/briefcase, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/ncvtitan) "uXJ" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -10594,10 +10887,13 @@ /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "vtj" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/zipties, -/obj/item/storage/box/zipties, -/turf/open/floor/iron/dark, +/obj/structure/table/wood, +/obj/machinery/light/directional/west, +/obj/item/storage/lockbox/medal{ + pixel_x = -1; + pixel_y = 6 + }, +/turf/open/floor/wood, /area/centcom/ncvtitan) "vtL" = ( /obj/machinery/computer/crew{ @@ -10621,12 +10917,11 @@ /area/centcom/interlink) "vyg" = ( /obj/structure/table, -/obj/item/stack/wrapping_paper{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/folder/yellow{ - pixel_x = 4 +/obj/item/clipboard, +/obj/item/pen/red, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 }, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) @@ -10648,6 +10943,14 @@ "vAp" = ( /turf/open/floor/iron/dark/green/side, /area/centcom/interlink) +"vBO" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/caution{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/centcom/ncvtitan) "vEi" = ( /obj/structure/sign/logo{ icon_state = "nanotrasen_sign2" @@ -10697,12 +11000,9 @@ /turf/open/floor/iron, /area/centcom/interlink) "vRI" = ( -/obj/effect/turf_decal/siding/green/corner{ - dir = 4 +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 }, -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "vSC" = ( @@ -10795,9 +11095,11 @@ /turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "wal" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/turf/open/floor/carpet/orange, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + dir = 4 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/neon/simple/cyan, /area/centcom/ncvtitan) "wan" = ( /obj/machinery/light/directional/north, @@ -10834,7 +11136,8 @@ /area/centcom/ncvtitan) "wes" = ( /obj/machinery/light/directional/north, -/turf/open/floor/carpet/cyan, +/obj/structure/closet/secure_closet/personal/cabinet, +/turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "wfh" = ( /obj/effect/landmark/latejoin, @@ -10874,11 +11177,12 @@ name = "Administrative Office"; req_access_txt = "109" }, +/obj/structure/cable, /turf/open/floor/carpet/executive, /area/centcom/ncvtitan) "wkt" = ( /obj/machinery/light/red/directional/north, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/centcom/ncvtitan) "wkD" = ( /obj/structure/table, @@ -10952,6 +11256,7 @@ name = "Medbay"; req_access_txt = "101" }, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "wyP" = ( @@ -10989,6 +11294,7 @@ /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 9 }, +/obj/structure/cable, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "wHX" = ( @@ -11005,7 +11311,8 @@ /area/centcom/prison) "wKs" = ( /obj/machinery/door/airlock/multi_tile/metal{ - dir = 4 + dir = 4; + name = "ERT Equipment" }, /obj/machinery/door/poddoor/ert, /turf/open/floor/iron/dark/smooth_large, @@ -11018,6 +11325,8 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/north, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "wUm" = ( @@ -11039,11 +11348,13 @@ /area/centcom/interlink) "wZw" = ( /obj/machinery/door/airlock/maintenance, +/obj/structure/cable, /turf/open/floor/plating, /area/centcom/ncvtitan) "wZN" = ( /obj/structure/table/wood, /obj/machinery/light/directional/west, +/obj/machinery/recharger, /turf/open/floor/wood, /area/centcom/ncvtitan) "xbr" = ( @@ -11100,6 +11411,16 @@ }, /turf/open/floor/iron/dark, /area/centcom/interlink) +"xiV" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/north, +/turf/open/floor/carpet/neon/simple/cyan/nodots, +/area/centcom/ncvtitan) +"xqr" = ( +/obj/structure/sign/nanotrasen, +/obj/structure/cable, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/centcom/ncvtitan) "xqI" = ( /obj/machinery/vending/dorms, /turf/open/indestructible/hotelwood, @@ -11131,7 +11452,7 @@ /turf/open/floor/plating/grass/planet, /area/centcom/interlink) "xuL" = ( -/obj/structure/fireplace, +/obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet/royalblue, /area/centcom/ncvtitan) "xuN" = ( @@ -11152,6 +11473,9 @@ /obj/item/clothing/head/helmet/riot, /turf/open/floor/iron/dark/textured_edge, /area/centcom/ncvtitan) +"xxl" = ( +/turf/closed/indestructible/titanium/nodiagonal, +/area/centcom/ncvtitan) "xEl" = ( /obj/machinery/light/small{ dir = 4 @@ -11178,6 +11502,13 @@ }, /turf/open/floor/iron/dark/red, /area/centcom/ncvtitan) +"xHJ" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/centcom/ncvtitan) "xIC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -11201,6 +11532,7 @@ dir = 8 }, /obj/machinery/light/floor, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "xNb" = ( @@ -11235,8 +11567,10 @@ /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "xRl" = ( -/obj/machinery/door/airlock, -/turf/open/floor/carpet/blue, +/obj/machinery/door/airlock{ + name = "Dorm 1" + }, +/turf/open/floor/carpet/purple, /area/centcom/ncvtitan) "xSv" = ( /obj/machinery/button/door{ @@ -11261,11 +11595,16 @@ /turf/open/floor/carpet/orange, /area/centcom/ncvtitan) "xUy" = ( -/obj/effect/turf_decal/siding/green{ - dir = 4 +/obj/structure/chair/comfy/brown{ + color = "#c45c57"; + desc = "Remarkably soft, with plush cozy cushions, premium memory-foam and covered in stain-resistant fabric. Made by Kat-Kea???!"; + dir = 4; + name = "Premium Cozy Chair" }, -/obj/structure/table/reinforced, -/obj/item/flashlight/seclite, +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 + }, +/obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/centcom/ncvtitan) "xUX" = ( @@ -11275,6 +11614,7 @@ /obj/structure/sign/poster/official/obey{ pixel_y = -32 }, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) "xVT" = ( @@ -11317,6 +11657,8 @@ /obj/item/encryptionkey/headset_cargo, /obj/item/encryptionkey/headset_cargo, /obj/item/encryptionkey/headset_cargo, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/north, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "xYw" = ( @@ -13768,7 +14110,7 @@ aaa aaa aaa rKz -uQr +iLI rKz cMJ mnr @@ -13802,7 +14144,7 @@ aaa mnr cMJ rKz -uQr +pOo rKz aaa aaa @@ -14025,8 +14367,8 @@ aaa aaa aaa rKz -uQr -uQr +hhq +dyB rKz cMJ rKz @@ -14051,15 +14393,15 @@ aaa aaa aaa aaa -cMJ +lnx +xxl +xxl +xxl +xxl +lnx rKz -rKz -rKz -rKz -cMJ -rKz -uQr -uQr +dyB +cLG rKz aaa aaa @@ -14282,9 +14624,9 @@ aaa aaa aaa rKz -uQr -uQr -uQr +hhq +hhq +dyB rKz nci uYn @@ -14307,16 +14649,16 @@ aaa aaa aaa aaa -cMJ -rKz +lnx +xxl cHn dLw nTa vYJ -rKz -uQr -uQr -uQr +xxl +dyB +uAM +dyB rKz aaa aaa @@ -14540,8 +14882,8 @@ aaa aaa rKz rKz -uQr -uQr +hhq +hhq rKz wzR uYn @@ -14563,16 +14905,16 @@ aaa aaa aaa aaa -cMJ -rKz +lnx +xxl kzq kzq kzq kzq kzq -rKz -uQr -uQr +xxl +dyB +dyB rKz rKz aaa @@ -14798,7 +15140,7 @@ aaa aaa rKz rKz -uQr +hhq rKz wzR uYn @@ -14820,14 +15162,14 @@ aaa aaa aaa aaa -rKz +xxl ubJ kzq kzq kzq kzq pgu -rKz +xxl wkt rKz rKz @@ -15055,7 +15397,7 @@ aaa aaa aaa rKz -uQr +hhq rKz uuq uuq @@ -15077,15 +15419,15 @@ wfr wfr wfr wfr -rKz +xxl rmb nez nez nez nez qlV -rKz -uQr +xxl +dyB rKz aaa aaa @@ -15312,7 +15654,7 @@ aaa aaa aaa rKz -uQr +hhq rKz gby gby @@ -15334,15 +15676,15 @@ uQr uQr flZ tml -rKz +xxl wan dyB dyB dyB dyB riK -rKz -uQr +xxl +dyB rKz aaa aaa @@ -15569,7 +15911,7 @@ aaa aaa aaa rKz -uQr +hhq rKz rKz rKz @@ -15591,15 +15933,15 @@ uQr uQr uQr xQM -rKz +xxl kmN rHx rHx rHx rHx bEk -rKz -uQr +xxl +dyB rKz aaa aaa @@ -15826,13 +16168,13 @@ aaa aaa aaa rKz -uQr +hhq rKz cKo acc dAR rKz -pdj +leI meY rKz iwb @@ -15848,15 +16190,15 @@ uQr uQr uQr wdf -rKz +xxl giZ kzq kzq kzq kzq soZ -rKz -uQr +xxl +dyB rKz aaa aaa @@ -16083,14 +16425,14 @@ aaa aaa aaa tcU -pdj +hhq tcU mcJ -rNe +kzy kVa rKz -pdj -pdj +leI +mRK rKz oWW uQr @@ -16105,15 +16447,15 @@ uQr uQr uQr tiQ -rKz -rKz -kst +xxl +xxl +eoH wbU wKs -kst -rKz -rKz -uQr +eoH +xxl +xxl +dyB rKz aaa aaa @@ -16340,14 +16682,14 @@ aaa aaa aaa rKz -uQr +hhq rKz rNe kzy -rNe +kzy xRl -pdj -pdj +leI +fHe rKz jbO uQr @@ -16370,7 +16712,7 @@ lQJ lQJ wPX rKz -uQr +dyB rKz aaa aaa @@ -16597,13 +16939,13 @@ aaa aaa aaa rKz -uQr +hhq rKz rKz rKz rKz rKz -pdj +leI aSw rKz iwb @@ -16627,7 +16969,7 @@ lQJ lQJ wPX rKz -uQr +dyB rKz aaa aaa @@ -16854,14 +17196,14 @@ aaa aaa aaa rKz -uQr +hhq rKz twB mqG eJB rKz njK -pdj +leI rKz oMJ uQr @@ -16884,7 +17226,7 @@ lQJ lQJ uaS rKz -uQr +dyB rKz aaa aaa @@ -17111,15 +17453,15 @@ aaa aaa aaa tcU -pdj +hhq tcU wes -tOf -ucn -rKz -pdj -pdj +vYL +sRI rKz +leI +leI +kgc iwb uQr uQr @@ -17141,7 +17483,7 @@ lQJ lQJ oQH rKz -uQr +dyB rKz aaa aaa @@ -17368,15 +17710,15 @@ aaa aaa aaa rKz -uQr +hhq rKz tOf -mHc -tOf +vYL +vYL rXF -pdj -pdj -rKz +leI +leI +okl iwb uQr uQr @@ -17389,16 +17731,16 @@ uQr uQr uQr uQr -wdf -okl -lQJ -lQJ +gpK +adY +cNs +cNs lQJ lQJ lQJ oQH rKz -uQr +dyB rKz aaa aaa @@ -17625,13 +17967,13 @@ aaa aaa aaa rKz -uQr +hhq rKz rKz rKz rKz rKz -pdj +leI aSw rKz iwb @@ -17646,16 +17988,16 @@ uQr uQr uQr uQr -qLG +ilU rKz bGX -bGX +tmK bGX bGX tcU tcU rKz -uQr +dyB rKz aaa aaa @@ -17882,14 +18224,14 @@ aaa aaa aaa rKz -uQr +hhq rKz nOT mtw tMC rKz -pdj -pdj +leI +leI rKz dCg uQr @@ -17903,10 +18245,10 @@ uQr uQr uQr uQr -wdf +gpK rKz -jgW -dyB +ndr +hhq dyB dyB xHl @@ -18139,14 +18481,14 @@ aaa aaa aaa tcU -pdj +hhq tcU esz mtw xTi rKz -pdj -pdj +leI +leI rKz iwb uQr @@ -18160,16 +18502,16 @@ uQr uQr uQr uQr -wdf +gpK rKz pUv -tcX +qua dyB dyB ufa wHd rKz -uQr +dyB rKz aaa aaa @@ -18396,14 +18738,14 @@ aaa aaa aaa rKz -uQr +hhq rKz +mHc mtw -wal mtw cjl -pdj -pdj +leI +leI rKz iwb uQr @@ -18417,16 +18759,16 @@ uQr uQr uQr uQr -wdf +gpK rKz aBz -dyB +hhq dyB dyB xHl rne rKz -uQr +dyB rKz aaa aaa @@ -18653,13 +18995,13 @@ aaa aaa aaa rKz -uQr +hhq rKz rKz rKz rKz rKz -pdj +leI aSw rKz oMJ @@ -18676,14 +19018,14 @@ uQr uQr tGb rKz -jgW -dyB +eKy +hhq dyB dyB tcU tcU rKz -uQr +dyB rKz aaa aaa @@ -18910,14 +19252,14 @@ aaa aaa rKz rKz -uQr +hhq rKz dqv dqv dqv aqr -pdj -pdj +leI +leI rKz iwb uQr @@ -18931,7 +19273,7 @@ uQr uQr uQr uQr -wdf +gpK rKz dKt dyB @@ -18940,7 +19282,7 @@ dyB xHl chn rKz -uQr +dyB rKz rKz aaa @@ -19166,15 +19508,15 @@ aaa aaa rKz rKz -uQr -uQr +dyB +hhq rKz rxe xsd eEE mvN -pdj -pdj +leI +leI rKz iwb uQr @@ -19190,15 +19532,15 @@ uQr uQr xUX rKz -vtj +jgW dyB dyB dyB ufa wHd rKz -uQr -uQr +dyB +dyB rKz rKz aaa @@ -19422,17 +19764,17 @@ fZr fZr fZr rKz -uQr -uQr -uQr +dyB +hhq +hhq rKz tQa tQa tQa aqr -pdj -pdj -rKz +leI +leI +kgc oWW uQr uQr @@ -19445,18 +19787,18 @@ uQr uQr uQr uQr -tiQ +fBr rKz -dyB +mZH tcX dyB dyB xHl rne rKz -uQr -uQr -uQr +dyB +dyB +dyB rKz aaa aaa @@ -19687,33 +20029,33 @@ rKz rKz rKz rKz -pdj -aSw +xiV +cHE +adY +sHy +uQr +uQr +uQr +uQr +uQr +uQr +uQr +uQr +uQr +uQr +uQr +gpK rKz -iwb -uQr -uQr -uQr -uQr -uQr -uQr -uQr -uQr -uQr -uQr -uQr -wdf -rKz -aBz +cRx dyB dyB dyB tcU tcU rKz -uQr -uQr -uQr +dyB +dyB +dyB rKz aaa aaa @@ -19936,18 +20278,18 @@ aaa aaa aaa rKz -pdj -pdj -pdj -pdj -pdj -pdj -pdj -pdj -pdj -pdj +leI +opW +opW +opW +opW +opW +opW +opW +opW +leI rKz -rkj +vBO uQr uQr uQr @@ -19968,9 +20310,9 @@ dyB xHl chn rKz -uQr -uQr -uQr +dyB +dyB +dyB rKz aaa aaa @@ -20193,18 +20535,18 @@ aaa aaa aaa tcU -pdj +leI rtY -pdj -pdj -pdj -pdj -pdj -pdj -pdj -pdj +leI +leI +leI +leI +leI +leI +leI +leI rKz -iwb +sHy flZ uQr uQr @@ -20216,7 +20558,7 @@ uQr uQr uQr flZ -wdf +gpK rKz rKz rKz @@ -20225,9 +20567,9 @@ dyB ufa wHd rKz -uQr -uQr -uQr +dyB +dyB +dyB rKz aaa aaa @@ -20450,9 +20792,9 @@ aaa aaa aaa rKz -pdj -pdj -pdj +leI +leI +leI rKz rKz rKz @@ -20482,9 +20824,9 @@ dyB xHl rne rKz -uQr -uQr -uQr +dyB +dyB +dyB rKz aaa aaa @@ -20708,8 +21050,8 @@ aaa aaa rKz kmI -pdj -pdj +leI +leI rKz oXs dyB @@ -20732,7 +21074,7 @@ oHa oHa oHa esX -okl +sbG rKz dyB ejl @@ -20740,8 +21082,8 @@ rKz rKz rKz rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -20964,9 +21306,9 @@ aaa aaa aaa rKz -pdj -pdj -pdj +leI +leI +leI rKz xrn uhh @@ -20974,8 +21316,8 @@ tNv lsx lsx tcU -wdf -iwb +sdG +sHy uQr uQr uQr @@ -20997,8 +21339,8 @@ dyB dyB lqj rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -21221,9 +21563,9 @@ aaa aaa aaa tcU -pdj +leI rtY -pdj +leI rKz hQR fjF @@ -21232,7 +21574,7 @@ dyB dyB tcU wdf -iwb +sHy uQr uQr uQr @@ -21254,8 +21596,8 @@ dyB bxC riK rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -21478,9 +21820,9 @@ aaa aaa aaa rKz -pdj -pdj -pdj +leI +leI +leI rKz dyB dyB @@ -21489,7 +21831,7 @@ dyB tJs tcU wdf -iwb +sHy uQr uQr uQr @@ -21511,8 +21853,8 @@ dyB dyB dyB rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -21736,17 +22078,17 @@ aaa aaa rKz kmI -pdj -pdj +leI +leI rKz -dyB +ucn dyB dyB dyB tJs tcU wdf -iwb +sHy uQr uQr uQr @@ -21769,7 +22111,7 @@ bxC riK rKz wkt -uQr +dyB rKz aaa aaa @@ -21992,18 +22334,18 @@ aaa aaa aaa rKz -pdj -pdj -pdj +leI +leI +leI rKz xYq -dyB -dyB -dyB -dyB +hhq +hhq +hhq +hhq bik -wdf -iwb +gpK +sHy uQr uQr uQr @@ -22025,8 +22367,8 @@ dyB dyB dyB rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -22249,9 +22591,9 @@ fZr fZr fZr tcU -pdj +leI rtY -pdj +leI rKz tVf gkq @@ -22260,7 +22602,7 @@ dyB dyB tcU wdf -iwb +sHy uQr uQr uQr @@ -22282,8 +22624,8 @@ dyB bxC riK rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -22506,9 +22848,9 @@ aaa aaa aaa rKz -pdj -pdj -pdj +leI +leI +leI rKz gvJ okl @@ -22517,7 +22859,7 @@ okl gvJ nXH wdf -iwb +sHy uQr uQr uQr @@ -22539,8 +22881,8 @@ dyB dyB dyB rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -22764,8 +23106,8 @@ aaa aaa rKz kmI -pdj -pdj +leI +leI rKz okl jRA @@ -22796,8 +23138,8 @@ dyB bxC riK rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -23020,9 +23362,9 @@ aaa aaa aaa rKz -pdj -pdj -pdj +leI +leI +leI rKz sdJ jRA @@ -23031,7 +23373,7 @@ jRA okl kxE wdf -okl +adY iKc iKc beE @@ -23053,8 +23395,8 @@ dyB dyB dyB rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -23277,9 +23619,9 @@ aaa aaa aaa tcU -pdj +leI rtY -pdj +leI rKz oAL joB @@ -23288,9 +23630,9 @@ hbU okl nHC wdf -okl -okl -okl +adY +adY +adY okl okl okl @@ -23310,8 +23652,8 @@ dyB bxC riK rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -23534,9 +23876,9 @@ aaa aaa aaa rKz -pdj -pdj -pdj +leI +leI +leI rKz okl okl @@ -23548,8 +23890,8 @@ xYw epR emv uyf -kXT -okl +kVR +adY okl kXT okl @@ -23567,8 +23909,8 @@ dyB dyB qHd rKz -uQr -uQr +dyB +dyB rKz aaa aaa @@ -23792,8 +24134,8 @@ aaa aaa rKz kmI -pdj -pdj +leI +leI rKz rKz rKz @@ -23806,7 +24148,7 @@ rKz rKz rKz rKz -okl +adY fIc odB okl @@ -24048,17 +24390,17 @@ aaa aaa aaa tcU -pdj +leI rtY -pdj +leI dDy fuD gVQ uni vSE -fuD -rtY -fuD +wal +ndC +upr xbr uni dkA @@ -24305,9 +24647,9 @@ aHC aHC aHC rKz -pdj -pdj -pdj +leI +leI +leI pdj fuD pIm @@ -24320,7 +24662,7 @@ mdL mdL uOZ rKz -plk +xHJ qZp pdj qZp @@ -24566,7 +24908,7 @@ rKz oQJ rKz rKz -fuD +qvu ihi mdL rtY @@ -24582,7 +24924,7 @@ jwT aXS hec nVo -kou +nLd kXd nCk nCk @@ -24823,16 +25165,16 @@ dyB dyB dyB beC -fuD -leI -leI -leI -leI -leI -leI -leI -leI -fuD +kdy +opW +opW +opW +opW +opW +opW +opW +opW +kdy kou cSo gaa @@ -25339,8 +25681,8 @@ rKz rKz rKz sWw -kWe -mkW +sWw +sWw rKz qLX rKz @@ -25601,8 +25943,8 @@ bHP bHP trq rKz -mIl -mIl +mUo +hCU mIl rKz liz @@ -25858,11 +26200,11 @@ bHP bHP bHP rKz -dyB -dyB +rMb +hhq riK rKz -plk +xHJ gaa ujD mLn @@ -26111,19 +26453,19 @@ rKz ruB qYJ kQe -qYJ +aKM hgc mlM rKz exd -dyB -dyB +hhq +hhq hAB -cSo +lUQ hOx lTe nYV -nVo +maM wyw anV qZp @@ -26378,7 +26720,7 @@ dyB rKz plk qZp -pdj +rpJ qZp nPg rKz @@ -26635,7 +26977,7 @@ dyB rKz plk qZp -pdj +rpJ qZp nPg rKz @@ -26880,9 +27222,9 @@ aaa xWU gul cMJ -vYL -sRI -vYL +nra +bgO +mni rKz bvl fij @@ -26892,7 +27234,7 @@ uZM rKz dyB aHw -odB +xqr dyB aHw rKz @@ -27139,7 +27481,7 @@ cMJ cMJ xuL vYL -vYL +mni rKz dZs yao @@ -27394,23 +27736,23 @@ aaa aaa cMJ rKz -aAN -aAN vYL +aAN +mni rKz emC cds rKz rKz -aTj +hTw dyB -rJG -oee -oEK -oee -nlM dyB -aTj +dyB +hhq +dyB +dyB +dyB +fNd rKz rKz ims @@ -27662,7 +28004,7 @@ uZM dyB dyB oeW -uVE +vRI xUy vRI qqt @@ -27670,13 +28012,13 @@ dyB dyB uZM rKz -rKz -rKz -rKz -rKz -rKz -rKz -rKz +xxl +xxl +xxl +xxl +xxl +xxl +xxl aaa aaa aaa @@ -27908,7 +28250,7 @@ aaa aaa aaa rKz -wZN +vtj rGI oIA azt @@ -27918,22 +28260,22 @@ cLe dyB dyB dyB -wkF +hhW rlP hfm jmA -ihR +aso dyB dyB dyB tJS -rKz +xxl cMd cMd cMd cMd lUk -rKz +xxl aaa aaa aaa @@ -28167,7 +28509,7 @@ aaa tcU khG cxY -cxY +ivg cxY khG rKz @@ -28184,13 +28526,13 @@ dyB jtg lLl riK -kst +eoH dyB dyB xPn kzq fIs -rKz +xxl aaa aaa aaa @@ -28424,11 +28766,11 @@ aaa tcU vWU vWU -vWU -vWU -vWU +pOy +pOy +pOy wko -dyB +hhq ukC ldb dyB @@ -28447,7 +28789,7 @@ gjL xwk kzq mLW -rKz +xxl aaa aaa aaa @@ -28685,26 +29027,26 @@ vWU qec vWU rKz -hQR +ltP dyB dyB dyB -aKM +wkF rie -rie -rie -hhW +oEK +rJG +ihR dyB dyB dyB riK -kst +eoH dyB dyB xPn kzq rFH -rKz +xxl aaa aaa aaa @@ -28942,15 +29284,15 @@ hsb eWC rUK rKz -dyB -dyB -cBt -dyB -dyB -dyB -dyB -dyB -dyB +hhq +hhq +tyz +hhq +nlM +oee +sIJ +oee +dLR dyB cBt dyB @@ -28961,7 +29303,7 @@ kvs rVb kvs qrI -rKz +xxl aaa aaa aaa @@ -29202,23 +29544,23 @@ rKz gcO kst rKz -dyB -dyB -dyB -dyB +rMb +hhq +hhq +hhq dyB dyB dyB rKz kst gcO -rKz -rKz -rKz -rKz -rKz -rKz -cMJ +xxl +xxl +xxl +xxl +xxl +xxl +lnx aaa aaa aaa @@ -30228,7 +30570,7 @@ dPq frg ngI rKZ -frg +lin rKz cMJ aaa @@ -30238,7 +30580,7 @@ aaa aaa cMJ rKz -frg +lin rKZ ngI frg @@ -34136,7 +34478,7 @@ aaa aaa aaa aaa -aaa +lLq aaa aaa aaa diff --git a/modular_skyrat/modules/blueshield/code/game/objects/items/devices/radio/headset.dm b/modular_skyrat/modules/blueshield/code/game/objects/items/devices/radio/headset.dm index b0c097fb00c..bd0b14a7c30 100644 --- a/modular_skyrat/modules/blueshield/code/game/objects/items/devices/radio/headset.dm +++ b/modular_skyrat/modules/blueshield/code/game/objects/items/devices/radio/headset.dm @@ -4,6 +4,7 @@ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/ears.dmi' icon_state = "bshield_headset" keyslot = new /obj/item/encryptionkey/heads/blueshield + keyslot2 = new /obj/item/encryptionkey/headset_cent /obj/item/radio/headset/heads/blueshield/alt icon_state = "bshield_headset_alt" diff --git a/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm b/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm index 2262b9c618d..df181a689ed 100644 --- a/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm @@ -46,7 +46,7 @@ uniform = /obj/item/clothing/under/rank/security/blueshield suit = /obj/item/clothing/suit/armor/vest/blueshield gloves = /obj/item/clothing/gloves/tackler/combat/insulated - id = /obj/item/card/id/advanced/gold + id = /obj/item/card/id/advanced/centcom shoes = /obj/item/clothing/shoes/jackboots ears = /obj/item/radio/headset/heads/blueshield/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses diff --git a/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm b/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm index 635c262c6b9..10c59c28058 100644 --- a/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm +++ b/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm @@ -57,6 +57,7 @@ shoes = /obj/item/clothing/shoes/combat/swat head = /obj/item/clothing/head/soft/enclaveo back = /obj/item/storage/backpack/satchel/leather + box = /obj/item/storage/box/survival/security chameleon_extras = list(/obj/item/gun/energy/e_gun) diff --git a/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm b/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm index 23857f69c10..36d507d8469 100644 --- a/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm +++ b/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm @@ -57,7 +57,7 @@ belt = /obj/item/pda/nanotrasen_representative glasses = /obj/item/clothing/glasses/eyepatch mask = /obj/item/clothing/mask/cigarette/cigar/cohiba - ears = /obj/item/radio/headset/headset_cent/commander + ears = /obj/item/radio/headset/headset_cent/fleetmaster gloves = /obj/item/clothing/gloves/tackler/combat/insulated uniform = /obj/item/clothing/under/rank/centcom/commander suit = /obj/item/clothing/suit/toggle/armor/vest/centcom_formal @@ -65,6 +65,7 @@ shoes = /obj/item/clothing/shoes/combat/swat head = /obj/item/clothing/head/centhat back = /obj/item/storage/backpack/satchel/leather + box = /obj/item/storage/box/survival/security backpack_contents = list(/obj/item/melee/baton/loaded, /obj/item/ammo_box/a357 = 4) skillchips = list(/obj/item/skillchip/disk_verifier) @@ -90,3 +91,16 @@ icon_state = "Captain" delete_after_roundstart = FALSE jobspawn_override = TRUE + +/obj/item/radio/headset/headset_cent/fleetmaster + name = "\improper CentCom bowman headset" + desc = "A headset used by the upper echelons of Nanotrasen." + icon_state = "cent_headset_alt" + inhand_icon_state = "cent_headset_alt" + keyslot = new /obj/item/encryptionkey/heads/captain + keyslot2 = new /obj/item/encryptionkey/headset_cent + command = TRUE + +/obj/item/radio/headset/headset_cent/fleetmaster/ComponentInitialize() + . = ..() + AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm b/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm index 2f4e70371b9..3c37cf6def6 100644 --- a/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm +++ b/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm @@ -55,6 +55,7 @@ suit = /obj/item/clothing/suit/toggle/ shoes = /obj/item/clothing/shoes/combat/swat back = /obj/item/storage/backpack/satchel/leather + box = /obj/item/storage/box/survival/security chameleon_extras = list(/obj/item/gun/energy/e_gun) diff --git a/modular_skyrat/modules/central_command_module/code/obj/wall.dm b/modular_skyrat/modules/central_command_module/code/obj/wall.dm new file mode 100644 index 00000000000..b29bff28211 --- /dev/null +++ b/modular_skyrat/modules/central_command_module/code/obj/wall.dm @@ -0,0 +1,19 @@ +/////////////////////////////////////////////NCV Titan////////////////////////////////////////////////////////// + +/turf/closed/indestructible/titanium + name = "wall" + desc = "A light-weight titanium wall used in shuttles." + icon = 'icons/turf/walls/shuttle_wall.dmi' + icon_state = "shuttle_wall-0" + base_icon_state = "shuttle_wall" + flags_1 = CAN_BE_DIRTY_1 + flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD + smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS + smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) + +/turf/closed/indestructible/titanium/nodiagonal + icon = 'icons/turf/walls/shuttle_wall.dmi' + icon_state = "map-shuttle_nd" + base_icon_state = "shuttle_wall" + smoothing_flags = SMOOTH_BITMASK diff --git a/tgstation.dme b/tgstation.dme index 7cc93e14514..40685dc312c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4105,6 +4105,7 @@ #include "modular_skyrat\modules\central_command_module\code\jobs\deck_crew.dm" #include "modular_skyrat\modules\central_command_module\code\jobs\fleetmaster.dm" #include "modular_skyrat\modules\central_command_module\code\jobs\operations_inspector.dm" +#include "modular_skyrat\modules\central_command_module\code\obj\wall.dm" #include "modular_skyrat\modules\chaplain\code\game\objects\items\implants\mortis.dm" #include "modular_skyrat\modules\cme\code\_cme_defines.dm" #include "modular_skyrat\modules\cme\code\cme.dm"