From 207e4e5c4e158821ad59f909e1716019720b3188 Mon Sep 17 00:00:00 2001 From: Glyphee Date: Fri, 20 Oct 2023 23:10:33 -0400 Subject: [PATCH 1/4] my office change and typo fix in cc medbay --- _maps/map_files/generic/CentCom.dmm | 305 ++++++++++++++++++---------- 1 file changed, 201 insertions(+), 104 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 224e6319e2d6..d62353efa723 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -607,6 +607,9 @@ }, /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/admin_hangout) +"cp" = ( +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "cq" = ( /obj/structure/railing/wood, /turf/open/floor/glass/reinforced, @@ -633,7 +636,9 @@ /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) "cu" = ( -/obj/structure/organ_creator, +/obj/structure/organ_creator{ + name = "all in one organic medical fabricator" + }, /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) @@ -822,6 +827,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"dc" = ( +/obj/machinery/door/poddoor/shutters/indestructible/preopen, +/obj/machinery/door/airlock/centcom{ + dir = 4; + name = "Ook's Streamer Den" + }, +/turf/closed/indestructible/fakeglass, +/area/centcom/central_command_areas/admin) "dd" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/stripes/line{ @@ -869,6 +882,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"dp" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 1 + }, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/admin) "dq" = ( /obj/structure/railing/wood{ dir = 1 @@ -877,12 +896,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) -"ds" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen/fourcolor, -/turf/open/floor/stone, -/area/centcom/central_command_areas/admin) "dt" = ( /obj/structure/window/reinforced/tinted/frosted, /obj/structure/closet/mini_fridge, @@ -1349,11 +1362,27 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"fA" = ( +/obj/item/fish/chasm_crab, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "fB" = ( /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) "fC" = ( -/turf/open/floor/stone, +/obj/structure/table/reinforced/titaniumglass, +/obj/machinery/door/window/left/directional/west{ + name = "Secret Stuff"; + req_access = list("robotics"); + dir = 4 + }, +/obj/item/reagent_containers/pill/adminordrazine{ + list_reagents = list(/datum/reagent/medicine/adminordrazine = 99999); + name = "sv_cheats 1"; + desc = "god"; + color = "#fcba03" + }, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "fD" = ( /obj/machinery/light/neon_lining{ @@ -1386,6 +1415,10 @@ }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"fL" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "fQ" = ( /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/siding/dark{ @@ -1868,9 +1901,8 @@ /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) "hF" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, -/turf/open/floor/stone, +/obj/structure/falsewall/reinforced, +/turf/open/floor/plating, /area/centcom/central_command_areas/admin) "hH" = ( /turf/open/floor/holofloor/hyperspace, @@ -2566,10 +2598,11 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) "ll" = ( -/obj/machinery/door/airlock/wood{ - name = "Gabbie's Office" +/obj/machinery/door/airlock/centcom{ + dir = 4; + name = "Glyphee's Garbage Dump" }, -/turf/open/floor/wood, +/turf/open/floor/iron, /area/centcom/central_command_areas/admin) "lm" = ( /obj/structure/window/plasma/spawner/directional/north, @@ -2809,12 +2842,6 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/borbop) -"mv" = ( -/obj/machinery/door/poddoor/shutters/indestructible/preopen{ - dir = 4 - }, -/turf/closed/indestructible/fakeglass, -/area/centcom/central_command_areas/admin) "my" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/medical, @@ -3714,7 +3741,6 @@ /area/centcom/central_command_areas/medical) "qD" = ( /obj/structure/table/reinforced, -/obj/machinery/infuser, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) "qE" = ( @@ -3918,11 +3944,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"rD" = ( -/obj/structure/table/wood, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/carpet/red, -/area/centcom/central_command_areas/admin) "rF" = ( /obj/structure/chair/sofa/right{ dir = 8 @@ -3990,6 +4011,12 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/borbop) +"rV" = ( +/obj/machinery/computer/camera_advanced{ + dir = 4 + }, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "rW" = ( /obj/structure/railing{ dir = 8; @@ -4465,6 +4492,10 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"tM" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "tW" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -5378,11 +5409,8 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) -"xF" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/stone, +"xE" = ( +/turf/open/floor/plating, /area/centcom/central_command_areas/admin) "xG" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, @@ -6359,6 +6387,12 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"Bq" = ( +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "Br" = ( /obj/structure/railing/wood{ dir = 8 @@ -6853,9 +6887,14 @@ /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) "Ef" = ( +/obj/structure/sign/painting/large/library{ + pixel_y = 28 + }, /obj/structure/table/wood, -/obj/machinery/computer/security/wooden_tv, -/turf/open/floor/carpet/red, +/obj/item/mod/control/pre_equipped/chrono{ + desc = "It smells freshly laundered." + }, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Eh" = ( /obj/effect/turf_decal/siding/dark{ @@ -7319,14 +7358,6 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) -"FQ" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Gabbie's Fax"; - name = "Gabbie's Fax Machine" - }, -/turf/open/floor/stone, -/area/centcom/central_command_areas/admin) "FS" = ( /obj/machinery/computer/records/medical/laptop{ dir = 4 @@ -8057,6 +8088,10 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"IP" = ( +/obj/item/clothing/mask/facehugger/dead, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "IR" = ( /obj/structure/table/wood/fancy/royalblack, /obj/effect/turf_decal/siding/wood, @@ -9233,6 +9268,12 @@ dir = 10 }, /area/centcom/central_command_areas/hall) +"MU" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/maintenance/two, +/obj/machinery/recycler/deathtrap, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "MW" = ( /obj/machinery/status_display/evac/directional/west, /obj/machinery/light/directional/west, @@ -9554,11 +9595,10 @@ }, /area/centcom/central_command_areas/hall) "Ou" = ( -/obj/structure/table/wood, -/obj/machinery/modular_computer/console/preset/id/centcom{ +/obj/structure/chair/comfy/lime{ dir = 8 }, -/turf/open/floor/carpet/red, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Ox" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, @@ -10147,6 +10187,10 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/evacuation/ship) +"Rl" = ( +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "Rm" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -10316,6 +10360,15 @@ /obj/structure/hedge, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"RR" = ( +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) +"RS" = ( +/obj/structure/disposalpipe/loafer{ + dir = 4 + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "RT" = ( /obj/machinery/light/directional/south, /turf/open/floor/grass, @@ -10394,6 +10447,12 @@ /obj/structure/chair/sofa/corp, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"So" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "Sq" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -10837,6 +10896,10 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Ud" = ( +/obj/effect/decal/cleanable/garbage, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "Uf" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -11052,7 +11115,30 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) "Vo" = ( -/turf/open/floor/carpet/red, +/obj/structure/table/reinforced/titaniumglass, +/obj/structure/window/reinforced/survival_pod/spawner/directional{ + dir = 1 + }, +/obj/machinery/door/window/left/directional/west{ + name = "Secret Stuff"; + req_access = list("robotics"); + dir = 4 + }, +/obj/item/melee/powerfist{ + name = "Iron"; + desc = "You load sixteen tons..."; + force = 1000; + pixel_y = 4; + color = "#fcba03" + }, +/obj/item/melee/powerfist{ + name = "Steel"; + desc = "What do you get?"; + force = 1000; + pixel_y = -5; + color = "#fcba03" + }, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Vp" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, @@ -11068,6 +11154,13 @@ /obj/structure/mannequin, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"Vq" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/delivery_chute, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "Vs" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/wood/fancy/royalblue, @@ -11133,7 +11226,9 @@ /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/botany) "VD" = ( -/turf/closed/wall/mineral/iron, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/iron, /area/centcom/central_command_areas/admin) "VE" = ( /obj/structure/table/reinforced, @@ -11401,6 +11496,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"WO" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + name = "Glyphee's Fax Machine"; + fax_name = "Glyphee's Spam Mail" + }, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "WP" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -11502,9 +11605,12 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) "Xi" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/security/laptop, -/turf/open/floor/stone, +/obj/machinery/door/airlock/centcom{ + dir = 4; + name = "Glyphee's Secret Office" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Xj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -11547,9 +11653,6 @@ /obj/machinery/computer/monitor, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) -"Xq" = ( -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) "Xr" = ( /obj/machinery/keycard_auth/directional/south, /obj/structure/table/reinforced, @@ -11630,10 +11733,11 @@ /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) "XG" = ( -/obj/structure/chair/comfy/black{ - dir = 4 +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 4; + desc = "A specialized console to connect to gaming computers to be able to broadcast live. Seriously, where does Ook find this stuff?" }, -/turf/open/floor/carpet/red, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "XI" = ( /obj/structure/table/abductor, @@ -11778,13 +11882,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"Yl" = ( -/obj/machinery/door/airlock/wood{ - name = "Gabbie's Office" - }, -/obj/effect/mapping_helpers/airlock/access/any/admin/captain, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) "Yn" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/supplypod) @@ -40869,10 +40966,10 @@ aa aa aa On -Zf -Zf -Zf -Zf +On +On +On +On On On On @@ -41126,9 +41223,9 @@ aa aa aa On -Vo +WO XG -Vo +rV Vo fC On @@ -41384,10 +41481,10 @@ Zf On On Ef -rD +cp Ou -Vo -fC +cp +cp On lm Zn @@ -41640,11 +41737,11 @@ nO uk hp On -fC -xF -Vo -Vo -fC +cp +Bq +Bq +Bq +cp On TQ AS @@ -41898,10 +41995,10 @@ uk RK On Xi -fC -Vo -fC -ds +On +On +On +On On TQ FI @@ -42155,10 +42252,10 @@ RZ yw On hF -fC -Vo -fC -FQ +On +VD +tM +Fy On TQ FI @@ -42411,10 +42508,10 @@ Ji uk xP On -VD -VD -Yl -VD +So +IP +fL +fA VD On TQ @@ -42668,11 +42765,11 @@ Ji uk uk On -Fy -Fy -Xq -Fy -Fy +RS +RR +xE +xE +Ud On TQ AS @@ -42925,11 +43022,11 @@ Ji uk dU On -Fy -Fy -Xq -Fy -Fy +Vq +Rl +xE +fL +MU On aO qx @@ -43179,15 +43276,15 @@ On On On bO -IS +dc +On +On On On -mv -mv ll -mv -mv -bF +On +On +dp qZ qZ qZ From 523e0770676faa90149d901cd98e9dd4d6e17128 Mon Sep 17 00:00:00 2001 From: Glyphee Date: Fri, 20 Oct 2023 23:30:46 -0400 Subject: [PATCH 2/4] light fixes --- _maps/map_files/generic/CentCom.dmm | 70 ++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index d62353efa723..2eba8c0e41c3 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -608,6 +608,7 @@ /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/admin_hangout) "cp" = ( +/obj/structure/fans/tiny/invisible, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "cq" = ( @@ -1364,6 +1365,7 @@ /area/centcom/central_command_areas/evacuation/ship) "fA" = ( /obj/item/fish/chasm_crab, +/obj/structure/fans/tiny/invisible, /turf/open/floor/iron, /area/centcom/central_command_areas/admin) "fB" = ( @@ -1382,6 +1384,15 @@ desc = "god"; color = "#fcba03" }, +/obj/structure/fans/tiny/invisible, +/obj/item/tank/internals/oxygen/yellow{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/tank/internals/oxygen/yellow{ + pixel_y = -7; + pixel_x = 7 + }, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "fD" = ( @@ -1417,6 +1428,7 @@ /area/centcom/central_command_areas/borbop) "fL" = ( /obj/effect/gibspawner/human/bodypartless, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/centcom/central_command_areas/admin) "fQ" = ( @@ -1902,6 +1914,7 @@ /area/centcom/central_command_areas/borbop) "hF" = ( /obj/structure/falsewall/reinforced, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/centcom/central_command_areas/admin) "hH" = ( @@ -2602,6 +2615,7 @@ dir = 4; name = "Glyphee's Garbage Dump" }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/iron, /area/centcom/central_command_areas/admin) "lm" = ( @@ -4015,6 +4029,7 @@ /obj/machinery/computer/camera_advanced{ dir = 4 }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "rW" = ( @@ -4494,6 +4509,7 @@ /area/centcom/central_command_areas/kitchen) "tM" = ( /obj/effect/gibspawner/human/bodypartless, +/obj/structure/fans/tiny/invisible, /turf/open/floor/iron, /area/centcom/central_command_areas/admin) "tW" = ( @@ -5410,6 +5426,7 @@ /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) "xE" = ( +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/centcom/central_command_areas/admin) "xG" = ( @@ -6287,6 +6304,12 @@ dir = 8 }, /area/centcom/central_command_areas/hall) +"AZ" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "Ba" = ( /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, @@ -6391,6 +6414,8 @@ /obj/structure/sign/painting/library{ pixel_x = 32 }, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Br" = ( @@ -6887,13 +6912,11 @@ /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) "Ef" = ( -/obj/structure/sign/painting/large/library{ - pixel_y = 28 - }, /obj/structure/table/wood, /obj/item/mod/control/pre_equipped/chrono{ desc = "It smells freshly laundered." }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Eh" = ( @@ -7204,6 +7227,13 @@ /obj/effect/landmark/basketball/game_area, /turf/open/space/basic, /area/space) +"Fk" = ( +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "Fm" = ( /obj/structure/table/reinforced/plastitaniumglass{ name = "Andrea's Desk" @@ -7236,6 +7266,7 @@ /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/kitchen) "Fy" = ( +/obj/structure/fans/tiny/invisible, /turf/open/chasm, /area/centcom/central_command_areas/admin) "FA" = ( @@ -8090,6 +8121,7 @@ /area/centcom/central_command_areas/kitchen) "IP" = ( /obj/item/clothing/mask/facehugger/dead, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/centcom/central_command_areas/admin) "IR" = ( @@ -9272,6 +9304,7 @@ /obj/effect/spawner/random/trash/garbage, /obj/effect/spawner/random/maintenance/two, /obj/machinery/recycler/deathtrap, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/centcom/central_command_areas/admin) "MW" = ( @@ -9598,6 +9631,7 @@ /obj/structure/chair/comfy/lime{ dir = 8 }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Ox" = ( @@ -10189,6 +10223,7 @@ /area/centcom/central_command_areas/evacuation/ship) "Rl" = ( /obj/effect/spawner/random/trash/garbage, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/centcom/central_command_areas/admin) "Rm" = ( @@ -10361,12 +10396,17 @@ /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) "RR" = ( +/obj/structure/fans/tiny/invisible, /turf/open/floor/iron, /area/centcom/central_command_areas/admin) "RS" = ( /obj/structure/disposalpipe/loafer{ dir = 4 }, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/very_dim/directional{ + dir = 1 + }, /turf/open/floor/plating, /area/centcom/central_command_areas/admin) "RT" = ( @@ -10451,6 +10491,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/iron, /area/centcom/central_command_areas/admin) "Sq" = ( @@ -10898,6 +10939,7 @@ /area/centcom/central_command_areas/admin_hangout) "Ud" = ( /obj/effect/decal/cleanable/garbage, +/obj/structure/fans/tiny/invisible, /turf/open/floor/iron, /area/centcom/central_command_areas/admin) "Uf" = ( @@ -11131,13 +11173,12 @@ pixel_y = 4; color = "#fcba03" }, -/obj/item/melee/powerfist{ - name = "Steel"; - desc = "What do you get?"; - force = 1000; - pixel_y = -5; - color = "#fcba03" +/obj/structure/fans/tiny/invisible, +/obj/item/tank/internals/oxygen/yellow{ + pixel_y = -7; + pixel_x = 8 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Vp" = ( @@ -11159,6 +11200,7 @@ dir = 8 }, /obj/machinery/disposal/delivery_chute, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/centcom/central_command_areas/admin) "Vs" = ( @@ -11228,6 +11270,8 @@ "VD" = ( /obj/effect/spawner/random/trash/garbage, /obj/effect/spawner/random/structure/closet_maintenance, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/very_dim/directional, /turf/open/floor/iron, /area/centcom/central_command_areas/admin) "VE" = ( @@ -11502,6 +11546,7 @@ name = "Glyphee's Fax Machine"; fax_name = "Glyphee's Spam Mail" }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "WP" = ( @@ -11610,6 +11655,7 @@ name = "Glyphee's Secret Office" }, /obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/obj/structure/fans/tiny/invisible, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Xj" = ( @@ -11737,6 +11783,8 @@ dir = 4; desc = "A specialized console to connect to gaming computers to be able to broadcast live. Seriously, where does Ook find this stuff?" }, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "XI" = ( @@ -41739,7 +41787,7 @@ hp On cp Bq -Bq +Fk Bq cp On @@ -42253,7 +42301,7 @@ yw On hF On -VD +AZ tM Fy On From d74f5725912dd7a27aab4259e1c45aae4b866d07 Mon Sep 17 00:00:00 2001 From: Glyphee Date: Fri, 20 Oct 2023 23:51:38 -0400 Subject: [PATCH 3/4] error fixes --- _maps/map_files/generic/CentCom.dmm | 61 +++++++++++++++-------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 2eba8c0e41c3..c2fe2530870a 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -828,14 +828,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"dc" = ( -/obj/machinery/door/poddoor/shutters/indestructible/preopen, -/obj/machinery/door/airlock/centcom{ - dir = 4; - name = "Ook's Streamer Den" - }, -/turf/closed/indestructible/fakeglass, -/area/centcom/central_command_areas/admin) "dd" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/stripes/line{ @@ -3218,6 +3210,10 @@ }, /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/admin_hangout) +"oj" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/admin) "ok" = ( /obj/structure/fight_button, /obj/machinery/light/floor/has_bulb, @@ -8168,6 +8164,11 @@ /obj/structure/fake_stairs/wood/directional/north, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"Je" = ( +/obj/machinery/light/floor/has_bulb, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/admin) "Jg" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/reinforced, @@ -43324,7 +43325,7 @@ On On On bO -dc +IS On On On @@ -43583,13 +43584,13 @@ Mc Mc Mc Mc -Mc -Mc -Mc -Mc -Mc -Mc -Mc +oj +oj +oj +oj +oj +oj +oj Mc Mc Mc @@ -43840,13 +43841,13 @@ Mc dQ Mc Mc -Mc -Mc -Mc -dQ -Mc -Mc -Mc +oj +oj +oj +Je +oj +oj +oj Mc Mc dQ @@ -44097,13 +44098,13 @@ Mc Mc Mc Mc -Mc -Mc -Mc -Mc -Mc -Mc -Mc +oj +oj +oj +oj +oj +oj +oj Mc Mc Mc From 991894a5bbc39dffa9ba590f5b4d001c6653fc5d Mon Sep 17 00:00:00 2001 From: Glyphee <77804365+Glyphee@users.noreply.github.com> Date: Sat, 28 Oct 2023 11:54:13 -0400 Subject: [PATCH 4/4] fixed merge issues --- _maps/map_files/generic/CentCom.dmm | 297 ++++++++++++++++++++-------- 1 file changed, 218 insertions(+), 79 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 9e922d0d228f..a1a29d8d3cf1 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -608,6 +608,11 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/centcom/syndicate_mothership/expansion_bombthreat) +"bK" = ( +/obj/item/clothing/mask/facehugger/dead, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "bM" = ( /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/evacuation) @@ -1203,10 +1208,9 @@ /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/control) "ds" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen/fourcolor, -/turf/open/floor/stone, +/obj/effect/decal/cleanable/garbage, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, /area/centcom/central_command_areas/admin) "dt" = ( /obj/structure/window/reinforced/tinted/frosted, @@ -1623,6 +1627,16 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin) +"eB" = ( +/obj/structure/disposalpipe/loafer{ + dir = 4 + }, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/very_dim/directional{ + dir = 1 + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "eC" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/table/reinforced, @@ -1907,7 +1921,9 @@ /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) "fC" = ( -/turf/open/floor/stone, +/obj/effect/gibspawner/human/bodypartless, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, /area/centcom/central_command_areas/admin) "fD" = ( /obj/machinery/light/neon_lining{ @@ -2601,9 +2617,9 @@ /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) "hF" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, -/turf/open/floor/stone, +/obj/structure/falsewall/reinforced, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, /area/centcom/central_command_areas/admin) "hG" = ( /obj/structure/chair/sofa/bench/right{ @@ -3738,10 +3754,12 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) "ll" = ( -/obj/machinery/door/airlock/wood{ - name = "Gabbie's Office" +/obj/machinery/door/airlock/centcom{ + dir = 4; + name = "Glyphee's Garbage Dump" }, -/turf/open/floor/wood, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, /area/centcom/central_command_areas/admin) "lm" = ( /obj/structure/window/plasma/spawner/directional/north, @@ -3778,6 +3796,13 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"lv" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/maintenance/two, +/obj/machinery/recycler/deathtrap, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "lw" = ( /obj/structure/sign/poster/contraband/lizard{ pixel_x = -32 @@ -4099,10 +4124,11 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/centcom/syndicate_mothership/control) "mv" = ( -/obj/machinery/door/poddoor/shutters/indestructible/preopen{ +/obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/closed/indestructible/fakeglass, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, /area/centcom/central_command_areas/admin) "mx" = ( /obj/machinery/power/shuttle_engine/heater{ @@ -5818,9 +5844,8 @@ /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) "rD" = ( -/obj/structure/table/wood, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/carpet/red, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "rF" = ( /obj/structure/chair/sofa/right{ @@ -5839,6 +5864,13 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"rI" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/very_dim/directional, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "rJ" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/tank/nitrogen, @@ -6048,6 +6080,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/evacuation/ship) +"sn" = ( +/obj/machinery/computer/camera_advanced{ + dir = 4 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "so" = ( /obj/effect/turf_decal/siding/green{ dir = 9 @@ -7750,10 +7789,12 @@ /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership) "xF" = ( -/obj/structure/chair/office{ - dir = 8 +/obj/structure/sign/painting/library{ + pixel_x = 32 }, -/turf/open/floor/stone, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "xG" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, @@ -9885,8 +9926,11 @@ /area/centcom/wizard_station) "Ef" = ( /obj/structure/table/wood, -/obj/machinery/computer/security/wooden_tv, -/turf/open/floor/carpet/red, +/obj/item/mod/control/pre_equipped/chrono{ + desc = "It smells freshly laundered." + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Eg" = ( /obj/machinery/door/airlock{ @@ -10284,6 +10328,10 @@ }, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) +"Fn" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "Fo" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/vending/wardrobe/law_wardrobe, @@ -10337,7 +10385,9 @@ }, /area/centcom/syndicate_mothership/expansion_fridgerummage) "Fy" = ( -/turf/open/chasm, +/obj/effect/gibspawner/human/bodypartless, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, /area/centcom/central_command_areas/admin) "Fz" = ( /turf/open/floor/mineral/plastitanium/red, @@ -10470,12 +10520,8 @@ /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) "FQ" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Gabbie's Fax"; - name = "Gabbie's Fax Machine" - }, -/turf/open/floor/stone, +/obj/structure/fans/tiny/invisible, +/turf/open/chasm, /area/centcom/central_command_areas/admin) "FS" = ( /obj/machinery/computer/records/medical/laptop{ @@ -10556,6 +10602,11 @@ /obj/item/stack/medical/ointment, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +"Gg" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "Gh" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -10931,6 +10982,14 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"Hj" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/delivery_chute, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "Hk" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -13451,11 +13510,11 @@ /turf/open/misc/asteroid/snow/icemoon, /area/centcom/syndicate_mothership/control) "Ou" = ( -/obj/structure/table/wood, -/obj/machinery/modular_computer/console/preset/id/centcom{ +/obj/structure/chair/comfy/lime{ dir = 8 }, -/turf/open/floor/carpet/red, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Ov" = ( /obj/structure/chair/wood/wings, @@ -13692,6 +13751,12 @@ /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"Pf" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 1 + }, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/admin) "Pg" = ( /obj/structure/fake_stairs/wood/directional/north, /turf/open/indestructible/hotelwood, @@ -14083,6 +14148,30 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"Qu" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/machinery/door/window/left/directional/west{ + name = "Secret Stuff"; + req_access = list("robotics"); + dir = 4 + }, +/obj/item/reagent_containers/pill/adminordrazine{ + list_reagents = list(/datum/reagent/medicine/adminordrazine = 99999); + name = "sv_cheats 1"; + desc = "god"; + color = "#fcba03" + }, +/obj/structure/fans/tiny/invisible, +/obj/item/tank/internals/oxygen/yellow{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/tank/internals/oxygen/yellow{ + pixel_y = -7; + pixel_x = 7 + }, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "Qv" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/siding/wood{ @@ -14742,6 +14831,34 @@ /obj/structure/fake_stairs/wood/directional/south, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"Su" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/structure/window/reinforced/survival_pod/spawner/directional{ + dir = 1 + }, +/obj/machinery/door/window/left/directional/west{ + name = "Secret Stuff"; + req_access = list("robotics"); + dir = 4 + }, +/obj/item/melee/powerfist{ + name = "Iron"; + desc = "You load sixteen tons..."; + force = 1000; + pixel_y = 4; + color = "#fcba03" + }, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/floor/has_bulb, +/obj/item/melee/powerfist{ + name = "Steel"; + desc = "Another day older and deeper in debt..."; + force = 1000; + pixel_y = -4; + color = "#fcba03" + }, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "Sv" = ( /obj/effect/turf_decal/trimline/blue, /turf/open/floor/iron/dark, @@ -15513,6 +15630,13 @@ }, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) +"UR" = ( +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "US" = ( /obj/structure/window/plasma/spawner/directional/north, /turf/open/indestructible/hotelwood, @@ -15658,7 +15782,10 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) "Vo" = ( -/turf/open/floor/carpet/red, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, /area/centcom/central_command_areas/admin) "Vp" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, @@ -15779,7 +15906,9 @@ }, /area/centcom/syndicate_mothership/control) "VD" = ( -/turf/closed/wall/mineral/iron, +/obj/item/fish/chasm_crab, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, /area/centcom/central_command_areas/admin) "VE" = ( /obj/structure/table/reinforced, @@ -16309,9 +16438,13 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) "Xi" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/security/laptop, -/turf/open/floor/stone, +/obj/machinery/door/airlock/centcom{ + dir = 4; + name = "Glyphee's Secret Office" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Xj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -16369,7 +16502,8 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) "Xq" = ( -/turf/open/floor/wood, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, /area/centcom/central_command_areas/admin) "Xr" = ( /obj/machinery/keycard_auth/directional/south, @@ -16474,10 +16608,13 @@ /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) "XG" = ( -/obj/structure/chair/comfy/black{ - dir = 4 +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 4; + desc = "A specialized console to connect to gaming computers to be able to broadcast live. Seriously, where does Ook find this stuff?" }, -/turf/open/floor/carpet/red, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "XH" = ( /obj/effect/turf_decal/stripes/end{ @@ -16678,11 +16815,13 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supply) "Yl" = ( -/obj/machinery/door/airlock/wood{ - name = "Gabbie's Office" +/obj/structure/table/wood, +/obj/machinery/fax{ + name = "Glyphee's Fax Machine"; + fax_name = "Glyphee's Spam Mail" }, -/obj/effect/mapping_helpers/airlock/access/any/admin/captain, -/turf/open/floor/wood, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "Yn" = ( /turf/closed/indestructible/riveted, @@ -45928,10 +46067,10 @@ aa aa aa On -Zf -Zf -Zf -Zf +On +On +On +On On On On @@ -46185,11 +46324,11 @@ aa aa aa On -Vo +Yl XG -Vo -Vo -fC +sn +Su +Qu On bF KB @@ -46445,8 +46584,8 @@ On Ef rD Ou -Vo -fC +rD +rD On lm Zn @@ -46699,11 +46838,11 @@ nO uk hp On -fC +rD xF -Vo -Vo -fC +UR +xF +rD On TQ AS @@ -46957,10 +47096,10 @@ uk RK On Xi -fC -Vo -fC -ds +On +On +On +On On TQ FI @@ -47214,7 +47353,7 @@ RZ yw On hF -fC +On Vo fC FQ @@ -47470,11 +47609,11 @@ Ji uk xP On +mv +bK +Fy VD -VD -Yl -VD -VD +rI On TQ FI @@ -47727,11 +47866,11 @@ Ji uk uk On -Fy -Fy +eB +Fn Xq -Fy -Fy +Xq +ds On TQ AS @@ -47984,11 +48123,11 @@ Ji uk dU On -Fy -Fy +Hj +Gg Xq Fy -Fy +lv On aO qx @@ -48241,12 +48380,12 @@ bO IS On On -mv -mv +On +On ll -mv -mv -bF +On +On +Pf qZ qZ qZ