From b096a269ce4ccaa3e5939760b7ce50b802653710 Mon Sep 17 00:00:00 2001 From: Kassc Date: Mon, 24 Oct 2022 14:07:36 -0400 Subject: [PATCH] SuperPose fixes 2.0 Various minor map fixes. -ScienceShip: Removed RnD console and RnD server. -CombatShip, Small, Medium, Large: fixed various locked doors. -MechFabShip: Removed RnD Robotic console. --- .../submaps/shelters/MechFabShip-27x24.dmm | 2 +- .../submaps/shelters/MechStorageFab-32x24.dmm | 20 +++++++++---------- .../submaps/shelters/ScienceShip-25x33.dmm | 12 +++++------ .../submaps/shelters/SmallCombatShip-9x11.dmm | 2 +- .../submaps/shelters/TinyCombatShip-9x7.dmm | 2 +- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm b/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm index b409a008e5..9554a36f3b 100644 --- a/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm +++ b/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm @@ -49,7 +49,7 @@ "oz" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/part_replacer/adv/discount_bluespace,/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/shuttle/floor/yellow,/area/survivalpod/superpose/MechFabShip) "oS" = (/obj/structure/table/steel_reinforced,/obj/item/device/defib_kit/jumper_kit/loaded,/obj/item/device/defib_kit/jumper_kit/loaded,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/device/mmi,/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechFabShip) "ph" = (/turf/simulated/wall/skipjack,/area/survivalpod/superpose/MechFabShip) -"py" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/reagent_dispensers/acid{pixel_y = 30},/obj/machinery/computer/rdconsole/robotics,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechFabShip) +"py" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/reagent_dispensers/acid{pixel_y = 30},/obj/machinery/computer/mecha,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechFabShip) "pR" = (/obj/structure/window/plastitanium/full,/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/grille/rustic{health = 25; name = "reinforced grille"},/obj/machinery/door/blast/regular{dir = 4; id = "kalipsoshutters"; name = "Kalipso Blast Shielding"},/turf/simulated/shuttle/plating,/area/survivalpod/superpose/MechFabShip) "qf" = (/obj/effect/floor_decal/techfloor/corner{dir = 6},/turf/simulated/shuttle/plating,/area/survivalpod/superpose/MechFabShip) "qk" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/techfloor/corner{dir = 5},/turf/simulated/floor/plating,/area/survivalpod/superpose/MechFabShip) diff --git a/modular_chomp/maps/submaps/shelters/MechStorageFab-32x24.dmm b/modular_chomp/maps/submaps/shelters/MechStorageFab-32x24.dmm index 0d95135e92..3fe26681c5 100644 --- a/modular_chomp/maps/submaps/shelters/MechStorageFab-32x24.dmm +++ b/modular_chomp/maps/submaps/shelters/MechStorageFab-32x24.dmm @@ -85,20 +85,20 @@ "Dr" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/alarm/alarms_hidden{pixel_y = 22},/obj/random/maintenance,/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) "DV" = (/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "EE" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/outline/yellow,/obj/mecha/combat/gygax/old,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechStorageFab) -"EY" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/outline/yellow,/obj/mecha/combat/durand/old,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechStorageFab) +"EY" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/loot_pile/mecha/gygax/medgax,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechStorageFab) "Ga" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5},/obj/random/maintenance/engineering,/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "Go" = (/obj/machinery/power/smes/buildable/hybrid,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "GI" = (/obj/structure/table/rack/shelf/steel,/obj/item/mecha_parts/mecha_equipment/combat_shield,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/mecha_parts/mecha_equipment/tool/sleeper,/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar,/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged,/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "GX" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/random/maintenance,/turf/simulated/floor/tiled/steel_dirty,/area/survivalpod/superpose/MechStorageFab) "Ib" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) -"IE" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/outline/yellow,/obj/mecha/combat/marauder/seraph,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechStorageFab) +"IE" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/outline/yellow,/obj/mecha/combat/marauder/old,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechStorageFab) "IN" = (/obj/item/weapon/bedsheet/piratedouble,/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/floor/wood/sif,/area/survivalpod/superpose/MechStorageFab) "IS" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "IX" = (/obj/machinery/power/terminal,/obj/structure/cable{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "Jh" = (/obj/structure/closet/secure_closet/engineering_electrical{req_access = null},/obj/random/maintenance,/obj/random/maintenance,/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "Jo" = (/obj/machinery/atmospherics/valve{dir = 8},/obj/structure/dispenser{phorontanks = 0},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "JE" = (/obj/machinery/atmospherics/binary/passive_gate{dir = 8; regulate_mode = 0; unlocked = 1},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) -"JR" = (/obj/mecha/working/hoverpod/combatpod{dir = 8},/turf/template_noop,/area/template_noop) +"JR" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/outline/yellow,/obj/mecha/combat/phazon/old,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechStorageFab) "JT" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/loot_pile/mecha/durand,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechStorageFab) "JV" = (/obj/structure/closet/walllocker_double/north,/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) "Ke" = (/obj/machinery/robotic_fabricator,/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) @@ -114,7 +114,6 @@ "MA" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1},/obj/random/junk,/turf/simulated/floor/tiled/steel_dirty,/area/survivalpod/superpose/MechStorageFab) "MB" = (/obj/structure/closet/crate,/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/fiftyspawner/blucarpet,/obj/fiftyspawner/oracarpet,/obj/fiftyspawner/purcarpet,/obj/fiftyspawner/sblucarpet,/obj/fiftyspawner/tealcarpet,/obj/fiftyspawner/turcarpet,/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/algae{amount = 50},/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/lead{amount = 30},/obj/item/stack/material/plasteel{amount = 30; pixel_y = 5},/obj/item/stack/material/resin{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/survivalpod/superpose/MechStorageFab) "Ni" = (/turf/template_noop,/area/survivalpod/superpose/MechStorageFab) -"NH" = (/obj/mecha/combat/fighter/gunpod{dir = 8},/turf/template_noop,/area/template_noop) "Oc" = (/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/machinery/atmospherics/binary/circulator{anchored = 1},/turf/simulated/floor/tiled/techfloor/grid,/area/survivalpod/superpose/MechStorageFab) "Of" = (/obj/structure/salvageable/console_os{dir = 4},/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) "Os" = (/obj/machinery/vending/engivend{emagged = 1},/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) @@ -133,7 +132,6 @@ "VT" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) "We" = (/obj/random/maintenance/engineering,/turf/simulated/floor/tiled/techfloor/grid,/area/survivalpod/superpose/MechStorageFab) "Wo" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10},/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) -"Xr" = (/obj/mecha/combat/fighter/gunpod/loaded{dir = 8},/turf/template_noop,/area/template_noop) "XH" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/door/airlock/maintenance/rnd{req_one_access = null},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "XX" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/door/airlock/maintenance/engi{req_one_access = null},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "Yd" = (/obj/machinery/portable_atmospherics/canister/phoron,/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) @@ -150,22 +148,22 @@ yFyFdGdGyFyFyFyFyFyFyFdGdGdGdGdGtwtwtwdGdGdGyFtwtwtwyFyFyFyFyFyF dGAoAoAoAoAoAoAoAoAoAoAoAoAodGdGtwdGdGdGyFdGdGtwtwtwdGtwtwtwdGdG dGsKDVDVDVDVDVDVDVnhGIMllkAoAotKAoAoAotKtKtKAoAoAoAoAoAoAoAodGyF dGdGdGdGdGdGdGdGDVDVDVDVDVAoJTDVYlDVAoYdaIBCVbAoUtpAakZjAhAotwyF -dGdGdGdGdGdGjqdGDVAoAoAoAoAoEEDVEYDVAoYdDVGaIbAoJhpASwusOcAotwyF +dGdGdGdGdGdGjqdGDVAoAoAoAoAoJRDVEYDVAoYdDVGaIbAoJhpASwusOcAotwyF dGdGdGyFyFyFyFyFDVAobEkdbEAoAuDVvGlAAogTJEJotoAoMxpAfqcSlXAodGyF dGdGdGdGdGdGdGdGDVohbEbEWeohTKTKqfLsAoXXADADADAonJskDVTKTKAoyFyF -dGdGdGdGdGdGXrdGDVAoAoADAoAoVxmBYBdfDrnHQodfMAXHKETKTKycdAAotwyF +dGdGdGdGdGdGdGdGDVAoAoADAoAoVxmBYBdfDrnHQodfMAXHKETKTKycdAAotwyF dGdGdGyFyFyFyFyFDVAoavjuzbAoAoADADAoAoAoAoAoPtAoAoADAoAoAoAotwyF dGdGdGdGdGdGdGdGDVtKeapATKADKNoWrpSMLpqEJVAoISAopApApAbQtlAotwdG -dGdGdGdGdGdGNHdGDVtKOflcskrMpADVlAbQLsGXQoinIbADnzTKakZjCNAoyFdG +dGdGdGdGdGdGdGdGDVtKOflcskrMpADVlAbQLsGXQoinIbADnzTKakZjCNAoyFdG dGdGdGyFyFyFyFyFDVtKwUTKpAADDVpwpwpwpwTKpAAoPtAoMaDVSwusOcAoyFdG dGdGdGdGdGdGdGdGDVtKYIdHKtAoezAoqpAoezAoINAotHXHsdpwfqcSlXAodGyF -dGdGdGdGdGdGjqdGDVtKZALspAAodtAoncAodtAodtAoPtAoDfpApApAgGAotwyF +dGdGdGdGdGdGdGdGDVtKZALspAAodtAoncAodtAodtAoPtAoDfpApApAgGAotwyF dGdGdGyFyFyFyFyFDVAohrTKKeAoAoAoAoAoAoAoAoAolyAoAoADAoAoAoAotwyF dGdGdGdGdGdGdGdGDVAoAoADAoAoOsnsRSqYiHdfqYdfnZXHWopAZGpAZGAotwyF dGdGdGdGdGdGOFdGDVohbEbEbEohTKTKVTpAAoADADADyHAorjwgpArpDVAodGyF dGdGdGyFyFyFyFyFDVAobEqbbEAoqaDVAuDVAoijMBLhDVAotWpAakZjCNAotwyF -dGdGdGdGdGdGJRyFDVAoAoAoAoAoEYlAvGDVAohKrlIXArAoVuDVSwusOcAotwyF -dGdGSzyFyFyFyFyFDVtVaxtOcaAoYlDVIEDVAohoqyGobaAouJTKfqcSlXAotwdG +dGdGdGdGdGdGdGyFDVAoAoAoAoAoIElAvGDVAohKrlIXArAoVuDVSwusOcAotwyF +dGdGSzyFyFyFyFyFDVtVaxtOcaAoYlDVEEDVAohoqyGobaAouJTKfqcSlXAotwdG dGNiDVDVDVDVDVDVDVDVDVDVDVAoAotKAoAoAotKtKtKAoAoAoAoAoAoAoAotwdG dGAoAoAoAoAoAoAoAoAoAoAoAoAotwtwtwtwtwtwtwtwyFtwtwtwtwdGtwtwdGdG yFyFyFyFdGdGyFyFyFdGdGyFdGdGtwdGtwtwtwdGtwtwyFtwtwtwtwyFtwtwyFyF diff --git a/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm b/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm index 0892582f05..6e1679ab22 100644 --- a/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm +++ b/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm @@ -10,7 +10,7 @@ "cw" = (/obj/structure/closet/walllocker/emerglocker{dir = 1; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/ScienceShip) "da" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "estrella"; name = "interior access button"; pixel_y = 26},/obj/machinery/door/firedoor/border_only,/turf/simulated/shuttle/plating,/area/survivalpod/superpose/ScienceShip) "df" = (/obj/structure/closet/walllocker_double/medical/west,/obj/item/weapon/storage/firstaid,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/o2,/obj/item/roller,/obj/item/device/defib_kit/loaded,/turf/simulated/shuttle/floor/white,/area/survivalpod/superpose/ScienceShip) -"dh" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5},/obj/structure/table/bench/standard,/turf/simulated/shuttle/floor/white,/area/survivalpod/superpose/ScienceShip) +"dh" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5},/obj/structure/table/bench/standard,/obj/machinery/light{dir = 8},/turf/simulated/shuttle/floor/white,/area/survivalpod/superpose/ScienceShip) "dp" = (/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{dir = 8},/turf/simulated/floor/tiled/techfloor/grid,/area/survivalpod/superpose/ScienceShip) "dB" = (/obj/structure/closet/secure_closet/engineering_electrical{req_access = null},/obj/machinery/light{dir = 1},/obj/item/weapon/storage/belt/utility,/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/ScienceShip) "dS" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/ScienceShip) @@ -28,7 +28,7 @@ "hR" = (/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/ScienceShip) "iv" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/shuttle/floor/purple,/area/survivalpod/superpose/ScienceShip) "iQ" = (/obj/structure/table/wooden_reinforced,/obj/structure/flora/pottedplant/smallcactus{pixel_y = 13},/turf/simulated/floor/wood,/area/survivalpod/superpose/ScienceShip) -"je" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; icon_state = "map_vent_out"; use_power = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/ScienceShip) +"je" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; icon_state = "map_vent_out"; use_power = 1},/obj/structure/cryofeed,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/ScienceShip) "ju" = (/obj/structure/closet/walllocker/emerglocker{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/ScienceShip) "kl" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/shuttle/wall,/area/survivalpod/superpose/ScienceShip) "kw" = (/obj/structure/table,/obj/machinery/light{layer = 3},/obj/item/weapon/gun/projectile/revolver/toy/crossbow,/turf/simulated/floor/wood,/area/survivalpod/superpose/ScienceShip) @@ -72,7 +72,7 @@ "sY" = (/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/mask/breath,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/gloves/sterile/latex,/obj/item/weapon/storage/excavation,/obj/item/stack/flag/yellow,/obj/item/device/measuring_tape,/obj/item/weapon/pickaxe/drill,/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{dir = 8},/obj/item/weapon/material/knife/machete/hatchet,/turf/simulated/floor/tiled/techfloor/grid,/area/survivalpod/superpose/ScienceShip) "tb" = (/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{dir = 8},/obj/machinery/space_heater,/turf/simulated/floor/tiled/techfloor/grid,/area/survivalpod/superpose/ScienceShip) "te" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/ScienceShip) -"tg" = (/obj/machinery/r_n_d/server/core,/obj/machinery/light/small,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/ScienceShip) +"tg" = (/obj/machinery/light/small,/obj/structure/prop/fake_ai{name = "C0n71nu17y"},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/ScienceShip) "tu" = (/obj/machinery/atmospherics/pipe/manifold/hidden/yellow,/obj/structure/table/rack/shelf/steel,/obj/item/stack/material/glass/phoronrglass{amount = 20},/obj/item/stack/material/glass/phoronrglass{amount = 20},/obj/fiftyspawner/rods,/obj/fiftyspawner/rods,/turf/simulated/floor/tiled/techfloor/grid,/area/survivalpod/superpose/ScienceShip) "tN" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/ScienceShip) "tR" = (/obj/machinery/door/firedoor/glass,/obj/structure/table/reinforced,/obj/machinery/door/window/northright{dir = 4; name = "Medical booth"},/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/shuttle/floor/white,/area/survivalpod/superpose/ScienceShip) @@ -130,7 +130,7 @@ "GM" = (/obj/structure/table/bench/wooden,/obj/machinery/light{dir = 4},/obj/machinery/alarm/alarms_hidden{dir = 8; pixel_x = 22},/obj/item/device/flash,/turf/simulated/floor/wood,/area/survivalpod/superpose/ScienceShip) "GP" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/ScienceShip) "GU" = (/obj/machinery/sleep_console{dir = 4},/turf/simulated/shuttle/floor/white,/area/survivalpod/superpose/ScienceShip) -"HX" = (/obj/machinery/chem_master{pixel_x = -7},/obj/machinery/light{dir = 8},/turf/simulated/shuttle/floor/white,/area/survivalpod/superpose/ScienceShip) +"HX" = (/obj/machinery/chem_master{pixel_x = -7},/turf/simulated/shuttle/floor/white,/area/survivalpod/superpose/ScienceShip) "Ij" = (/obj/machinery/power/smes/buildable/hybrid,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/structure/cable/green,/obj/machinery/light{dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/shuttle/plating,/area/survivalpod/superpose/ScienceShip) "In" = (/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/ScienceShip) "Io" = (/obj/machinery/atmospherics/unary/freezer{icon_state = "freezer"},/turf/simulated/shuttle/floor/white,/area/survivalpod/superpose/ScienceShip) @@ -148,7 +148,7 @@ "Kh" = (/turf/simulated/floor/wood,/area/survivalpod/superpose/ScienceShip) "Kq" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/machinery/shower{dir = 1},/obj/structure/curtain/open/shower,/obj/random/soap,/turf/simulated/floor/plating,/area/survivalpod/superpose/ScienceShip) "Kx" = (/obj/screen/alert/highpressure,/turf/template_noop,/area/template_noop) -"KD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; external_pressure_bound_default = 0; icon_state = "map_vent_in"; initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; pressure_checks = 2; pressure_checks_default = 2; pump_direction = 0; use_power = 1},/obj/machinery/telecomms/relay/preset/ruskie,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/ScienceShip) +"KD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; external_pressure_bound_default = 0; icon_state = "map_vent_in"; initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; pressure_checks = 2; pressure_checks_default = 2; pump_direction = 0; use_power = 1},/obj/structure/cryofeed{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/ScienceShip) "Lj" = (/obj/structure/closet/walllocker_double/kitchen/north{dir = 8; name = "Ration Cabinet"; pixel_x = -32; pixel_y = 0},/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/device/radio{pixel_x = -5; pixel_y = 5},/obj/item/device/radio{pixel_x = 5; pixel_y = 5},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/ScienceShip) "Lx" = (/obj/structure/extinguisher_cabinet{pixel_x = 28},/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/ScienceShip) "LC" = (/obj/machinery/door/firedoor/glass,/obj/structure/shuttle/window,/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/shuttle/plating,/area/survivalpod/superpose/ScienceShip) @@ -198,7 +198,7 @@ "UZ" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1380; id_tag = "estrella_pump"},/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "estrella_sensor"; pixel_y = -28},/turf/simulated/shuttle/plating,/area/survivalpod/superpose/ScienceShip) "VB" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/ScienceShip) "VE" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/ScienceShip) -"VH" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/computer/rdservercontrol,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/ScienceShip) +"VH" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/computer/crew,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/ScienceShip) "VJ" = (/obj/structure/table/steel_reinforced,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance,/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/machinery/alarm/alarms_hidden{dir = 8; pixel_x = 22},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/ScienceShip) "VS" = (/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/binary/passive_gate{dir = 1; regulate_mode = 0; unlocked = 1},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/ScienceShip) "VT" = (/obj/machinery/door/airlock/multi_tile/metal/mait{dir = 1; frequency = 1380; icon_state = "door_locked"; id_tag = "estrella_inner"; locked = 1; name = "Internal Access"},/obj/machinery/atmospherics/pipe/simple/visible{dir = 5},/obj/machinery/door/firedoor/border_only,/turf/simulated/shuttle/plating,/area/survivalpod/superpose/ScienceShip) diff --git a/modular_chomp/maps/submaps/shelters/SmallCombatShip-9x11.dmm b/modular_chomp/maps/submaps/shelters/SmallCombatShip-9x11.dmm index 306d67d9b4..c6622c0346 100644 --- a/modular_chomp/maps/submaps/shelters/SmallCombatShip-9x11.dmm +++ b/modular_chomp/maps/submaps/shelters/SmallCombatShip-9x11.dmm @@ -24,7 +24,7 @@ "Q" = (/obj/machinery/disperser/back{dir = 1},/obj/structure/ship_munition/disperser_charge/explosive,/turf/simulated/wall/rshull,/area/survivalpod/superpose/SmallCombatShip) "U" = (/obj/structure/bed/chair/bay/comfy/red{dir = 1},/obj/machinery/door/window/survival_pod{dir = 2},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/SmallCombatShip) "W" = (/obj/structure/window/plastitanium/full,/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/grille/rustic{health = 25; name = "reinforced grille"},/obj/machinery/door/blast/regular/open{dir = 4; id = "stargazer_blast"; name = "window blast shield"},/turf/simulated/shuttle/plating,/area/survivalpod/superpose/SmallCombatShip) -"X" = (/obj/structure/fans/hardlight/colorable{color = "red"},/obj/machinery/door/airlock/hatch{icon_state = "door_locked"; id_tag = null; locked = 1; req_access = list(11)},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/SmallCombatShip) +"X" = (/obj/structure/fans/hardlight/colorable{color = "red"},/obj/machinery/door/airlock/hatch{req_one_access = null},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/SmallCombatShip) "Y" = (/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/SmallCombatShip) "Z" = (/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/steel,/obj/fiftyspawner/steel,/obj/fiftyspawner/steel,/obj/fiftyspawner/steel,/obj/fiftyspawner/steel,/obj/fiftyspawner/plastic,/obj/fiftyspawner/plastic,/obj/fiftyspawner/plastic,/obj/fiftyspawner/plastic,/obj/fiftyspawner/plastic,/obj/structure/table/rack/shelf/steel,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/SmallCombatShip) diff --git a/modular_chomp/maps/submaps/shelters/TinyCombatShip-9x7.dmm b/modular_chomp/maps/submaps/shelters/TinyCombatShip-9x7.dmm index 745d35b9ca..ba8f5cb0c7 100644 --- a/modular_chomp/maps/submaps/shelters/TinyCombatShip-9x7.dmm +++ b/modular_chomp/maps/submaps/shelters/TinyCombatShip-9x7.dmm @@ -1,7 +1,7 @@ "a" = (/turf/template_noop,/area/template_noop) "b" = (/obj/machinery/disperser/front{dir = 1},/turf/template_noop,/area/template_noop) "c" = (/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/TinyCombatShip) -"f" = (/obj/structure/fans/hardlight/colorable{color = "red"},/obj/machinery/door/airlock/hatch{icon_state = "door_locked"; id_tag = null; locked = 1; req_access = list(11)},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/TinyCombatShip) +"f" = (/obj/structure/fans/hardlight/colorable{color = "red"},/obj/machinery/door/airlock/hatch{req_one_access = null},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/TinyCombatShip) "h" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/shuttle/engine/heater,/turf/simulated/floor/plating/external,/area/survivalpod/superpose/TinyCombatShip) "j" = (/obj/structure/salvageable/machine,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/TinyCombatShip) "k" = (/turf/simulated/wall/rshull,/area/survivalpod/superpose/TinyCombatShip)