diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 8b6c14f4..09afdd23 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -9260,26 +9260,6 @@ }, /turf/open/floor/plasteel, /area/centcom/evac) -"tT" = ( -/obj/structure/table, -/obj/item/razor{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/storage/pill_bottle/happinesspsych{ - desc = "Contains pills used for staving off depression. Only works half the time. Be wary of addiction."; - name = "Antidepressants"; - pixel_x = -7; - pixel_y = 13 - }, -/obj/item/storage/pill_bottle/paxpsych{ - desc = "Contains pills for aiding with hormone regulator implants. Usually used on the mentally unstable."; - name = "Hormonal Regulator Supplements"; - pixel_x = -5; - pixel_y = 1 - }, -/turf/open/floor/plasteel/white, -/area/centcom/ferry) "tU" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -10333,18 +10313,17 @@ }, /turf/open/floor/carpet, /area/wizard_station) -"wg" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/turf/open/floor/wood, -/area/centcom/ferry) "wh" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/three) +"wi" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/chair/sofa/right, +/turf/open/floor/wood, +/area/centcom/ferry) "wj" = ( /obj/effect/turf_decal/loading_area{ icon_state = "drain"; @@ -10683,6 +10662,13 @@ }, /turf/open/floor/carpet/black, /area/centcom/control) +"wW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/banner/command/mundane, +/turf/open/floor/plasteel, +/area/centcom/evac) "wX" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -11165,11 +11151,6 @@ }, /turf/open/floor/wood, /area/centcom/ferry) -"ym" = ( -/obj/effect/turf_decal/stripes/line, -/obj/item/banner/command/mundane, -/turf/open/floor/plasteel, -/area/centcom/control) "yn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum, @@ -12204,13 +12185,6 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership) -"AF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/banner/command/mundane, -/turf/open/floor/plasteel, -/area/centcom/evac) "AG" = ( /obj/structure/ladder/unbreakable/binary/space, /turf/open/indestructible/airblock, @@ -13561,7 +13535,7 @@ "Dp" = ( /obj/structure/chair/sofa/right, /obj/machinery/button/door{ - id = CCStationMonitor; + id = "CCStationMonitor"; normaldoorcontrol = 1; pixel_y = 30; specialfunctions = 4 @@ -14563,7 +14537,7 @@ /area/centcom/ferry) "FC" = ( /obj/machinery/door/airlock/centcom{ - id_tag = CCStationMonitor; + id_tag = "CCStationMonitor"; name = "Station Monitoring Office"; req_access_txt = "101" }, @@ -15163,6 +15137,11 @@ }, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) +"GN" = ( +/obj/effect/turf_decal/stripes/line, +/obj/item/banner/command/mundane, +/turf/open/floor/plasteel, +/area/centcom/control) "GO" = ( /obj/structure/table/wood, /obj/structure/sign/plaques/golden{ @@ -15380,17 +15359,6 @@ }, /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) -"Hi" = ( -/obj/structure/flora/crystal/medium/growth{ - icon_state = "crystalgrowth3"; - pixel_x = -24; - pixel_y = -1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/indestructible/layenia/crystal/garden, -/area/centcom/ferry) "Hj" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -17431,19 +17399,6 @@ /obj/item/pen, /turf/open/floor/plasteel, /area/centcom/control) -"Lm" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen/fountain/captain, -/obj/item/reagent_containers/food/drinks/prospacillin{ - pixel_x = -13; - pixel_y = 14 - }, -/obj/item/reagent_containers/glass/beaker/jar{ - pixel_x = 11 - }, -/turf/open/floor/plasteel/grimy, -/area/centcom/ferry) "Lo" = ( /obj/structure/table/wood, /obj/machinery/computer/med_data/laptop, @@ -17761,10 +17716,61 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) +"Ml" = ( +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/structure/dresser, +/obj/item/toy/plush/mammal/winfre{ + item_state = "Winfre"; + name = "Winfre, Destroyer of Fun"; + pixel_y = 17 + }, +/turf/open/floor/wood, +/area/centcom/ferry) "Mm" = ( /obj/machinery/processor, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) +"Mq" = ( +/obj/structure/closet/crate/secure{ + anchored = 1; + name = "secure gear crate"; + req_access_txt = "101" + }, +/obj/item/radio/headset/headset_cent/alt, +/obj/item/clothing/glasses/thermal/eyepatch, +/obj/item/implanter{ + imp_type = "/obj/item/organ/cyberimp/arm/mblade/l"; + name = "Scytheblade activator (left-side)" + }, +/obj/item/implanter{ + imp_type = "/obj/item/organ/cyberimp/arm/mblade"; + name = "Scytheblade activator (right-side)" + }, +/obj/item/clothing/under/rank/centcom_commander, +/obj/item/clothing/suit/hooded/wintercoat/centcom, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/gloves/combat, +/obj/item/melee/classic_baton/telescopic, +/obj/item/pda/lieutenant{ + hidden = 0 + }, +/obj/item/clothing/neck/cloak/centcom, +/obj/item/storage/backpack/satchel/leather, +/obj/item/card/id/centcom{ + assignment = "Centcom Commander"; + name = "Winfre Ryyn-Kinar's ID Card (Centcom Commander)"; + registered_name = "Winfre Ryyn-Kinar" + }, +/obj/item/clothing/neck/stripedbluescarf, +/obj/item/clothing/glasses/hud/security/sunglasses{ + vision_correction = 1 + }, +/obj/item/flashlight/seclite, +/obj/item/gun/energy/e_gun/dragnet/snare, +/turf/open/floor/plasteel/grimy, +/area/centcom/ferry) "Mr" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/greenplaidshirt, @@ -18061,6 +18067,17 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"Nt" = ( +/obj/structure/flora/crystal/medium/growth{ + icon_state = "crystalgrowth2"; + pixel_x = -23; + pixel_y = -1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/indestructible/layenia/crystal/garden, +/area/centcom/ferry) "Nu" = ( /turf/open/floor/wood, /area/syndicate_mothership) @@ -18132,6 +18149,16 @@ /obj/structure/chair/sofa/right, /turf/open/floor/wood, /area/centcom/ferry) +"NI" = ( +/obj/structure/table/wood, +/obj/item/trash/candy, +/obj/item/trash/syndi_cakes{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/flashlight/lamp/green, +/turf/open/floor/plasteel/grimy, +/area/centcom/ferry) "NJ" = ( /obj/structure/closet/secure_closet/freezer/fridge{ locked = 0 @@ -18344,6 +18371,19 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/two) +"Os" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fountain/captain, +/obj/item/reagent_containers/food/drinks/prospacillin{ + pixel_x = -13; + pixel_y = 14 + }, +/obj/item/reagent_containers/glass/beaker/jar{ + pixel_x = 11 + }, +/turf/open/floor/plasteel/grimy, +/area/centcom/ferry) "Ot" = ( /obj/machinery/door/airlock{ dir = 4; @@ -18482,6 +18522,11 @@ }, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) +"OY" = ( +/obj/effect/turf_decal/stripes/line, +/obj/item/banner/command/mundane, +/turf/open/floor/plasteel, +/area/centcom/evac) "OZ" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plating, @@ -18526,12 +18571,6 @@ }, /turf/open/floor/plasteel/white, /area/centcom/holding) -"Pm" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10" - }, -/turf/open/floor/wood, -/area/centcom/ferry) "Pn" = ( /turf/closed/indestructible/fakedoor{ name = "Equipment Storage" @@ -18626,36 +18665,29 @@ smooth = 1 }, /area/centcom/holding) -"PB" = ( -/obj/structure/chair/sofa/left, -/turf/open/floor/wood, +"PC" = ( +/obj/structure/table, +/obj/item/razor{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/storage/pill_bottle/happinesspsych{ + desc = "Contains pills used for staving off depression. Only works half the time. Be wary of addiction."; + name = "Antidepressants"; + pixel_x = -7; + pixel_y = 13 + }, +/obj/item/storage/pill_bottle/paxpsych{ + desc = "Contains pills for aiding with hormone regulator implants. Usually used on the mentally unstable."; + name = "Hormonal Regulator Supplements"; + pixel_x = -5; + pixel_y = 1 + }, +/turf/open/floor/plasteel/white, /area/centcom/ferry) "PD" = ( /turf/open/floor/plasteel/cafeteria, /area/syndicate_mothership) -"PE" = ( -/obj/structure/closet/cabinet, -/obj/item/card/id/centcom{ - assignment = "Off-Duty Centcom Commander"; - name = "Winfre Ryyn-Kinar's ID Card (Off-Duty Centcom Commander)"; - registered_name = "Winfre Ryyn-Kinar" - }, -/obj/item/clothing/under/pants/blackjeans, -/obj/item/clothing/suit/jacket/flannel/aqua, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/jackboots/tall, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/neck/stripedbluescarf, -/obj/item/clothing/glasses/regular, -/obj/item/clothing/glasses/sunglasses/big, -/obj/item/clothing/glasses/thermal/eyepatch, -/obj/item/storage/backpack/satchel/leather, -/obj/item/radio/headset/headset_cent/alt, -/obj/item/pda/lieutenant{ - hidden = 0 - }, -/turf/open/floor/wood, -/area/centcom/ferry) "PF" = ( /obj/machinery/chem_dispenser/drinks, /turf/closed/indestructible{ @@ -18761,48 +18793,17 @@ }, /turf/open/floor/mineral/titanium, /area/centcom/evac) -"Qd" = ( -/obj/structure/closet/crate/secure{ - anchored = 1; - name = "secure gear crate"; - req_access_txt = "101" - }, -/obj/item/radio/headset/headset_cent/alt, -/obj/item/clothing/glasses/thermal/eyepatch, -/obj/item/implanter{ - imp_type = "/obj/item/organ/cyberimp/arm/mblade/l; - name = "Scytheblade activator (left-side) - }, -/obj/item/implanter{ - imp_type = "/obj/item/organ/cyberimp/arm/mblade; - name = "Scytheblade activator (right-side) - }, -/obj/item/clothing/under/rank/centcom_commander, -/obj/item/clothing/suit/hooded/wintercoat/centcom, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/gloves/combat, -/obj/item/melee/classic_baton/telescopic, -/obj/item/pda/lieutenant{ - hidden = 0 - }, -/obj/item/clothing/neck/cloak/centcom, -/obj/item/storage/backpack/satchel/leather, -/obj/item/card/id/centcom{ - assignment = "Centcom Commander"; - name = "Winfre Ryyn-Kinar's ID Card (Centcom Commander)"; - registered_name = "Winfre Ryyn-Kinar" - }, -/obj/item/clothing/neck/stripedbluescarf, -/obj/item/clothing/glasses/hud/security/sunglasses{ - vision_correction = 1 - }, -/obj/item/flashlight/seclite, -/obj/item/gun/energy/e_gun/dragnet/snare, -/turf/open/floor/plasteel/grimy, -/area/centcom/ferry) "Qe" = ( /turf/open/ai_visible, /area/ai_multicam_room) +"Qf" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/turf/open/floor/wood, +/area/centcom/ferry) "Qk" = ( /obj/machinery/vending/cigarette, /turf/open/floor/wood, @@ -18817,6 +18818,10 @@ "Qq" = ( /turf/open/floor/plasteel/freezer, /area/syndicate_mothership) +"Qr" = ( +/obj/structure/chair/sofa/left, +/turf/open/floor/wood, +/area/centcom/ferry) "Qs" = ( /obj/structure/table/plasmaglass, /obj/item/reagent_containers/food/drinks/shaker, @@ -19120,11 +19125,6 @@ }, /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) -"RF" = ( -/obj/effect/turf_decal/stripes/line, -/obj/item/banner/command/mundane, -/turf/open/floor/plasteel, -/area/centcom/evac) "RI" = ( /obj/structure/medkit_cabinet{ pixel_x = -27 @@ -19352,18 +19352,6 @@ }, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/four) -"SA" = ( -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/structure/dresser, -/obj/item/toy/plush/mammal/winfre{ - item_state = "Winfre"; - name = "Winfre, Destroyer of Fun"; - pixel_y = 17 - }, -/turf/open/floor/wood, -/area/centcom/ferry) "SB" = ( /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/fullgrass, @@ -19433,6 +19421,10 @@ }, /turf/open/floor/plasteel, /area/centcom/control) +"SM" = ( +/obj/item/banner/command/mundane, +/turf/open/floor/plasteel, +/area/centcom/ferry) "SN" = ( /obj/structure/closet/crate/bin, /turf/open/floor/wood, @@ -19505,16 +19497,6 @@ /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/centcom/holding) -"Td" = ( -/obj/structure/table/wood, -/obj/item/trash/candy, -/obj/item/trash/syndi_cakes{ - pixel_x = -8; - pixel_y = 8 - }, -/obj/item/flashlight/lamp/green, -/turf/open/floor/plasteel/grimy, -/area/centcom/ferry) "Th" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/sparsegrass, @@ -19666,13 +19648,6 @@ }, /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) -"TG" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/chair/sofa/right, -/turf/open/floor/wood, -/area/centcom/ferry) "TI" = ( /obj/structure/table/reinforced, /obj/item/kitchen/knife, @@ -20280,6 +20255,17 @@ }, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/one) +"VD" = ( +/obj/structure/flora/crystal/medium/growth{ + icon_state = "crystalgrowth3"; + pixel_x = -24; + pixel_y = -1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/indestructible/layenia/crystal/garden, +/area/centcom/ferry) "VE" = ( /obj/structure/flora/ausbushes/sunnybush, /turf/open/floor/grass, @@ -20450,10 +20436,6 @@ }, /turf/open/floor/plasteel, /area/centcom/control) -"Wg" = ( -/obj/item/banner/command/mundane, -/turf/open/floor/plasteel, -/area/centcom/ferry) "Wh" = ( /obj/machinery/button/door{ id = "CCDormChemlight"; @@ -20554,17 +20536,6 @@ /obj/structure/window, /turf/open/floor/carpet/royalblack, /area/centcom/ferry) -"WB" = ( -/obj/structure/flora/crystal/medium/growth{ - icon_state = "crystalgrowth2"; - pixel_x = -23; - pixel_y = -1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/indestructible/layenia/crystal/garden, -/area/centcom/ferry) "WC" = ( /obj/structure/table/reinforced, /obj/item/pen, @@ -20733,6 +20704,15 @@ }, /turf/open/floor/carpet/black, /area/centcom/ferry) +"Xc" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/structure/medkit_cabinet{ + pixel_x = -27 + }, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "Xd" = ( /obj/structure/window/reinforced{ dir = 1 @@ -21179,6 +21159,12 @@ /obj/machinery/vr_sleeper, /turf/open/floor/wood, /area/centcom/holding) +"Yq" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-10" + }, +/turf/open/floor/wood, +/area/centcom/ferry) "Ys" = ( /obj/structure/table/reinforced, /turf/open/floor/mineral/plastitanium/red, @@ -21201,15 +21187,6 @@ /obj/structure/closet/crate/freezer/blood, /turf/open/floor/wood, /area/centcom/holding) -"Yv" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/medkit_cabinet{ - pixel_x = -27 - }, -/turf/open/floor/plasteel/white, -/area/centcom/ferry) "Yw" = ( /turf/closed/indestructible/fakedoor{ name = "External Access" @@ -21374,10 +21351,7 @@ }, /turf/open/floor/wood, /area/centcom/holding) -"Zc" = ( -/turf/open/indestructible/binary, -/area/space) -"Zd" = ( +"Zb" = ( /obj/structure/table/wood, /obj/item/screwdriver{ pixel_x = 15; @@ -21386,6 +21360,9 @@ /obj/item/gun/energy/laser/sizeray, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) +"Zc" = ( +/turf/open/indestructible/binary, +/area/space) "Zf" = ( /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plasteel, @@ -21443,6 +21420,29 @@ }, /turf/open/floor/carpet/black, /area/centcom/ferry) +"Zo" = ( +/obj/structure/closet/cabinet, +/obj/item/card/id/centcom{ + assignment = "Off-Duty Centcom Commander"; + name = "Winfre Ryyn-Kinar's ID Card (Off-Duty Centcom Commander)"; + registered_name = "Winfre Ryyn-Kinar" + }, +/obj/item/clothing/under/pants/blackjeans, +/obj/item/clothing/suit/jacket/flannel/aqua, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/jackboots/tall, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/neck/stripedbluescarf, +/obj/item/clothing/glasses/regular, +/obj/item/clothing/glasses/sunglasses/big, +/obj/item/clothing/glasses/thermal/eyepatch, +/obj/item/storage/backpack/satchel/leather, +/obj/item/radio/headset/headset_cent/alt, +/obj/item/pda/lieutenant{ + hidden = 0 + }, +/turf/open/floor/wood, +/area/centcom/ferry) "Zq" = ( /obj/structure/window{ dir = 4 @@ -51655,9 +51655,9 @@ mD mD mD mD -WB +Nt mD -Hi +VD mD mD mD @@ -51911,10 +51911,10 @@ RI Uz TQ mD -Yv +Xc TS Uz -tT +PC mD Oi RI @@ -52685,7 +52685,7 @@ mD Ue oB oB -Pm +Yq mD NH oB @@ -52939,9 +52939,9 @@ UU pg TY mD -wg +Qf pg -Td +NI TY mD Ss @@ -53196,9 +53196,9 @@ tQ pg Ue mD -SA +Ml pg -Zd +Zb XZ mD XI @@ -53453,9 +53453,9 @@ pg pg oB mD -PE +Zo pg -Lm +Os oB mD UP @@ -53710,9 +53710,9 @@ pg pg vx mD -TG +wi pg -Qd +Mq TY mD XR @@ -53967,10 +53967,10 @@ Wh oB qd mD -PB +Qr Tp oB -Pm +Yq mD Ue yk @@ -57038,7 +57038,7 @@ xe wr wx nU -Wg +SM ZW ZW ZW @@ -73471,12 +73471,12 @@ nq nq nq pt -ym +GN in qz qy qx -AF +wW pF uB uB @@ -73488,7 +73488,7 @@ uB uB uB rT -RF +OY qx qy qx