From 357a772b6f411ab6deac4170876c0217daeb1a9f Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Date: Mon, 17 Nov 2025 18:26:07 +0000 Subject: [PATCH] Converts the Gamma Armoury Into a REAL Shuttle + Extra Gamma Armoury Content (#30847) * Thank god it's actually a real shuttle now I hate the gamma armoury so much. * Update shuttle.dm * preset docking ports woo * named ports * Update shuttle.dm * lateload woo! * god * Update misc_admin_procs.dm * Update SSshuttles.dm * Update misc_admin_procs.dm * Apply suggestions from code review Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> --------- Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> --- _maps/map_files/generic/centcomm.dmm | 957 ++++++++---------- .../gamma_armory/gamma_armory_base.dmm | 199 ++++ .../gamma_armory/gamma_armory_clown.dmm | 238 +++++ _maps/map_files/stations/boxstation.dmm | 104 +- _maps/map_files/stations/cerestation.dmm | 98 +- _maps/map_files/stations/deltastation.dmm | 701 ++++++------- _maps/map_files/stations/emeraldstation.dmm | 112 +- _maps/map_files/stations/metastation.dmm | 89 +- code/controllers/subsystem/SSshuttles.dm | 22 + .../subsystem/non_firing/SSlate_mapping.dm | 6 + .../subsystem/non_firing/SSmapping.dm | 2 + code/datums/shuttles.dm | 33 +- code/game/area/shuttle_areas.dm | 8 +- .../game/machinery/computer/communications.dm | 2 +- code/modules/admin/misc_admin_procs.dm | 30 +- .../projectiles/ammunition/magazines.dm | 3 + .../projectiles/guns/projectile/shotgun.dm | 3 + code/modules/shuttle/assault_pod.dm | 2 +- code/modules/shuttle/shuttle.dm | 46 +- code/modules/shuttle/supply.dm | 2 +- 20 files changed, 1531 insertions(+), 1126 deletions(-) create mode 100644 _maps/map_files/shuttles/gamma_armory/gamma_armory_base.dmm create mode 100644 _maps/map_files/shuttles/gamma_armory/gamma_armory_clown.dmm diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index d457d32ed89..a09c4262470 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -3038,6 +3038,13 @@ /obj/structure/table/glass/reinforced/plastitanium, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) +"ku" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander, +/obj/machinery/door/airlock/centcom{ + name = "CentCom BSA Control" + }, +/turf/simulated/floor/plasteel/dark, +/area/centcom/control) "kv" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3776,6 +3783,19 @@ /obj/structure/closet/syndicate/personal, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) +"mJ" = ( +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander, +/obj/machinery/door/airlock/external/glass{ + name = "Gamma Armory"; + id_tag = "gamma_away" + }, +/obj/machinery/door/poddoor/impassable{ + id_tag = "CCGAMMA"; + name = "Gamma Security" + }, +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) "mK" = ( /obj/machinery/computer/shuttle/syndicate/recall, /obj/effect/turf_decal/tiles/jobs/bar/checker, @@ -4270,6 +4290,34 @@ /obj/item/reagent_containers/glass/bottle/adminordrazine, /turf/simulated/floor/plasteel/freezer, /area/admin) +"of" = ( +/obj/effect/turf_decal/tiles/department/security/side, +/obj/machinery/newscaster/security_unit/directional/south, +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) +"og" = ( +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp{ + pixel_x = 1; + pixel_y = 10 + }, +/obj/item/stamp/denied{ + pixel_x = 10; + pixel_y = 10 + }, +/obj/machinery/door_control/no_emag{ + id = "CCGAMMA"; + name = "Gamma Lockdown"; + req_access = list(114); + pixel_y = 24 + }, +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) "oh" = ( /obj/structure/flora/grass/jungle, /turf/simulated/floor/grass/jungle, @@ -4475,13 +4523,6 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/shuttle/supply) -"oW" = ( -/obj/machinery/computer/shuttle/white_ship, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "oX" = ( /obj/structure/table, /obj/machinery/cooking/grill/upgraded, @@ -4501,6 +4542,19 @@ }, /turf/simulated/floor/plasteel/dark, /area/shuttle/escape) +"pc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/closet/emcloset, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/simulated/floor/plasteel/dark, +/area/centcom/specops) "pe" = ( /obj/structure/table/wood, /obj/item/storage/fancy/cigarettes/cigpack_robustgold{ @@ -4607,6 +4661,10 @@ /obj/effect/turf_decal/tiles/jobs/bar/checker, /turf/simulated/floor/plasteel, /area/syndicate_mothership) +"pB" = ( +/obj/docking_port/stationary/gamma_armory/centcomm, +/turf/space, +/area/space/centcomm) "pD" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/mineral/plastitanium/red, @@ -4676,6 +4734,17 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/centcom/evac) +"pO" = ( +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 5 + }, +/obj/structure/table/reinforced, +/obj/machinery/recharger/wallcharger/upgraded{ + pixel_y = 32 + }, +/obj/item/radio/headset/centcom, +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) "pR" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -6171,11 +6240,6 @@ }, /turf/simulated/floor/plasteel, /area/centcom/evac) -"uR" = ( -/obj/machinery/door/airlock/titanium, -/obj/structure/fans/tiny, -/turf/simulated/floor/plating, -/area/shuttle/gamma/space) "uS" = ( /obj/effect/spawner/window/plastitanium, /turf/simulated/floor/plating, @@ -6468,6 +6532,13 @@ /obj/machinery/recharger, /turf/simulated/floor/carpet, /area/admin) +"wa" = ( +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 1 + }, +/obj/machinery/computer/shuttle/white_ship, +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) "wc" = ( /obj/structure/urinal{ pixel_y = 28 @@ -7800,13 +7871,6 @@ }, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/shuttle/supply) -"AU" = ( -/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander, -/obj/machinery/door/airlock/centcom{ - name = "CentCom BSA Control" - }, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "AV" = ( /obj/item/kirbyplants/large, /turf/simulated/floor/plasteel/dark, @@ -8538,8 +8602,22 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/suppy) "DB" = ( -/turf/simulated/wall/mineral/titanium, -/area/shuttle/gamma/space) +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 6 + }, +/obj/machinery/computer/communications{ + dir = 8 + }, +/obj/machinery/door_control/no_emag{ + id = "SpecopsFerry"; + name = "Hanger Bay Shutters"; + pixel_y = -38 + }, +/obj/machinery/keycard_auth{ + pixel_y = -24 + }, +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) "DC" = ( /obj/machinery/conveyor/west{ id = "QMLoad" @@ -8550,13 +8628,11 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/suppy) "DD" = ( -/obj/machinery/power/apc/directional/south, -/obj/structure/sign/securearea{ - pixel_x = -32 +/obj/structure/chair/office/dark{ + dir = 4 }, -/obj/machinery/suit_storage_unit/gamma/secure, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) "DE" = ( /obj/machinery/conveyor/west{ id = "QMLoad" @@ -8592,18 +8668,22 @@ /turf/simulated/floor/plasteel/dark, /area/admin) "DL" = ( -/obj/machinery/mech_bay_recharge_port/upgraded, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) +/obj/structure/extinguisher_cabinet{ + pixel_x = 24 + }, +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 4 + }, +/obj/machinery/computer/emergency_shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) "DM" = ( /obj/structure/table/reinforced, /obj/item/storage/secure/briefcase, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) -"DN" = ( -/obj/mecha/combat/marauder/ares/loaded, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "DO" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -8655,12 +8735,6 @@ /obj/item/clothing/shoes/space_ninja, /turf/simulated/floor/engine, /area/admin) -"DY" = ( -/obj/machinery/computer/mech_bay_power_console{ - dir = 1 - }, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "DZ" = ( /obj/item/stock_parts/cell/bluespace, /obj/item/stock_parts/cell/bluespace, @@ -9053,6 +9127,13 @@ /obj/item/trash/candy, /turf/simulated/floor/plasteel/dark, /area/centcom/control) +"Fz" = ( +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 9 + }, +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) "FA" = ( /obj/structure/curtain/open/shower/security, /obj/item/soap/syndie, @@ -9381,9 +9462,6 @@ }, /turf/simulated/floor/plasteel/white, /area/centcom/control) -"GC" = ( -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/gamma) "GE" = ( /obj/machinery/chem_dispenser, /turf/simulated/floor/mineral/titanium, @@ -9661,23 +9739,6 @@ /obj/structure/railing, /turf/simulated/floor/wood, /area/ghost_bar) -"HB" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/light/spot{ - dir = 8 - }, -/obj/item/ammo_box/shotgun/buck, -/obj/item/ammo_box/shotgun/buck, -/obj/item/ammo_box/shotgun/buck, -/obj/item/gun/projectile/shotgun/automatic/combat, -/obj/item/gun/projectile/shotgun/automatic/combat, -/obj/item/gun/projectile/shotgun/automatic/combat, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "HC" = ( /obj/machinery/chem_master, /turf/simulated/floor/mineral/titanium, @@ -9709,16 +9770,6 @@ }, /turf/simulated/floor/wood, /area/ghost_bar) -"HI" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/gun/projectile/automatic/proto, -/obj/item/gun/projectile/automatic/proto, -/obj/item/gun/projectile/automatic/proto, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "HJ" = ( /obj/structure/table/holotable, /obj/item/clothing/suit/armor/riot/knight/red, @@ -9733,26 +9784,6 @@ /obj/structure/sign/drop, /turf/simulated/wall/indestructible/syndicate/no_diagonal, /area/syndicate_mothership) -"HL" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/gun/energy/gun/nuclear, -/obj/item/gun/energy/gun/nuclear, -/obj/item/gun/energy/gun/nuclear, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) -"HM" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/machinery/light/spot{ - dir = 4 - }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, -/obj/item/gun/energy/immolator/multi, -/obj/item/gun/energy/immolator/multi, -/obj/item/gun/energy/immolator/multi, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "HN" = ( /turf/simulated/floor/indestructible/necropolis, /area/ruin/space/bubblegum_arena) @@ -9893,21 +9924,12 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/simulated/floor/plasteel/dark, /area/shuttle/escape) -"Ip" = ( -/obj/machinery/recharger/wallcharger/upgraded{ - pixel_x = -24 - }, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "Iq" = ( -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) -"Ir" = ( -/obj/machinery/recharger/wallcharger/upgraded{ - pixel_x = 32 +/obj/effect/turf_decal/tiles/department/security/corner{ + dir = 4 }, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) +/turf/simulated/floor/plasteel/dark, +/area/centcom/gamma) "Is" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ants, @@ -10260,13 +10282,6 @@ /obj/effect/turf_decal/tiles/dark/checker, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) -"JD" = ( -/obj/machinery/computer/shuttle/ferry, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "JE" = ( /obj/item/stack/sheet/plasmaglass/fifty, /obj/item/stack/sheet/plasmaglass/fifty, @@ -10288,11 +10303,9 @@ /turf/simulated/floor/grass, /area/centcom/evac) "JH" = ( -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) +/obj/structure/filingcabinet/filingcabinet, +/turf/simulated/floor/carpet, +/area/centcom/control) "JI" = ( /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/airlock/centcom, @@ -10304,38 +10317,13 @@ }, /turf/simulated/floor/plasteel/dark, /area/tdome/tdomeobserve) -"JK" = ( -/obj/machinery/door_control/no_emag{ - id = "CCGAMMA"; - name = "Gamma Lockdown"; - pixel_x = 32; - req_access = list(114) - }, -/obj/structure/filingcabinet/filingcabinet, +"JM" = ( +/obj/machinery/computer/shuttle/ferry, /obj/effect/turf_decal/tiles/department/security/side{ dir = 5 }, /turf/simulated/floor/plasteel/dark, /area/centcom/gamma) -"JM" = ( -/obj/machinery/autolathe/upgraded/gamma, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) -"JN" = ( -/obj/structure/table/reinforced, -/obj/item/grenade/clusterbuster, -/obj/item/grenade/chem_grenade/incendiary{ - name = "Incendiary Grenade" - }, -/obj/item/kitchen/knife/combat, -/obj/item/kitchen/knife/combat, -/obj/item/kitchen/knife/combat, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "JO" = ( /obj/machinery/status_display{ pixel_x = -32 @@ -10363,12 +10351,6 @@ /obj/effect/turf_decal/tiles/jobs/bar/checker, /turf/simulated/floor/plasteel, /area/tdome/tdomeobserve) -"JR" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/gun/medbeam, -/obj/item/gun/medbeam, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "JS" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'FOURTH WALL'."; @@ -11063,12 +11045,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/centcom/gamma) -"Mi" = ( -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "Mk" = ( /obj/machinery/door_control/no_emag{ id = "thunderdomegen"; @@ -11093,24 +11069,6 @@ /obj/item/storage/box/trackimp, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"Mn" = ( -/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander, -/obj/machinery/door/airlock/centcom{ - name = "Gamma Armory" - }, -/obj/machinery/door/poddoor/impassable{ - id_tag = "CCGAMMA"; - name = "Gamma Security" - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) -"Mo" = ( -/obj/structure/sign/securearea{ - pixel_x = 32 - }, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "Mq" = ( /obj/structure/table/glass/reinforced/plastitanium, /obj/machinery/computer/security/telescreen, @@ -11537,21 +11495,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"NL" = ( -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/machinery/door_control/no_emag{ - id = "SpecopsFerry"; - name = "Hanger Bay Shutters"; - pixel_y = -38 - }, -/obj/item/radio/headset/centcom, -/obj/effect/turf_decal/tiles/department/security/side, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "NM" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -11584,23 +11527,10 @@ /obj/structure/bookcase/random, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) -"NQ" = ( -/obj/structure/chair/office/dark, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "NR" = ( /obj/item/clothing/head/bearpelt/polar, /turf/simulated/floor/plating/asteroid/snow, /area/syndicate_mothership) -"NS" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "NT" = ( /obj/structure/table, /obj/item/reagent_containers/drinks/cans/sodawater{ @@ -12041,24 +11971,9 @@ /obj/effect/turf_decal/tiles/jobs/bar/checker, /turf/simulated/floor/plasteel, /area/syndicate_mothership) -"Ps" = ( -/obj/machinery/computer/communications{ - dir = 1 - }, -/obj/effect/turf_decal/tiles/department/security/side, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "Pu" = ( /turf/simulated/floor/plasteel/freezer, /area/ghost_bar) -"Pv" = ( -/obj/machinery/computer/emergency_shuttle{ - dir = 1 - }, -/obj/machinery/newscaster/security_unit/directional/south, -/obj/effect/turf_decal/tiles/department/security/side, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "Pw" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, @@ -12106,11 +12021,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"PD" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/tiles/department/security/side, -/turf/simulated/floor/plasteel/dark, -/area/centcom/gamma) "PE" = ( /turf/simulated/floor/plating/asteroid/snow, /area/space/centcomm) @@ -12137,21 +12047,13 @@ /turf/simulated/floor/plasteel/freezer, /area/ghost_bar) "PG" = ( -/obj/item/clipboard, -/obj/item/folder/red, -/obj/item/stamp/denied{ - pixel_x = 3; - pixel_y = 3 +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 10 }, -/obj/item/stamp, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tiles/department/security/side, /turf/simulated/floor/plasteel/dark, /area/centcom/gamma) "PH" = ( -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 6 - }, +/obj/effect/turf_decal/tiles/department/security/side, /turf/simulated/floor/plasteel/dark, /area/centcom/gamma) "PI" = ( @@ -12686,19 +12588,6 @@ }, /turf/simulated/floor/wood, /area/wizard_station) -"Ru" = ( -/obj/structure/closet/emcloset, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/centcom/specops) "Rv" = ( /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/shuttle/administration) @@ -13817,6 +13706,12 @@ /obj/item/reagent_containers/drinks/cans/madminmalt, /turf/simulated/floor/plasteel, /area/centcom/evac) +"Vw" = ( +/obj/structure/marker_beacon/dock_marker/collision{ + name = "military no fly zone" + }, +/turf/space, +/area/space/centcomm) "Vx" = ( /turf/simulated/floor/plasteel/freezer, /area/wizard_station) @@ -14781,12 +14676,6 @@ /obj/structure/flora/ausbushes/pointybush, /turf/simulated/floor/grass, /area/tdome/tdomeobserve) -"YG" = ( -/obj/structure/marker_beacon/dock_marker{ - name = "military no fly zone" - }, -/turf/space, -/area/space/centcomm) "YH" = ( /obj/item/storage/firstaid/regular, /obj/structure/table, @@ -15315,11 +15204,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -15577,11 +15466,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -15829,11 +15718,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -16091,11 +15980,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -16343,11 +16232,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -16605,11 +16494,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -16857,11 +16746,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -17119,11 +17008,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -17371,11 +17260,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -17633,11 +17522,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -17885,11 +17774,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -18147,11 +18036,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -18399,11 +18288,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -18661,11 +18550,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -18913,11 +18802,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -19175,11 +19064,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -19427,11 +19316,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -19689,11 +19578,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -19941,11 +19830,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -20203,11 +20092,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -20455,11 +20344,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -20717,11 +20606,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -20969,11 +20858,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -21231,11 +21120,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -21483,11 +21372,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -21745,11 +21634,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -21997,11 +21886,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -22259,11 +22148,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -22511,11 +22400,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -22773,11 +22662,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -23025,11 +22914,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -23287,11 +23176,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -23539,11 +23428,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -23801,11 +23690,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -24053,11 +23942,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -24315,11 +24204,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -24567,11 +24456,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -24829,11 +24718,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -25081,11 +24970,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -25343,11 +25232,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -25595,11 +25484,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -25857,11 +25746,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -26109,11 +25998,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -26371,11 +26260,11 @@ aN aN aN aN +Vw aN aN aN -aN -aN +Vw aN aN aN @@ -26623,11 +26512,11 @@ aN aN aN aN -YG aN aN aN -YG +aN +aN aN aN aN @@ -26885,11 +26774,11 @@ aN aN aN aN +YA aN aN aN -aN -aN +YA aN aN aN @@ -27137,16 +27026,16 @@ aN aN aN aN -YG -aN -aN -aN -YG aN aN aN aN aN +YA +aU +FZ +qp +YA aN aN aN @@ -27399,11 +27288,11 @@ aN aN aN aN -aN -aN -aN -aN -aN +YA +PJ +BF +Cl +YA aN aN aN @@ -27651,16 +27540,16 @@ aN aN aN aN -YA +aN +aN aN aN aN YA -aN -aN -aN -aN -aN +PJ +BF +Cl +YA aN aN aN @@ -27908,10 +27797,15 @@ aN aN aN aN +aN +aN +aN +aN +aN YA -aU -FZ -qp +PJ +BF +Cl YA aN aN @@ -27933,11 +27827,6 @@ aN aN aN aN -aN -aN -aN -aN -aN ZG jt bS @@ -28165,6 +28054,11 @@ aN aN aN aN +aN +aN +aN +aN +aN YA PJ BF @@ -28189,11 +28083,6 @@ aN aN aN aN -aN -aN -aN -aN -aN ZG ZG cJ @@ -28422,16 +28311,16 @@ aN aN aN aN +aN +aN +aN +aN +aN YA PJ BF Cl YA -aN -aN -aN -aN -aN Db aN aN @@ -28679,17 +28568,17 @@ aN aN aN aN +aN +aN +aN +aN +aN YA PJ -BF +Gc Cl YA aN -aN -aN -aN -aN -aN IW Tw Tw @@ -28936,17 +28825,17 @@ aN aN aN aN +aN +aN +aN +aN +aN YA PJ BF Cl YA aN -aN -aN -aN -aN -aN Rp Sp Sp @@ -29193,17 +29082,17 @@ aN aN aN aN +aN +aN +aN +aN +aN YA PJ BF Cl YA aN -aN -aN -aN -aN -Db Rp Ty Kg @@ -29450,17 +29339,17 @@ aN aN aN aN +aN +aN +aN +aN +aN YA PJ -Gc +BF Cl YA aN -aN -aN -aN -aN -aN Rp TA Rs @@ -29707,17 +29596,17 @@ aN aN aN aN +aN +aN +aN +aN +aN YA -PJ +ET BF -Cl +GP YA aN -aN -aN -aN -aN -Te Rp xs Rs @@ -29964,17 +29853,17 @@ aN aN aN aN +aN +aN +aN +aN +aN +YA +sm +sm +sm YA -PJ -BF -Cl YA -aN -aN -aN -aN -aN -GC Jb Rs Rs @@ -30221,17 +30110,17 @@ aN aN aN aN +aN +aN +aN +aN +aN +sm +EW +Gd +GR +uC YA -PJ -BF -Cl -YA -Te -GC -GC -GC -GC -GC Jb Rs Rs @@ -30478,17 +30367,17 @@ aN aN aN aN +aN +aN +aN +aN +aN +sm +vt +vt +vt +vt YA -ET -BF -GP -YA -Te -oW -Mh -NQ -Ps -Te Rp rB Rs @@ -30733,19 +30622,19 @@ aN aN aN aN +Db aN aN +aN +aN +aN +Db +sm +EZ +Ge +vt +vt YA -sm -sm -sm -YA -Te -JD -Hi -Hi -Pv -Te Rp TF Rs @@ -30992,17 +30881,17 @@ aN aN aN aN +aN +aN +aN +aN +aN sm -EW -Gd -GR -uC -Te JH -Hi -Hi -NL -Te +vt +vt +vt +YA Rp Rp Rs @@ -31249,17 +31138,17 @@ aN aN aN aN -sm -vt -vt -vt -vt -AU -JH -Hi -Hi -PD -AX +aN +aN +aN +aN +aN +YA +YA +ku +ku +YA +YA aN Rp WD @@ -31506,13 +31395,13 @@ aN aN aN aN -sm -vt -vt -vt -vt -AU -JH +aN +aN +aN +aN +aN +Te +Fz Hi Hi PG @@ -31763,18 +31652,18 @@ aN aN aN aN -sm -EZ -Ge -vt -vt -AX -JK -Mi -NS +aN +aN +aN +aN +pB +mJ +Hi +Hi +Hi PH -pK -Rr +Te +pc Ra Ra Ra @@ -32020,18 +31909,18 @@ aN aN aN aN -YA -YA -YA -YA -YA +aN +aN +aN +aN +aN Te +og +Hi +Hi +of Te -Mn -Te -Te -Te -Ru +Rx Ra Ra Ra @@ -32280,15 +32169,15 @@ aN aN aN aN -DB -DB -DB -DB -uR -DB -DB -Zr -Rx +aN +aN +Te +wa +Mh +Hi +Hi +pK +Rr Ra Ra Ra @@ -32537,14 +32426,14 @@ aN aN aN aN -DB -HB -Ip +aN +aN +Te JM Iq DD -DB -VI +PH +AX Rr Ra Ra @@ -32789,19 +32678,19 @@ aN aN aN aN +Db +aN aN aN aN aN Db -DB -HI -Iq -JN -Iq +AX +Te +pO DL DB -Zr +Te RB TK WH @@ -33051,14 +32940,14 @@ aN aN aN aN -DB -HL -Iq -JR -Iq -DN -DB -Zr +aN +aN +aN +Te +Te +Te +Te +Te Zr TR WQ @@ -33308,13 +33197,13 @@ aN aN aN aN -DB -HM -Ir -Iq -Mo -DY -DB +aN +aN +aN +aN +aN +aN +aN aN Zr PU @@ -33565,13 +33454,13 @@ aN aN aN aN -DB -DB -DB -uR -DB -DB -DB +aN +aN +aN +aN +aN +aN +aN aN Zr TR diff --git a/_maps/map_files/shuttles/gamma_armory/gamma_armory_base.dmm b/_maps/map_files/shuttles/gamma_armory/gamma_armory_base.dmm new file mode 100644 index 00000000000..cab85886d75 --- /dev/null +++ b/_maps/map_files/shuttles/gamma_armory/gamma_armory_base.dmm @@ -0,0 +1,199 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"b" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/titanium/glass, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"f" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/gun/energy/immolator/multi, +/obj/item/gun/energy/immolator/multi, +/obj/item/gun/energy/immolator/multi, +/obj/machinery/light/spot{ + dir = 4 + }, +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"h" = ( +/obj/machinery/light/spot{ + dir = 8 + }, +/obj/machinery/suit_storage_unit/gamma/secure, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"i" = ( +/obj/machinery/autolathe/upgraded/gamma, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/structure/sign/vacuum/external{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"j" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/gamma) +"t" = ( +/obj/machinery/mech_bay_recharge_port/upgraded, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"u" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"w" = ( +/obj/mecha/combat/marauder/ares/loaded, +/turf/simulated/floor/mech_bay_recharge_floor, +/area/shuttle/gamma) +"z" = ( +/obj/machinery/recharger/wallcharger/upgraded{ + pixel_x = 32 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"B" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"C" = ( +/obj/machinery/recharger/wallcharger/upgraded{ + pixel_x = -32 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"F" = ( +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"J" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/gamma) +"K" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/gun/medbeam, +/obj/item/gun/medbeam, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"L" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/projectile/automatic/proto, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"M" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/titanium/glass, +/obj/docking_port/mobile/gamma_armory{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"O" = ( +/turf/simulated/wall/mineral/titanium, +/area/shuttle/gamma) +"T" = ( +/obj/structure/table/reinforced, +/obj/item/grenade/clusterbuster, +/obj/item/grenade/chem_grenade/incendiary{ + name = "Incendiary Grenade" + }, +/obj/item/kitchen/knife/combat, +/obj/item/kitchen/knife/combat, +/obj/item/kitchen/knife/combat, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) +"W" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun/buck, +/obj/item/gun/projectile/shotgun/automatic/combat, +/obj/item/gun/projectile/shotgun/automatic/combat, +/obj/item/gun/projectile/shotgun/automatic/combat, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma) + +(1,1,1) = {" +O +O +O +O +b +O +J +"} +(2,1,1) = {" +O +W +C +i +u +h +O +"} +(3,1,1) = {" +O +L +a +T +a +t +O +"} +(4,1,1) = {" +O +B +a +K +a +w +O +"} +(5,1,1) = {" +O +f +z +a +a +F +O +"} +(6,1,1) = {" +O +O +O +M +j +O +J +"} diff --git a/_maps/map_files/shuttles/gamma_armory/gamma_armory_clown.dmm b/_maps/map_files/shuttles/gamma_armory/gamma_armory_clown.dmm new file mode 100644 index 00000000000..d0091d4d52d --- /dev/null +++ b/_maps/map_files/shuttles/gamma_armory/gamma_armory_clown.dmm @@ -0,0 +1,238 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/gamma) +"d" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/structure/sign/poster/contraband/clown/directional/north, +/obj/item/food/pie, +/obj/item/food/pie, +/obj/item/food/pie, +/obj/item/food/pie, +/obj/item/food/pie, +/obj/item/food/pie, +/obj/item/food/pie, +/obj/item/food/pie, +/obj/item/food/pie, +/obj/item/gun/throw/piecannon, +/obj/item/gun/throw/piecannon, +/obj/item/gun/throw/piecannon, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"h" = ( +/obj/machinery/light/spot{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/clown, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"l" = ( +/obj/mecha/combat/honker/loaded, +/turf/simulated/floor/mech_bay_recharge_floor, +/area/shuttle/gamma) +"n" = ( +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"o" = ( +/obj/structure/statue/bananium/clown, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"p" = ( +/obj/machinery/recharger/wallcharger/upgraded{ + pixel_x = -32 + }, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"r" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/titanium/glass, +/obj/docking_port/mobile/gamma_armory{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"x" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/structure/sign/poster/contraband/clown/directional/north, +/obj/item/gun/energy/clown, +/obj/item/gun/energy/clown, +/obj/item/gun/energy/clown, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"D" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/item/ammo_box/shotgun/confetti, +/obj/item/ammo_box/shotgun/confetti, +/obj/item/ammo_box/shotgun/confetti, +/obj/item/gun/projectile/shotgun/automatic/combat/confetti, +/obj/item/gun/projectile/shotgun/automatic/combat/confetti, +/obj/item/gun/projectile/shotgun/automatic/combat/confetti, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"E" = ( +/obj/machinery/mech_bay_recharge_port/upgraded, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"G" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"I" = ( +/obj/structure/table/reinforced, +/obj/item/grenade/clusterbuster/lube, +/obj/item/grenade/confetti, +/obj/item/bikehorn, +/obj/item/bikehorn, +/obj/item/bikehorn, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"J" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/titanium/glass, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"K" = ( +/obj/machinery/autolathe/upgraded/gamma, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/structure/sign/vacuum/external{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"L" = ( +/obj/machinery/recharger/wallcharger/upgraded{ + pixel_x = 32 + }, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"M" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/machinery/light/spot{ + dir = 4 + }, +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"O" = ( +/turf/simulated/wall/mineral/titanium, +/area/shuttle/gamma) +"Q" = ( +/turf/simulated/floor/mineral/titanium{ + color = "yellow" + }, +/area/shuttle/gamma) +"R" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/gamma) + +(1,1,1) = {" +O +O +O +O +J +O +R +"} +(2,1,1) = {" +O +D +p +K +G +h +O +"} +(3,1,1) = {" +O +d +Q +I +Q +E +O +"} +(4,1,1) = {" +O +x +Q +o +Q +l +O +"} +(5,1,1) = {" +O +M +L +Q +Q +n +O +"} +(6,1,1) = {" +O +O +O +r +a +O +R +"} diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 6ea4f713139..45d9ea0db84 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -1115,6 +1115,7 @@ /area/station/security/brig) "agt" = ( /obj/machinery/door/poddoor/impassable/gamma, +/obj/structure/fans/tiny, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "agu" = ( @@ -1395,8 +1396,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "ahF" = ( +/obj/docking_port/stationary/gamma_armory{ + dir = 8; + name = "NSS Cyberiad Gamma Armory Shuttle Dock" + }, /turf/space, -/area/shuttle/gamma/station) +/area/space) "ahG" = ( /obj/item/gun/projectile/shotgun/riot{ pixel_x = -3; @@ -72722,13 +72727,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) -"qTO" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; - name = "KEEP CLEAR: DOCKING AREA" - }, -/turf/simulated/wall, -/area/space/nearstation) "qUj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -114079,11 +114077,11 @@ aaa aaa aaa abY -afO aab -afO -qTO -aMr +aab +aab +abY +aab aab aab abY @@ -114336,13 +114334,13 @@ aaa aaa afO aab -ahF -ahF -ahF -ahF -ahF -ahF -ahF +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa akZ vDY @@ -114593,13 +114591,13 @@ afO afO afO aab -ahF -ahF -ahF -ahF -ahF -ahF -ahF +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa afm aqv @@ -114850,13 +114848,13 @@ afO afO afO aab -ahF -ahF -ahF -ahF -ahF -ahF -ahF +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa afm aey @@ -115107,13 +115105,13 @@ afX afX aaa abY -ahF -ahF -ahF -ahF -ahF -ahF -ahF +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa lkO amB @@ -115364,13 +115362,13 @@ afX afX afX aYm -ahF -ahF -ahF -ahF -ahF -ahF -ahF +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa vom amz @@ -115621,13 +115619,13 @@ afX afO afX afX +aaa +aaa +aaa ahF -ahF -ahF -ahF -ahF -ahF -ahF +aaa +aaa +aaa aaa afm jVf diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 2eed96e5919..17c8101b743 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -91628,13 +91628,6 @@ /obj/structure/closet/lasertag/blue, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) -"sWO" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; - name = "KEEP CLEAR: DOCKING AREA" - }, -/turf/simulated/wall, -/area/space/nearstation) "sWT" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/turf_decal/tiles/dark/checker, @@ -98841,6 +98834,7 @@ /area/station/security/permabrig) "uAj" = ( /obj/machinery/door/poddoor/impassable/gamma, +/obj/structure/fans/tiny, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonershuttle) "uAB" = ( @@ -113116,8 +113110,12 @@ /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/a) "xEp" = ( +/obj/docking_port/stationary/gamma_armory{ + dir = 8; + name = "NSS Farragus Gamma Armory Shuttle Dock" + }, /turf/space, -/area/shuttle/gamma/station) +/area/space) "xEv" = ( /obj/machinery/atmospherics/binary/valve/open{ dir = 4 @@ -127560,8 +127558,8 @@ ksx lzH lzH lzH +ksx lzH -sWO lzH lzH ksx @@ -127814,13 +127812,13 @@ rNK rNK rNK lzH -xEp -xEp -xEp -xEp -xEp -xEp -xEp +rNK +rNK +rNK +rNK +rNK +rNK +rNK lzH qQO slw @@ -128071,13 +128069,13 @@ rNK rNK rNK lzH -xEp -xEp -xEp -xEp -xEp -xEp -xEp +rNK +rNK +rNK +rNK +rNK +rNK +rNK lzH qQO vFf @@ -128328,13 +128326,13 @@ rNK rNK rNK lzH -xEp -xEp -xEp -xEp -xEp -xEp -xEp +rNK +rNK +rNK +rNK +rNK +rNK +rNK lzH qQO lcC @@ -128585,13 +128583,13 @@ rNK rNK rNK ksx -xEp -xEp -xEp -xEp -xEp -xEp -xEp +rNK +rNK +rNK +rNK +rNK +rNK +rNK ksx qQO uGh @@ -128842,13 +128840,13 @@ pVD pVD pVD pVD -xEp -xEp -xEp -xEp -xEp -xEp -xEp +rNK +rNK +rNK +rNK +rNK +rNK +rNK lzH qQO dLp @@ -129099,13 +129097,13 @@ xUW hhY muW pVD +rNK +rNK +rNK xEp -xEp -xEp -xEp -xEp -xEp -xEp +rNK +rNK +rNK lzH qQO hLN diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index de924773f03..52ba3c4948b 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -4918,17 +4918,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) -"axa" = ( -/obj/structure/chair/sofa/left{ - color = "#6ae226"; - dir = 8 - }, -/obj/effect/landmark/start/virologist, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "axb" = ( /obj/effect/spawner/random/fungus/frequent, /turf/simulated/wall, @@ -17425,10 +17414,6 @@ /obj/effect/turf_decal/tiles/department/security/corner, /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/a) -"bsF" = ( -/obj/machinery/door/poddoor/impassable/gamma, -/turf/simulated/floor/plating, -/area/station/security/armory/secure) "bsG" = ( /obj/effect/turf_decal/tiles/department/security/side{ dir = 1 @@ -17988,6 +17973,15 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) +"bwl" = ( +/obj/structure/chair/sofa/corner{ + color = "#6ae226" + }, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 5 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "bwm" = ( /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 @@ -46349,6 +46343,10 @@ /obj/structure/chair, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) +"dFF" = ( +/obj/structure/sign/biohazard, +/turf/simulated/wall/r_wall, +/area/station/medical/medbay) "dFG" = ( /turf/simulated/wall/r_wall, /area/station/medical/virology) @@ -47135,7 +47133,6 @@ /obj/effect/turf_decal/tiles/department/virology/side{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "dLf" = ( @@ -47474,6 +47471,12 @@ /obj/effect/turf_decal/tiles/department/science/side, /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) +"dOd" = ( +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "dOq" = ( /obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/dark, @@ -49295,10 +49298,6 @@ }, /turf/space, /area/space) -"dZw" = ( -/obj/structure/sign/biohazard, -/turf/simulated/wall/r_wall, -/area/station/medical/medbay) "dZE" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -50958,12 +50957,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"eEY" = ( -/obj/structure/bed/dogbed, -/mob/living/basic/mouse/white/brain, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "eFp" = ( /obj/machinery/computer/atmoscontrol{ dir = 4 @@ -51582,6 +51575,29 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/hallway/primary/aft/south) +"eQz" = ( +/obj/machinery/access_button{ + autolink_id = "virolab_btn_ext"; + layer = 3.6; + name = "Virology Lab Access Button"; + pixel_x = -24; + req_access = list(39) + }, +/obj/machinery/door/airlock/virology{ + autoclose = 0; + id_tag = "virolab_door_ext"; + locked = 1; + name = "Virology Lab External Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel/white, +/area/station/medical/medbay) "eQB" = ( /obj/structure/cable/extra_insulated{ icon_state = "1-2" @@ -52265,8 +52281,12 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "fhF" = ( +/obj/docking_port/stationary/gamma_armory{ + dir = 4; + name = "NSS Kerberos Gamma Armory Shuttle Dock" + }, /turf/space, -/area/shuttle/gamma/station) +/area/space) "fhG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -53162,6 +53182,10 @@ /obj/effect/turf_decal/tiles/department/engineering/corner, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/north) +"fBW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "fCA" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; @@ -53300,6 +53324,13 @@ /obj/effect/turf_decal/delivery/red/hollow, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) +"fEG" = ( +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "fEY" = ( /obj/machinery/alarm/directional/north, /turf/simulated/floor/wood, @@ -53900,6 +53931,14 @@ }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"fPb" = ( +/obj/structure/table, +/obj/item/clothing/mask/gas, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 9 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "fPx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -54791,15 +54830,6 @@ /obj/effect/turf_decal/tiles/neutral/side, /turf/simulated/floor/plasteel, /area/station/public/fitness) -"giV" = ( -/obj/structure/chair/sofa/corner{ - color = "#6ae226" - }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 5 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "gjk" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/autoname, @@ -56731,6 +56761,21 @@ /obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"hfU" = ( +/obj/structure/table/glass, +/obj/item/clothing/gloves/color/latex{ + pixel_y = 6 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 3 + }, +/obj/item/healthanalyzer, +/obj/item/storage/belt/medical, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "hgo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59162,6 +59207,13 @@ /obj/machinery/newscaster/directional/north, /turf/simulated/floor/carpet/grimey, /area/station/public/vacant_office) +"imG" = ( +/obj/structure/table/glass, +/obj/machinery/computer/med_data/laptop{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "imL" = ( /obj/structure/chair/sofa/corp/left{ dir = 8 @@ -61782,13 +61834,6 @@ /obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel, /area/station/security/processing) -"jrW" = ( -/obj/item/kirbyplants/large, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 10 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "jsh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -62739,6 +62784,13 @@ }, /turf/simulated/floor/plating, /area/station/security/permabrig) +"jQA" = ( +/obj/item/kirbyplants/large, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 10 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "jQN" = ( /obj/machinery/door/poddoor{ density = 0; @@ -63564,11 +63616,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical/aft_starboard) -"kiU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "kiW" = ( /obj/structure/extinguisher_cabinet{ name = "east bump"; @@ -64492,16 +64539,6 @@ /obj/structure/cable, /turf/simulated/floor/wood, /area/station/legal/courtroom) -"kFG" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/dropper/precision, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "kFS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -66557,20 +66594,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fore2) -"lyR" = ( -/obj/machinery/door/airlock/virology/glass{ - name = "Workstation" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/medical/virology, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "lzN" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/yellow{ @@ -67064,17 +67087,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"lKY" = ( -/obj/machinery/smartfridge/secure/chemistry/virology/preloaded, -/obj/structure/reagent_dispensers/virusfood{ - pixel_x = -30 - }, -/obj/machinery/requests_console/directional/south, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 10 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "lLN" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -67521,15 +67533,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) -"lXn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "lXp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -68039,12 +68042,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/transmission_laser) -"mjG" = ( -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "mjS" = ( /obj/structure/weightmachine/stacklifter, /obj/machinery/camera{ @@ -68350,13 +68347,6 @@ "mpZ" = ( /turf/simulated/floor/carpet/purple, /area/station/medical/psych) -"mqc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "mqk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -68609,13 +68599,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"mtU" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "mtV" = ( /obj/structure/shelf/service, /obj/item/storage/box/lights/mixed, @@ -69092,6 +69075,15 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/port) +"mJw" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 8 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "mJU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -70168,6 +70160,15 @@ /obj/effect/spawner/random/fungus/frequent, /turf/simulated/wall, /area/station/maintenance/abandoned_garden) +"ncB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "ncZ" = ( /obj/effect/turf_decal/tiles/department/security/corner{ dir = 1 @@ -70455,6 +70456,17 @@ /obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonershuttle) +"njF" = ( +/obj/structure/chair/sofa/left{ + color = "#6ae226"; + dir = 8 + }, +/obj/effect/landmark/start/virologist, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "njU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -71514,15 +71526,6 @@ }, /turf/simulated/floor/engine, /area/station/engineering/controlroom) -"nIf" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 1 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "nIr" = ( /obj/item/clothing/glasses/sunglasses, /obj/structure/table/wood, @@ -71819,12 +71822,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) -"nQW" = ( -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "nQX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -71898,6 +71895,13 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/service/bar) +"nSq" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "nSv" = ( /obj/machinery/economy/vending/cola, /obj/effect/turf_decal/delivery, @@ -73658,12 +73662,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/medical/coldroom) -"oBT" = ( -/obj/effect/turf_decal/tiles/department/virology/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "oCh" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; @@ -73671,6 +73669,13 @@ }, /turf/simulated/wall, /area/station/hallway/secondary/entry/east) +"oCp" = ( +/obj/machinery/economy/vending/virodrobe, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 9 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "oCK" = ( /obj/item/radio/intercom{ name = "north bump"; @@ -74354,13 +74359,6 @@ temperature = 80 }, /area/station/science/xenobiology) -"oSp" = ( -/obj/structure/table/glass, -/obj/machinery/computer/med_data/laptop{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "oSN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -75541,11 +75539,13 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) -"psE" = ( -/obj/structure/table, -/obj/item/clothing/mask/gas, +"psH" = ( +/obj/structure/closet/crate/freezer/iv_storage, +/obj/machinery/light{ + dir = 1 + }, /obj/effect/turf_decal/tiles/department/virology/side{ - dir = 9 + dir = 5 }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) @@ -75757,21 +75757,6 @@ /obj/effect/turf_decal/tiles/department/security/corner, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonershuttle) -"pzu" = ( -/obj/structure/table/glass, -/obj/item/storage/fancy/donut_box{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/storage/box/donkpockets, -/obj/machinery/camera{ - c_tag = "Virology Break Room"; - dir = 10; - network = list("Medical","SS13") - }, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "pzy" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -76257,10 +76242,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) -"pIP" = ( -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "pIS" = ( /obj/structure/table/wood, /obj/item/storage/fancy/cigarettes/cigpack_random{ @@ -76996,15 +76977,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) -"pZA" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "pZI" = ( /obj/structure/safe{ known_by = list("captain") @@ -77221,6 +77193,13 @@ icon_state = "showroomfloor" }, /area/station/medical/surgery) +"qfH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "qgd" = ( /obj/structure/cable{ icon_state = "4-8" @@ -77453,21 +77432,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/research) -"qkN" = ( -/obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex{ - pixel_y = 6 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = 3 - }, -/obj/item/healthanalyzer, -/obj/item/storage/belt/medical, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "qlz" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -77960,6 +77924,13 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/storage) +"qyb" = ( +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 4 + }, +/mob/living/carbon/human/monkey, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "qyi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -78300,6 +78271,7 @@ /area/station/service/chapel/office) "qGc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/tiles/department/virology/side, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "qGf" = ( @@ -78709,7 +78681,6 @@ /obj/effect/turf_decal/tiles/department/virology/side{ dir = 4 }, -/mob/living/carbon/human/monkey, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "qPT" = ( @@ -79179,6 +79150,11 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/supply/qm) +"qYo" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "qYL" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/transit_tube/horizontal, @@ -79339,6 +79315,12 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonershuttle) +"rbC" = ( +/obj/structure/bed/dogbed, +/mob/living/basic/mouse/white/brain, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "rbD" = ( /obj/machinery/light/small{ dir = 8 @@ -79429,6 +79411,21 @@ }, /turf/simulated/floor/plating, /area/station/command/office/ntrep) +"rdA" = ( +/obj/structure/table/glass, +/obj/item/storage/fancy/donut_box{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/storage/box/donkpockets, +/obj/machinery/camera{ + c_tag = "Virology Break Room"; + dir = 10; + network = list("Medical","SS13") + }, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "rdF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -83129,6 +83126,16 @@ icon_state = "freezerfloor" }, /area/station/security/permabrig) +"sAa" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper/precision, +/obj/item/reagent_containers/spray/cleaner, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "sAq" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes/cigpack_our_brand{ @@ -86938,6 +86945,11 @@ /obj/machinery/light/small, /turf/simulated/floor/plasteel/dark, /area/station/medical/morgue) +"uaa" = ( +/obj/machinery/door/poddoor/impassable/gamma, +/obj/structure/fans/tiny, +/turf/simulated/floor/plating, +/area/station/security/armory/secure) "uad" = ( /obj/effect/spawner/airlock/e_to_w/long, /turf/simulated/wall, @@ -87894,29 +87906,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) -"urz" = ( -/obj/machinery/access_button{ - autolink_id = "virolab_btn_ext"; - layer = 3.6; - name = "Virology Lab Access Button"; - pixel_x = -24; - req_access = list(39) - }, -/obj/machinery/door/airlock/virology{ - autoclose = 0; - id_tag = "virolab_door_ext"; - locked = 1; - name = "Virology Lab External Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/virology, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel/white, -/area/station/medical/medbay) "urW" = ( /obj/structure/cable/extra_insulated{ icon_state = "4-8" @@ -87971,6 +87960,15 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) +"uuh" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 1 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "uvp" = ( /obj/structure/sink/kitchen/directional/north, /turf/simulated/floor/plasteel{ @@ -89339,6 +89337,26 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"uZh" = ( +/obj/machinery/door_control{ + id = "viroshutters"; + name = "Privacy Shutters Control"; + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/hand_labeler{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 8 + }, +/obj/structure/table/reinforced, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "uZj" = ( /obj/machinery/door/airlock/engineering{ name = "Tech Storage" @@ -89568,6 +89586,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) +"veV" = ( +/obj/machinery/atmospherics/binary/valve{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/medical/virology) "vfh" = ( /obj/effect/turf_decal, /obj/machinery/atmospherics/portable/scrubber/huge, @@ -90347,13 +90371,6 @@ /obj/machinery/light/floor, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) -"vwR" = ( -/obj/machinery/economy/vending/virodrobe, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 9 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "vxk" = ( /obj/structure/cable{ icon_state = "1-2" @@ -91480,6 +91497,20 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/hallway/secondary/exit) +"vTs" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Workstation" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "vTw" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/turf_decal/tiles/department/medical/checker, @@ -91893,6 +91924,10 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"wdL" = ( +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "wdS" = ( /obj/machinery/firealarm/directional/south, /obj/structure/cable{ @@ -91967,12 +92002,6 @@ /obj/item/hand_labeler, /turf/simulated/floor/plasteel/dark, /area/station/security/evidence) -"wfK" = ( -/obj/machinery/atmospherics/binary/valve{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/medical/virology) "wfO" = ( /obj/structure/closet/crate, /obj/item/food/sliced/bread, @@ -94180,23 +94209,11 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "wWX" = ( -/obj/machinery/door_control{ - id = "viroshutters"; - name = "Privacy Shutters Control"; - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/hand_labeler{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/machinery/pandemic, +/obj/effect/turf_decal/delivery/green, /obj/effect/turf_decal/tiles/department/virology/side{ dir = 8 }, -/obj/structure/table/reinforced, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "wXn" = ( @@ -94966,11 +94983,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) -"xlX" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "xme" = ( /obj/structure/chair/sofa/corp/left{ dir = 4 @@ -95786,10 +95798,13 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "xES" = ( -/obj/machinery/pandemic, -/obj/effect/turf_decal/delivery/green, +/obj/machinery/smartfridge/secure/chemistry/virology/preloaded, +/obj/structure/reagent_dispensers/virusfood{ + pixel_x = -30 + }, +/obj/machinery/requests_console/directional/south, /obj/effect/turf_decal/tiles/department/virology/side{ - dir = 8 + dir = 10 }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) @@ -96506,6 +96521,19 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) +"xUg" = ( +/obj/structure/table, +/obj/item/storage/box/syringes, +/obj/item/storage/box/monkeycubes, +/obj/machinery/camera{ + c_tag = "Virology Pen"; + network = list("SS13","Medical") + }, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 1 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "xUl" = ( /obj/machinery/light/small{ dir = 1 @@ -96577,16 +96605,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, /area/station/service/kitchen) -"xVV" = ( -/obj/structure/closet/crate/freezer/iv_storage, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 5 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "xVX" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -96678,19 +96696,6 @@ }, /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) -"xZc" = ( -/obj/structure/table, -/obj/item/storage/box/syringes, -/obj/item/storage/box/monkeycubes, -/obj/machinery/camera{ - c_tag = "Virology Pen"; - network = list("SS13","Medical") - }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 1 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "xZj" = ( /obj/structure/window/reinforced{ dir = 4 @@ -144075,7 +144080,7 @@ aKE tzg aKE auO -urz +eQz dNu nZk gLq @@ -144332,7 +144337,7 @@ unq rfa oRe fXw -dZw +dFF tpR cBf pax @@ -144849,7 +144854,7 @@ yeb rZl kTY cBf -jrW +jQA dGw dJJ hDw @@ -145363,7 +145368,7 @@ suJ rZl kGo dPU -eEY +rbC dGw dGw oKO @@ -145620,7 +145625,7 @@ mNF rZl mkH dPU -pIP +wdL dGw eeq pgP @@ -145877,20 +145882,20 @@ sds rZl qBj dPU -xlX +qYo dGw vDR dWX pcJ oaI xJo -pIP +wdL dGw jDT ebB +uZh wWX xES -lKY dFG abj abj @@ -146134,7 +146139,7 @@ tAC rZl rEg dPU -mtU +nSq dGw sia myW @@ -146146,8 +146151,8 @@ dNn wYx mXf tOS +fBW qGc -kiU oWo rEn oTr @@ -146391,7 +146396,7 @@ abj dFG dvR dPU -pIP +wdL dGw dGw dNr @@ -146404,7 +146409,7 @@ kMN dWX ezr wWW -mqc +qfH sRk uNq acF @@ -146648,10 +146653,10 @@ aaa dFG mvd dPU -oBT +dOd uBB -pZA -mjG +mJw +dLe mYt jjB jhr @@ -146661,7 +146666,7 @@ lVl tqY mrs cEB -kFG +sAa wkW pqY pDw @@ -146907,17 +146912,17 @@ xOG adX qTE jGI -lXn +ncB mcy xTt qsg mJU -lyR +vTs gfJ miC ipg sMn -qkN +hfU bIw dFG abj @@ -147164,10 +147169,10 @@ hDq sKx gBx qiP -nQW -nQW +qPN +qPN pcJ -nQW +qPN oJi fdp dGw @@ -147427,8 +147432,8 @@ scc dNr dGw dGw -psE -dLe +fPb +fEG gbQ pAB dFG @@ -147678,13 +147683,13 @@ mpL fYc hPN dGw -vwR -mjG +oCp +dLe pcJ -mjG +dLe svD dGw -xZc +xUg vqa dPU vVX @@ -147932,7 +147937,7 @@ abj abj dFG vQS -wfK +veV qmB dGw wro @@ -147941,7 +147946,7 @@ liE dWX mJY dGw -nIf +uuh eoJ pGL rYa @@ -148193,13 +148198,13 @@ reh opY dGw uZp -oSp +imG tig mXf -pzu +rdA dGw -xVV -qPN +psH +qyb rHX hDu dFG @@ -148449,8 +148454,8 @@ pUL pUL ssx dGw -giV -axa +bwl +njF dMx sYf rOl @@ -154537,8 +154542,8 @@ esj bhi boZ eXP -wRa bnp +wRa qcb taj aMq @@ -154794,8 +154799,8 @@ esj ngg ngg ngg +uaa ngg -bsF ngg ngg ngg @@ -155048,13 +155053,13 @@ kkK agt tOM bNE +aaa +aaa +aaa fhF -fhF -fhF -fhF -fhF -fhF -fhF +aaa +aaa +aaa gLn aaa aaa @@ -155305,13 +155310,13 @@ upp xmZ stH abj -fhF -fhF -fhF -fhF -fhF -fhF -fhF +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj aaa aaa @@ -155562,13 +155567,13 @@ aaa aaa aaa abj -fhF -fhF -fhF -fhF -fhF -fhF -fhF +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj aaa aaa @@ -155819,13 +155824,13 @@ abj abj abj abj -fhF -fhF -fhF -fhF -fhF -fhF -fhF +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj aaa aaa @@ -156076,13 +156081,13 @@ aaa aaa aaa abj -fhF -fhF -fhF -fhF -fhF -fhF -fhF +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj aaa aaa @@ -156333,13 +156338,13 @@ aaa aaa aaa abj -fhF -fhF -fhF -fhF -fhF -fhF -fhF +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj aaa aaa diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 7b03508ec85..5b4c85c1eac 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -36852,10 +36852,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"hvp" = ( -/obj/machinery/door/poddoor/impassable/gamma, -/turf/simulated/floor/plasteel/dark, -/area/station/security/armory/secure) "hvq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -50841,12 +50837,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) -"kjD" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/security/armory/secure) "kjE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56053,8 +56043,12 @@ /turf/simulated/floor/plasteel, /area/station/science/break_room) "lpP" = ( +/obj/docking_port/stationary/gamma_armory{ + dir = 4; + name = "NSS Diagoras Gamma Armory Shuttle Dock" + }, /turf/space, -/area/shuttle/gamma/station) +/area/space) "lpW" = ( /obj/structure/table/wood/poker, /obj/item/deck/cards, @@ -100135,6 +100129,9 @@ /area/station/medical/sleeper) "ucJ" = ( /obj/machinery/suit_storage_unit/security/secure, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "ucL" = ( @@ -107208,6 +107205,11 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"vAi" = ( +/obj/machinery/door/poddoor/impassable/gamma, +/obj/structure/fans/tiny, +/turf/simulated/floor/plasteel/dark, +/area/station/security/armory/secure) "vAu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -174031,12 +174033,12 @@ aZS jnP fiv ucJ -kjD +trj trj bAr kvO -cmF rFY +cmF ihH gDH fOE @@ -174288,8 +174290,8 @@ aZS aZS fiv fiv +vAi fiv -hvp fiv fiv fiv @@ -174542,13 +174544,13 @@ jnP jnP jnP uXb +jnP +jnP +jnP lpP -lpP -lpP -lpP -lpP -lpP -lpP +jnP +jnP +jnP uXb jnP jnP @@ -174799,13 +174801,13 @@ jnP jnP jnP aZS -lpP -lpP -lpP -lpP -lpP -lpP -lpP +jnP +jnP +jnP +jnP +jnP +jnP +jnP aZS jnP qKm @@ -175056,13 +175058,13 @@ jnP jnP jnP aZS -lpP -lpP -lpP -lpP -lpP -lpP -lpP +jnP +jnP +jnP +jnP +jnP +jnP +jnP aZS jnP qKm @@ -175313,13 +175315,13 @@ aZS aZS aZS uXb -lpP -lpP -lpP -lpP -lpP -lpP -lpP +jnP +jnP +jnP +jnP +jnP +jnP +jnP aZS qKm qKm @@ -175570,13 +175572,13 @@ jnP jnP jnP aZS -lpP -lpP -lpP -lpP -lpP -lpP -lpP +jnP +jnP +jnP +jnP +jnP +jnP +jnP aZS uCB jFd @@ -175827,13 +175829,13 @@ jnP jnP jnP aZS -lpP -lpP -lpP -lpP -lpP -lpP -lpP +jnP +jnP +jnP +jnP +jnP +jnP +jnP aZS uCB lDA diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index dd65bf0907c..b5a8a772d87 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -1018,8 +1018,12 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/electrical/fore_port) "alq" = ( +/obj/docking_port/stationary/gamma_armory{ + dir = 8; + name = "NSS Cerebron Gamma Armory Shuttle Dock" + }, /turf/space, -/area/shuttle/gamma/station) +/area/space) "alr" = ( /turf/simulated/floor/plating, /area/station/maintenance/disposal) @@ -71864,6 +71868,7 @@ /area/station/hallway/primary/fore/north) "rZN" = ( /obj/machinery/door/poddoor/impassable/gamma, +/obj/structure/fans/tiny, /turf/simulated/floor/plasteel/dark, /area/station/security/main) "rZZ" = ( @@ -115362,13 +115367,13 @@ aaa aaa aaa aaa -alq -alq -alq -alq -alq -alq -alq +aaa +aaa +aaa +aaa +aaa +aaa +aaa abW abW bOX @@ -115619,13 +115624,13 @@ aaa aaa aaa aaa -alq -alq -alq -alq -alq -alq -alq +aaa +aaa +aaa +aaa +aaa +aaa +aaa ajo abq abq @@ -115876,13 +115881,13 @@ aaa aaa aaa aaa -alq -alq -alq -alq -alq -alq -alq +aaa +aaa +aaa +aaa +aaa +aaa +aaa abq aaa aaa @@ -116133,13 +116138,13 @@ aaa aaa aaa aaa -alq -alq -alq -alq -alq -alq -alq +aaa +aaa +aaa +aaa +aaa +aaa +aaa abq aaa aaa @@ -116390,13 +116395,13 @@ aaa aaa aaa aaa -alq -alq -alq -alq -alq -alq -alq +aaa +aaa +aaa +aaa +aaa +aaa +aaa abq aaa jGk @@ -116647,13 +116652,13 @@ aaa aaa aaa aaa +aaa +aaa +aaa alq -alq -alq -alq -alq -alq -alq +aaa +aaa +aaa ajo aaa eoe diff --git a/code/controllers/subsystem/SSshuttles.dm b/code/controllers/subsystem/SSshuttles.dm index 39085c985f4..7088608a0f2 100644 --- a/code/controllers/subsystem/SSshuttles.dm +++ b/code/controllers/subsystem/SSshuttles.dm @@ -40,6 +40,9 @@ SUBSYSTEM_DEF(shuttle) /// The current shuttle loan event, if any. var/shuttle_loan_UID + // Gamma armory + var/obj/docking_port/mobile/gamma_armory/gamma_armory + var/list/hidden_shuttle_turfs = list() //all turfs hidden from navigation computers associated with a list containing the image hiding them and the type of the turf they are pretending to be var/list/hidden_shuttle_turf_images = list() //only the images from the above list /// Default refuel delay @@ -68,6 +71,8 @@ SUBSYSTEM_DEF(shuttle) WARNING("No /obj/docking_port/mobile/emergency/backup placed on the map!") if(!supply) WARNING("No /obj/docking_port/mobile/supply placed on the map!") + if(!gamma_armory) + WARNING("No /obj/docking_port/mobile/gamma_armory placed on the map!") initial_load() initial_move() @@ -513,6 +518,23 @@ SUBSYSTEM_DEF(shuttle) return trade_shuttle +/datum/controller/subsystem/shuttle/proc/load_initial_gamma_armory_shuttle(gamma_armory_shuttle_id) + var/obj/docking_port/mobile/gamma_armory/gamma_armory = getShuttle("gamma_armory") + if(gamma_armory) + log_debug("requested to load initial Gamma Armory shuttle when one already exists") + var/obj/docking_port/docking_port = SSshuttle.getDock("gamma_away") + if(!istype(docking_port)) + log_debug("could not find Gamma Armory docking port") + return + var/datum/map_template/shuttle/shuttle_template = GLOB.shuttle_templates[gamma_armory_shuttle_id] + if(!shuttle_template) + log_debug("could not find Gamma Armory shuttle template") + return + var/obj/docking_port/mobile/mobile_port = SSshuttle.load_template(shuttle_template) + mobile_port.dock(docking_port, force = TRUE) + mobile_port.register() + gamma_armory = mobile_port + /datum/controller/subsystem/shuttle/proc/request_transit_dock(obj/docking_port/mobile/M) if(!istype(M)) CRASH("[M] is not a mobile docking port") diff --git a/code/controllers/subsystem/non_firing/SSlate_mapping.dm b/code/controllers/subsystem/non_firing/SSlate_mapping.dm index 92b3a1020c1..d1f05f99c3b 100644 --- a/code/controllers/subsystem/non_firing/SSlate_mapping.dm +++ b/code/controllers/subsystem/non_firing/SSlate_mapping.dm @@ -14,6 +14,12 @@ SUBSYSTEM_DEF(late_mapping) GLOB.air_alarms = sortAtom(GLOB.air_alarms) GLOB.apcs = sortAtom(GLOB.apcs) + // Load a Gamma Armoury shuttle at Centcom. + if(SSmapping.gamma_armory_shuttle_id) + SSshuttle.load_initial_gamma_armory_shuttle(SSmapping.gamma_armory_shuttle_id) + else + WARNING("no valid Gamma Armory shuttle template was set in SSmapping") + for(var/obj/machinery/computer/shuttle/console in SSmachines.get_by_type(/obj/machinery/computer/shuttle)) if(console.find_destinations_in_late_mapping) console.connect() diff --git a/code/controllers/subsystem/non_firing/SSmapping.dm b/code/controllers/subsystem/non_firing/SSmapping.dm index ed5195f77c8..aabbbeabcb0 100644 --- a/code/controllers/subsystem/non_firing/SSmapping.dm +++ b/code/controllers/subsystem/non_firing/SSmapping.dm @@ -8,6 +8,8 @@ SUBSYSTEM_DEF(mapping) var/datum/map/next_map /// What map was used last round? var/datum/map/last_map + /// The Gamma Armory shuttle to load at Centcom in late_mapping. + var/gamma_armory_shuttle_id = "gamma_armory_base" /// List of all areas that can be accessed via IC means var/list/teleportlocs /// List of all areas that can be accessed via IC and OOC means diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 40c157c1282..8fec84d54f7 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -33,9 +33,16 @@ port_id = "admin" name = "Base Shuttle Template (Admin)" +/datum/map_template/shuttle/gamma_armory + port_id = "gamma_armory" + name = "Base Gamma Armory Template" + prefix = "_maps/map_files/shuttles/gamma_armory/" -// Shuttles start here: +/datum/map_template/shuttle/trader + port_id = "trader_base" + prefix = "_maps/map_files/shuttles/trader/" +// MARK: Emergency /datum/map_template/shuttle/emergency/bar suffix = "bar" name = "NTV Bullet (Bar)" @@ -57,7 +64,6 @@ description = "A militarized Charon-class shuttle hull featuring defense turrets and minimal crew comforts." admin_notes = "Designed to ensure a safe evacuation during xeno outbreaks." - /datum/map_template/shuttle/emergency/clown suffix = "clown" name = "NCV Snappop(tm)" @@ -169,6 +175,7 @@ qdel(home, TRUE) SSshuttle.emergency_locked_in = TRUE +// MARK: Ferry /datum/map_template/shuttle/ferry/base suffix = "base" name = "transport ferry" @@ -186,6 +193,7 @@ admin_notes = "Meat currently contains no zombifying reagents, people on \ meatspike must be spawned in." +// MARK: Admin /datum/map_template/shuttle/admin/hospital suffix = "hospital" name = "NHV Asclepius" @@ -206,11 +214,24 @@ name = "Vox Skipjack" description = "Vox skipjack ship." -// Trader Shuttles: -/datum/map_template/shuttle/trader - port_id = "trader_base" - prefix = "_maps/map_files/shuttles/trader/" +// MARK: Gamma +/datum/map_template/shuttle/gamma_armory/standard + suffix = "base" + name = "Gamma Armory (standard)" + description = "The standard Gamma level armory shuttle, for assisting station crews in dire need of more firepower." + admin_notes = "Equipped with: 3 Multi-lens immolators, 3 Advanced Eguns, 3 Saber SMGs (plus 3 spare mags), 3 combat shotguns (plus 3 spare buckshot speedloaders),\ + 2 medbeam guns, 3 combat knives, 1 cluster flashbang, 1 plasma incendiary grenade, a gamma autolathe,\ + 1 shielded safeguard MODsuit, 1 Ares mech (pre-equipped)." +/datum/map_template/shuttle/gamma_armory/clown + suffix = "clown" + name = "Gamma Armory (HONK!)" + description = "A special Gamma level armory shuttle, for assisting station crews in dire need of more FUN." + admin_notes = "Equipped with: 6 bananas, 3 HONK rifles, 3 pie cannons (plus 9 spare pies), 3 combat shotguns loaded with confetti shot (plus 3 spare confetti speedloaders),\ + 1 clown statue, 3 bike horns, 1 lube clusterbang, 1 confetti grenade, a gamma autolathe,\ + 1 clown EVA suit, 1 HONK mech (pre-equipped)." + +// MARK: Trader /datum/map_template/shuttle/trader/sol suffix = "sol" name = "Solgov Trade Freighter" diff --git a/code/game/area/shuttle_areas.dm b/code/game/area/shuttle_areas.dm index 62df869e12f..c0cd06fa2fb 100644 --- a/code/game/area/shuttle_areas.dm +++ b/code/game/area/shuttle_areas.dm @@ -56,13 +56,9 @@ name = "\improper Transport Shuttle" parallax_move_direction = EAST -/area/shuttle/gamma/space +/area/shuttle/gamma + name = "\improper Gamma Armory Shuttle" icon_state = "shuttle" - name = "\improper Gamma Armory" - -/area/shuttle/gamma/station - icon_state = "shuttle" - name = "\improper Gamma Armory Station" /area/shuttle/siberia name = "\improper Labor Camp Shuttle" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 681aa24b619..35daffb4ade 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -427,7 +427,7 @@ data["authcapt"] = data["authenticated"] >= COMM_AUTHENTICATION_CAPT && (data["authenticated"] == COMM_AUTHENTICATION_AGHOST || !isobserver(user)) data["is_admin"] = data["authenticated"] >= COMM_AUTHENTICATION_CENTCOM && (data["authenticated"] == COMM_AUTHENTICATION_AGHOST || !isobserver(user)) - data["gamma_armory_location"] = GLOB.gamma_ship_location + data["gamma_armory_location"] = is_on_level_name(SSshuttle.gamma_armory, CENTCOMM) ? TRUE : FALSE data["ert_allowed"] = !SSticker.mode.ert_disabled data["stat_display"] = list( diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm index 7db04db7aae..00077057902 100644 --- a/code/modules/admin/misc_admin_procs.dm +++ b/code/modules/admin/misc_admin_procs.dm @@ -863,33 +863,25 @@ GLOBAL_VAR_INIT(disable_explosions, FALSE) //ALL DONE //********************************************************************************************************* -GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space - /proc/move_gamma_ship() - var/area/fromArea - var/area/toArea - if(GLOB.gamma_ship_location == 1) - fromArea = locate(/area/shuttle/gamma/space) - toArea = locate(/area/shuttle/gamma/station) + if(!SSshuttle.gamma_armory) + log_debug("move_gamma_ship(): There is no Gamma Armory shuttle, but the Gamma Armory shuttle was called. Loading a default Gamma Armory shuttle.") + SSshuttle.load_initial_gamma_armory_shuttle(SSmapping.gamma_armory_shuttle_id) + + if(SSshuttle.gamma_armory.mode != (SHUTTLE_IDLE || SHUTTLE_DOCKED)) + to_chat(usr, "The Gamma Armory shuttle is currently in transit. Please try again in a few moments.") + return + + if(SSshuttle.gamma_armory.loc.z == level_name_to_num(CENTCOMM)) + SSshuttle.moveShuttle("gamma_armory", "gamma_home", TRUE, usr) for(var/obj/machinery/door/poddoor/impassable/gamma/H in GLOB.airlocks) H.open() GLOB.major_announcement.Announce("Central Command has deployed the Gamma Armory shuttle.", new_sound = 'sound/AI/gamma_deploy.ogg') else - fromArea = locate(/area/shuttle/gamma/station) - toArea = locate(/area/shuttle/gamma/space) + SSshuttle.moveShuttle("gamma_armory", "gamma_away", TRUE, usr) for(var/obj/machinery/door/poddoor/impassable/gamma/H in GLOB.airlocks) H.close() //DOOR STUCK GLOB.major_announcement.Announce("Central Command has recalled the Gamma Armory shuttle.", new_sound = 'sound/AI/gamma_recall.ogg') - fromArea.move_contents_to(toArea) - - for(var/obj/machinery/mech_bay_recharge_port/P in toArea) - P.update_recharge_turf() - - if(GLOB.gamma_ship_location) - GLOB.gamma_ship_location = 0 - else - GLOB.gamma_ship_location = 1 - return /proc/formatJumpTo(location, where="") var/turf/loc diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index e929d1a8382..bf605cea821 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -110,6 +110,9 @@ name = "combat shotgun internal magazine" max_ammo = 6 +/obj/item/ammo_box/magazine/internal/shot/com/confetti + ammo_type = /obj/item/ammo_casing/shotgun/confetti + /obj/item/ammo_box/magazine/internal/shot/malf name = "cyborg shotgun internal magazine" ammo_type = /obj/item/ammo_casing/shotgun/lasershot diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index ed1888afd81..27dccb12724 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -311,6 +311,9 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot/com execution_speed = 5 SECONDS +/obj/item/gun/projectile/shotgun/automatic/combat/confetti + mag_type = /obj/item/ammo_box/magazine/internal/shot/com/confetti + /// Service Malfunction Borg Combat Shotgun Variant /obj/item/gun/projectile/shotgun/automatic/combat/cyborg name = "cyborg shotgun" diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm index 9652bb35876..3d1604ad96a 100644 --- a/code/modules/shuttle/assault_pod.dm +++ b/code/modules/shuttle/assault_pod.dm @@ -12,7 +12,7 @@ return ..() -/obj/docking_port/mobile/assault_pod/dock(obj/docking_port/stationary/S1) +/obj/docking_port/mobile/assault_pod/dock(obj/docking_port/stationary/S1, force=FALSE, transit=FALSE) ..() if(!istype(S1, /obj/docking_port/stationary/transit)) playsound(get_turf(src.loc), 'sound/effects/explosion1.ogg',50,1) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index b09294a6d8d..dbfe82f1f60 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -156,7 +156,7 @@ /obj/docking_port/proc/register() return 0 - +// MARK: Stationary port /obj/docking_port/stationary name = "dock" @@ -170,12 +170,6 @@ if(!mapload) register() -// Preset for adding whiteship docks to ruins. Has widths preset which will auto-assign the shuttle -/obj/docking_port/stationary/whiteship - dwidth = 6 - height = 19 - width = 12 - /obj/docking_port/stationary/register() if(!SSshuttle) stack_trace("Docking port [src] could not initialize. SSshuttle doesnt exist!") @@ -215,7 +209,7 @@ SSshuttle.transit_docking_ports += src return 1 - +// MARK: Mobile port /obj/docking_port/mobile name = "shuttle" icon_state = "pinonclose" @@ -829,7 +823,7 @@ SSshuttle.request_transit_dock(src) return FALSE - +// MARK: Shuttle Ports /obj/docking_port/mobile/labour dir = 8 dwidth = 2 @@ -890,6 +884,33 @@ timid = TRUE width = 18 +/obj/docking_port/stationary/gamma_armory + id = "gamma_home" + name = "Station Gamma Armory Shuttle Dock" + width = 7 + dwidth = 3 + height = 6 + +/obj/docking_port/stationary/gamma_armory/centcomm + id = "gamma_away" + name = "Central Command Gamma Armory Shuttle Dock" + +/obj/docking_port/mobile/gamma_armory + id = "gamma_armory" + name = "Gamma Armory shuttle" + width = 7 + dwidth = 3 + height = 6 + port_direction = EAST + timid = TRUE + +/obj/docking_port/mobile/gamma_armory/register() + if(!..()) + return FALSE + + SSshuttle.gamma_armory = src + return TRUE + /obj/docking_port/mobile/ferry dir = 8 dwidth = 2 @@ -918,6 +939,11 @@ name = "syndicate infiltrator" width = 18 +/obj/docking_port/stationary/whiteship + dwidth = 6 + height = 19 + width = 12 + /obj/docking_port/mobile/whiteship dir = 8 id = "whiteship" @@ -928,6 +954,7 @@ preferred_direction = WEST port_direction = SOUTH +// MARK: Shuttle Comp /obj/machinery/computer/shuttle name = "Shuttle Console" icon_screen = "shuttle" @@ -1084,7 +1111,6 @@ message_admins("FERRY: [key_name_admin(usr)] (Move Ferry) is requesting to move the transport ferry to Centcom.") return TRUE - /obj/machinery/computer/shuttle/white_ship name = "Navigation console" desc = "Used to control the NEV Limulus expeditionary vessel." diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index e5b799de40d..49ba4100c6b 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -77,7 +77,7 @@ return 2 return ..() -/obj/docking_port/mobile/supply/dock(obj/docking_port/stationary/port) +/obj/docking_port/mobile/supply/dock(obj/docking_port/stationary/port, force=FALSE, transit=FALSE) . = ..() if(.) return