From 39a4fe373b7986fb59f4b883412193829d3270bc Mon Sep 17 00:00:00 2001 From: LordNest Date: Sun, 19 Nov 2023 20:56:34 +0400 Subject: [PATCH] Armory fix --- mods/_antagonists/maps/ert_base.dmm | 1221 ++++++++--------- mods/_master_files/code/game/gamemodes/ert.dm | 90 +- 2 files changed, 603 insertions(+), 708 deletions(-) diff --git a/mods/_antagonists/maps/ert_base.dmm b/mods/_antagonists/maps/ert_base.dmm index 09c2330acab5e..a2923c90de81f 100644 --- a/mods/_antagonists/maps/ert_base.dmm +++ b/mods/_antagonists/maps/ert_base.dmm @@ -7,11 +7,13 @@ }, /area/map_template/rescue_base/base) "ac" = ( -/obj/machinery/computer/shuttle_control/lift/armorysecond, -/turf/unsimulated/floor{ - icon_state = "wood"; - name = "plating" +/obj/structure/window/reinforced/crescent{ + dir = 4 }, +/obj/structure/window/reinforced/crescent, +/obj/structure/table/rack, +/obj/item/rig/ert/janitor, +/turf/unsimulated/floor/techfloor, /area/map_template/rescue_base/base) "ad" = ( /turf/unsimulated/wall, @@ -79,13 +81,17 @@ }, /area/map_template/rescue_base/base) "an" = ( +/obj/item/ammo_magazine/n10mm, +/obj/item/ammo_magazine/n10mm, +/obj/item/ammo_magazine/n10mm, +/obj/item/ammo_magazine/n10mm, +/obj/item/ammo_magazine/n10mm, +/obj/item/ammo_magazine/n10mm, /obj/structure/table/rack, -/obj/item/rig/ert/medical, -/obj/structure/window/reinforced/crescent{ - dir = 1 +/turf/unsimulated/floor/techfloor{ + icon_state = "techfloor_grid" }, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "ao" = ( /turf/unsimulated/floor{ dir = 8; @@ -93,17 +99,14 @@ }, /area/map_template/rescue_base/base) "ap" = ( -/obj/item/ammo_magazine/n10mm, -/obj/item/ammo_magazine/n10mm, -/obj/item/ammo_magazine/n10mm, -/obj/item/ammo_magazine/n10mm, -/obj/item/ammo_magazine/n10mm, -/obj/item/ammo_magazine/n10mm, +/obj/structure/window/reinforced/crescent, /obj/structure/table/rack, -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" +/obj/item/rig/ert/engineer, +/obj/structure/window/reinforced/crescent{ + dir = 4 }, -/area/map_template/rescue_base/turbolift/armoryheavy) +/turf/unsimulated/floor/techfloor, +/area/map_template/rescue_base/base) "aq" = ( /obj/structure/table/steel_reinforced, /obj/item/device/taperecorder, @@ -173,7 +176,8 @@ /obj/machinery/door/blast/regular{ id_tag = "rescuegarage"; name = "Garage Exit"; - dir = 4 + dir = 4; + health_max = 50000 }, /turf/unsimulated/floor{ icon_state = "dark" @@ -212,11 +216,14 @@ }, /area/map_template/rescue_base/base) "aF" = ( -/obj/structure/window/reinforced/crescent, /obj/structure/table/rack, -/obj/item/rig/ert/engineer, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas, +/obj/item/storage/box/emps, +/obj/item/storage/box/emps, +/obj/item/storage/box/frags, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "aG" = ( /obj/structure/table/rack, /obj/item/mech_equipment/mounted_system/extinguisher{ @@ -257,11 +264,17 @@ /area/map_template/rescue_base/base) "aJ" = ( /obj/structure/table/rack, -/obj/item/storage/box/smokes, -/obj/item/storage/box/smokes, -/obj/item/storage/box/flashbangs, +/obj/item/rig_module/mounted/energy/taser, +/obj/item/rig_module/vision/nvg, +/obj/item/rig_module/device/flash, +/obj/structure/window/reinforced/crescent{ + dir = 4 + }, +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "aK" = ( /obj/structure/mopbucket, /obj/item/mop, @@ -343,7 +356,8 @@ /obj/machinery/door/blast/regular{ id_tag = "standardrescue"; name = "Heavy Equipment"; - dir = 4 + dir = 4; + health_max = 50000 }, /turf/unsimulated/floor{ icon_state = "dark" @@ -368,16 +382,6 @@ icon_state = "dark" }, /area/map_template/rescue_base/base) -"aW" = ( -/obj/structure/table/rack, -/obj/item/gun/projectile/automatic/bullpup_rifle, -/obj/item/gun/projectile/automatic/bullpup_rifle{ - pixel_y = 10 - }, -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" - }, -/area/map_template/rescue_base/turbolift/armoryheavy) "aX" = ( /obj/machinery/door/airlock/centcom{ name = "Processing" @@ -387,15 +391,24 @@ }, /area/map_template/rescue_base/base) "aY" = ( -/obj/item/gun/projectile/automatic/nt41, -/obj/item/gun/projectile/automatic/nt41{ - pixel_y = 8 - }, /obj/structure/table/rack, +/obj/item/gun/energy/pulse_rifle{ + pixel_y = -11 + }, +/obj/item/gun/energy/pulse_rifle{ + pixel_y = -5 + }, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle{ + pixel_y = 5 + }, +/obj/item/gun/energy/pulse_rifle{ + pixel_y = 10 + }, /turf/unsimulated/floor/techfloor{ icon_state = "techfloor_grid" }, -/area/map_template/rescue_base/turbolift/armoryheavy) +/area/map_template/rescue_base/base) "aZ" = ( /obj/floor_decal/corner/blue/diagonal, /turf/unsimulated/floor{ @@ -445,23 +458,6 @@ icon_state = "dark" }, /area/map_template/rescue_base/base) -"bf" = ( -/obj/structure/table/rack, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/chem_dispenser/injector, -/obj/item/rig_module/chem_dispenser/injector, -/obj/item/rig_module/device/healthscanner, -/obj/item/rig_module/device/healthscanner, -/obj/item/rig_module/vision/medhud, -/obj/item/rig_module/vision/medhud, -/obj/structure/window/reinforced/crescent{ - dir = 1 - }, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) "bg" = ( /obj/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor{ @@ -476,22 +472,6 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"bi" = ( -/obj/structure/table/rack, -/obj/item/clothing/head/helmet/ablative, -/obj/item/clothing/head/helmet/ablative, -/obj/item/clothing/head/helmet/ablative, -/obj/item/clothing/head/helmet/ablative, -/obj/item/clothing/head/helmet/ablative, -/obj/item/clothing/head/helmet/ablative, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/suit/armor/laserproof, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) "bj" = ( /obj/structure/bed, /obj/item/bedsheet/orange, @@ -549,7 +529,7 @@ /obj/structure/table/rack, /obj/item/rig/ert/janitor, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "bs" = ( /turf/unsimulated/floor{ dir = 9; @@ -648,44 +628,27 @@ }, /turf/unsimulated/floor/techfloor, /area/map_template/rescue_base/base) -"bD" = ( -/obj/structure/table/rack, -/obj/item/gun/energy/pulse_rifle{ - pixel_y = -11 - }, -/obj/item/gun/energy/pulse_rifle{ - pixel_y = -5 - }, -/obj/item/gun/energy/pulse_rifle, -/obj/item/gun/energy/pulse_rifle{ - pixel_y = 5 - }, -/obj/item/gun/energy/pulse_rifle{ - pixel_y = 10 - }, -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" - }, -/area/map_template/rescue_base/turbolift/armoryheavy) "bF" = ( /obj/machinery/door/blast/regular{ id_tag = "heavyrescue"; name = "Combat Exosuit"; - dir = 4 + dir = 4; + health_max = 100000 }, /turf/unsimulated/floor/techfloor{ icon_state = "techfloor_grid" }, /area/map_template/rescue_base/base) "bG" = ( -/obj/structure/window/reinforced/crescent{ - dir = 4 - }, -/obj/structure/window/reinforced/crescent, /obj/structure/table/rack, -/obj/item/rig/ert/janitor, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/obj/item/ammo_magazine/box/machinegun, +/obj/item/ammo_magazine/box/machinegun, +/obj/item/ammo_magazine/box/machinegun, +/obj/item/ammo_magazine/box/machinegun, +/turf/unsimulated/floor/techfloor{ + icon_state = "techfloor_grid" + }, +/area/map_template/rescue_base/base) "bH" = ( /obj/item/stool, /turf/unsimulated/floor{ @@ -702,26 +665,22 @@ /area/map_template/rescue_base/base) "bJ" = ( /obj/structure/table/rack, -/obj/item/ammo_magazine/box/machinegun, -/obj/item/ammo_magazine/box/machinegun, -/obj/item/ammo_magazine/box/machinegun, -/obj/item/ammo_magazine/box/machinegun, +/obj/item/gun/projectile/automatic/bullpup_rifle, +/obj/item/gun/projectile/automatic/bullpup_rifle{ + pixel_y = 10 + }, /turf/unsimulated/floor/techfloor{ icon_state = "techfloor_grid" }, -/area/map_template/rescue_base/turbolift/armoryheavy) +/area/map_template/rescue_base/base) "bK" = ( /obj/structure/table/rack, -/obj/item/storage/box/ammo/stunshells, -/obj/item/storage/box/ammo/stunshells, -/obj/item/storage/box/ammo/beanbags, -/obj/item/storage/box/ammo/beanbags, -/obj/item/storage/box/ammo/shotgunammo, -/obj/item/storage/box/ammo/shotgunammo, -/obj/item/storage/box/ammo/shotgunshells, -/obj/item/storage/box/ammo/shotgunshells, +/obj/item/rig/ert/security, +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "bM" = ( /obj/structure/bed, /turf/unsimulated/floor{ @@ -748,25 +707,18 @@ }, /area/map_template/rescue_base/base) "bP" = ( -/obj/structure/window/reinforced/crescent, /obj/structure/table/rack, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/mounted/energy/plasmacutter, -/obj/item/rig_module/mounted/energy/plasmacutter, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/vision/meson, -/obj/item/rig_module/vision/meson, -/obj/structure/window/reinforced/crescent{ - dir = 8 - }, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "bQ" = ( /obj/machinery/door/airlock/centcom{ name = "Spec Ops Cryo Storage"; @@ -798,7 +750,8 @@ /obj/machinery/door/blast/regular{ id_tag = "heavyrescue"; name = "Restricted Equipment"; - dir = 4 + dir = 4; + health_max = 100000 }, /turf/simulated/floor/plating, /area/map_template/rescue_base/base) @@ -1049,7 +1002,20 @@ }, /area/map_template/rescue_base/base) "cp" = ( -/turf/simulated/floor/plating, +/obj/structure/table/rack, +/obj/item/clothing/head/helmet/ballistic, +/obj/item/clothing/head/helmet/ballistic, +/obj/item/clothing/head/helmet/ballistic, +/obj/item/clothing/head/helmet/ballistic, +/obj/item/clothing/head/helmet/ballistic, +/obj/item/clothing/head/helmet/ballistic, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof, +/turf/unsimulated/floor/techfloor, /area/map_template/rescue_base/base) "cq" = ( /obj/machinery/button/blast_door{ @@ -1072,24 +1038,11 @@ /area/map_template/rescue_base/base) "cs" = ( /obj/structure/table/rack, -/obj/item/storage/box/teargas, -/obj/item/storage/box/teargas, -/obj/item/storage/box/emps, -/obj/item/storage/box/emps, -/obj/item/storage/box/frags, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) -"ct" = ( -/obj/structure/table/rack, -/obj/item/rig/ert/security, -/obj/structure/window/reinforced/crescent{ - dir = 1 - }, -/obj/structure/window/reinforced/crescent{ - dir = 8 +/obj/item/rig/ert/assetprotection, +/turf/unsimulated/floor/techfloor{ + icon_state = "techfloor_grid" }, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "cu" = ( /obj/item/device/radio/intercom/specops{ dir = 1; @@ -1169,17 +1122,21 @@ /area/map_template/rescue_base/base) "cz" = ( /obj/structure/table/rack, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, +/obj/item/rig_module/mounted/energy/taser, +/obj/item/rig_module/mounted/energy/taser, +/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/chem_dispenser/injector, +/obj/item/rig_module/chem_dispenser/injector, +/obj/item/rig_module/device/healthscanner, +/obj/item/rig_module/device/healthscanner, +/obj/item/rig_module/vision/medhud, +/obj/item/rig_module/vision/medhud, +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "cA" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -1470,33 +1427,16 @@ /area/map_template/rescue_base/base) "cZ" = ( /obj/structure/table/rack, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/vision/nvg, -/obj/item/rig_module/device/flash, -/obj/structure/window/reinforced/crescent{ - dir = 4 - }, -/obj/structure/window/reinforced/crescent{ - dir = 1 - }, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) -"da" = ( -/obj/structure/table/rack, -/obj/item/clothing/head/helmet/ballistic, -/obj/item/clothing/head/helmet/ballistic, -/obj/item/clothing/head/helmet/ballistic, -/obj/item/clothing/head/helmet/ballistic, -/obj/item/clothing/head/helmet/ballistic, -/obj/item/clothing/head/helmet/ballistic, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, +/obj/item/storage/box/ammo/stunshells, +/obj/item/storage/box/ammo/stunshells, +/obj/item/storage/box/ammo/beanbags, +/obj/item/storage/box/ammo/beanbags, +/obj/item/storage/box/ammo/shotgunammo, +/obj/item/storage/box/ammo/shotgunammo, +/obj/item/storage/box/ammo/shotgunshells, +/obj/item/storage/box/ammo/shotgunshells, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "dc" = ( /obj/machinery/acting/changer, /turf/unsimulated/floor{ @@ -1520,11 +1460,15 @@ /area/map_template/rescue_base/base) "dg" = ( /obj/structure/table/rack, -/obj/item/gun/energy/sniperrifle, -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" +/obj/item/rig/ert/security, +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, +/obj/structure/window/reinforced/crescent{ + dir = 8 }, -/area/map_template/rescue_base/turbolift/armoryheavy) +/turf/unsimulated/floor/techfloor, +/area/map_template/rescue_base/base) "dh" = ( /obj/machinery/mech_recharger, /mob/living/exosuit/premade/powerloader, @@ -1554,21 +1498,12 @@ icon_state = "dark" }, /area/map_template/rescue_base/base) -"dn" = ( -/obj/structure/table/rack, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) "do" = ( /obj/machinery/door/blast/regular{ id_tag = "teleporter"; name = "Emergency Insertion"; - dir = 4 + dir = 4; + health_max = 50000 }, /turf/unsimulated/floor{ icon_state = "dark" @@ -1646,22 +1581,17 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"dw" = ( -/obj/structure/window/reinforced/crescent, +"dx" = ( /obj/structure/table/rack, -/obj/item/rig/ert/engineer, +/obj/item/rig/ert, /obj/structure/window/reinforced/crescent{ - dir = 4 + dir = 8 }, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) -"dx" = ( -/obj/structure/table/rack, -/obj/item/gun/projectile/automatic/l6_saw, -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" +/obj/structure/window/reinforced/crescent{ + dir = 1 }, -/area/map_template/rescue_base/turbolift/armoryheavy) +/turf/unsimulated/floor/techfloor, +/area/map_template/rescue_base/base) "dy" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -1829,10 +1759,25 @@ }, /area/map_template/rescue_base/base) "dV" = ( +/obj/structure/window/reinforced/crescent, /obj/structure/table/rack, -/obj/item/gun/launcher/grenade, +/obj/item/rig_module/mounted/energy/taser, +/obj/item/rig_module/mounted/energy/taser, +/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/device/drill, +/obj/item/rig_module/device/drill, +/obj/item/rig_module/mounted/energy/plasmacutter, +/obj/item/rig_module/mounted/energy/plasmacutter, +/obj/item/rig_module/device/rcd, +/obj/item/rig_module/device/rcd, +/obj/item/rig_module/vision/meson, +/obj/item/rig_module/vision/meson, +/obj/structure/window/reinforced/crescent{ + dir = 8 + }, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "dW" = ( /obj/structure/reagent_dispensers/watertank, /turf/unsimulated/floor{ @@ -1875,15 +1820,11 @@ /area/map_template/rescue_base/base) "ed" = ( /obj/structure/table/rack, -/obj/item/rig/ert/medical, -/obj/structure/window/reinforced/crescent{ - dir = 1 - }, -/obj/structure/window/reinforced/crescent{ - dir = 8 +/obj/item/gun/projectile/automatic/l6_saw, +/turf/unsimulated/floor/techfloor{ + icon_state = "techfloor_grid" }, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "ee" = ( /obj/machinery/door/airlock/centcom{ name = "Storage"; @@ -1975,37 +1916,17 @@ icon_state = "techfloor_grid" }, /area/map_template/rescue_base/base) -"eq" = ( +"et" = ( /obj/structure/table/rack, -/obj/item/rig/ert, -/obj/structure/window/reinforced/crescent{ - dir = 8 - }, +/obj/item/rig/ert/medical, /obj/structure/window/reinforced/crescent{ dir = 1 }, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) -"et" = ( -/obj/structure/table/rack, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/mounted/energy/egun, -/obj/item/rig_module/mounted/energy/egun, -/obj/item/rig_module/chem_dispenser/combat, -/obj/item/rig_module/chem_dispenser/combat, -/obj/item/rig_module/grenade_launcher, -/obj/item/rig_module/vision/sechud, -/obj/item/rig_module/vision/sechud, -/obj/item/rig_module/device/flash, -/obj/item/rig_module/device/flash, /obj/structure/window/reinforced/crescent{ - dir = 1 + dir = 8 }, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "eu" = ( /obj/machinery/power/emitter, /turf/unsimulated/floor{ @@ -2286,13 +2207,12 @@ }, /area/map_template/rescue_base/base) "eK" = ( -/obj/structure/table/rack, -/obj/item/rig/ert/security, -/obj/structure/window/reinforced/crescent{ - dir = 1 +/mob/living/exosuit/premade/heavy, +/obj/machinery/mech_recharger, +/turf/unsimulated/floor/techfloor{ + icon_state = "techfloor_grid" }, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "eM" = ( /obj/machinery/suit_storage_unit/engineering, /turf/unsimulated/floor{ @@ -2316,10 +2236,11 @@ /turf/unsimulated/floor/techfloor, /area/map_template/rescue_base/base) "eQ" = ( -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" - }, -/area/map_template/rescue_base/outer) +/obj/structure/table/rack, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/turf/unsimulated/floor/techfloor, +/area/map_template/rescue_base/base) "eR" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/porta_turret/crescent, @@ -2327,10 +2248,12 @@ /area/map_template/rescue_base/base) "eS" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/rig/ert/medical, +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "eT" = ( /obj/machinery/light{ dir = 8 @@ -2612,17 +2535,9 @@ /turf/simulated/floor/plating, /area/map_template/rescue_base/start) "fB" = ( -/obj/structure/table/rack, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" - }, -/area/map_template/rescue_base/turbolift/armoryheavy) +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/unsimulated/floor/techfloor, +/area/map_template/rescue_base/base) "fC" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/head/solgov/dress/fleet/command, @@ -2642,13 +2557,12 @@ /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "fF" = ( -/obj/machinery/atmospherics/unary/tank/air{ - dir = 4; - start_pressure = 740.5 - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "fG" = ( @@ -2733,9 +2647,9 @@ /turf/simulated/floor/tiled/white, /area/map_template/rescue_base/start) "fQ" = ( -/obj/structure/table/rack, -/obj/item/tank/oxygen_emergency_double, -/obj/item/tank/oxygen_emergency_double, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "fS" = ( @@ -2922,7 +2836,9 @@ /turf/simulated/floor/tiled/white, /area/map_template/rescue_base/start) "gx" = ( -/turf/simulated/floor/reinforced, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "gy" = ( /obj/structure/table/steel_reinforced, @@ -3092,7 +3008,8 @@ }, /obj/machinery/door/blast/regular{ id_tag = "standardrescue"; - name = "Garage" + name = "Garage"; + health_max = 50000 }, /turf/unsimulated/floor{ icon_state = "dark" @@ -3140,9 +3057,11 @@ /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "gZ" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/obj/structure/table/rack, +/turf/unsimulated/floor/techfloor{ + icon_state = "techfloor_grid" + }, +/area/map_template/rescue_base/base) "ha" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3239,36 +3158,45 @@ /area/map_template/rescue_base/base) "iC" = ( /obj/structure/table/rack, -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" - }, -/area/map_template/rescue_base/outer) +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, +/obj/item/storage/box/flashbangs, +/turf/unsimulated/floor/techfloor, +/area/map_template/rescue_base/base) "lE" = ( /obj/structure/shuttle/engine/propulsion, /turf/space, /area/map_template/rescue_base/start) "nZ" = ( -/obj/shuttle_landmark/lift/armoryheavy_bottom, -/turf/simulated/floor/plating, -/area/map_template/rescue_base/base) -"oT" = ( /turf/unsimulated/floor/techfloor{ icon_state = "techfloor_grid" }, -/area/map_template/rescue_base/turbolift/armoryheavy) -"pk" = ( -/mob/living/exosuit/premade/heavy, -/obj/machinery/mech_recharger, +/area/map_template/rescue_base/base) +"oT" = ( +/obj/structure/table/rack, +/obj/item/ammo_magazine/mil_rifle/heavy, +/obj/item/ammo_magazine/mil_rifle/heavy, +/obj/item/ammo_magazine/mil_rifle/heavy, +/obj/item/ammo_magazine/mil_rifle/heavy, +/obj/item/ammo_magazine/mil_rifle/heavy, +/obj/item/ammo_magazine/mil_rifle/heavy, /turf/unsimulated/floor/techfloor{ icon_state = "techfloor_grid" }, -/area/map_template/rescue_base/outer) +/area/map_template/rescue_base/base) +"ua" = ( +/obj/structure/table/rack, +/obj/item/tank/oxygen_emergency_double, +/obj/item/tank/oxygen_emergency_double, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) "uV" = ( -/obj/shuttle_landmark/lift/armoryheavy_top, -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" - }, -/area/map_template/rescue_base/turbolift/armoryheavy) +/obj/structure/window/reinforced/crescent, +/obj/structure/table/rack, +/obj/item/rig/ert/engineer, +/turf/unsimulated/floor/techfloor, +/area/map_template/rescue_base/base) "xK" = ( /obj/machinery/door/airlock/centcom{ name = "Security Armory"; @@ -3279,8 +3207,21 @@ }, /area/map_template/rescue_base/base) "yR" = ( -/turf/unsimulated/wall, -/area/map_template/rescue_base/outer) +/obj/structure/table/rack, +/obj/item/clothing/head/helmet/ablative, +/obj/item/clothing/head/helmet/ablative, +/obj/item/clothing/head/helmet/ablative, +/obj/item/clothing/head/helmet/ablative, +/obj/item/clothing/head/helmet/ablative, +/obj/item/clothing/head/helmet/ablative, +/obj/item/clothing/suit/armor/laserproof, +/obj/item/clothing/suit/armor/laserproof, +/obj/item/clothing/suit/armor/laserproof, +/obj/item/clothing/suit/armor/laserproof, +/obj/item/clothing/suit/armor/laserproof, +/obj/item/clothing/suit/armor/laserproof, +/turf/unsimulated/floor/techfloor, +/area/map_template/rescue_base/base) "zS" = ( /obj/machinery/door/airlock/centcom{ name = "Infirmary"; @@ -3290,26 +3231,55 @@ icon_state = "dark" }, /area/map_template/rescue_base/base) -"Cc" = ( -/obj/shuttle_landmark/lift/armorysecond_bottom, -/turf/simulated/floor/plating, -/area/map_template/rescue_base/base) -"Cm" = ( -/turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) -"Cz" = ( -/obj/structure/table/rack, -/obj/item/rig/ert/assetprotection, -/turf/unsimulated/floor/techfloor{ - icon_state = "techfloor_grid" - }, -/area/map_template/rescue_base/turbolift/armoryheavy) -"DF" = ( +"Bh" = ( /obj/structure/handrail{ - dir = 4 + dir = 1 }, -/obj/item/device/radio/intercom/hailing{ - dir = 4; +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"Cc" = ( +/obj/structure/table/rack, +/obj/item/rig_module/mounted/energy/taser, +/obj/item/rig_module/mounted/energy/taser, +/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/mounted/energy/egun, +/obj/item/rig_module/mounted/energy/egun, +/obj/item/rig_module/chem_dispenser/combat, +/obj/item/rig_module/chem_dispenser/combat, +/obj/item/rig_module/grenade_launcher, +/obj/item/rig_module/vision/sechud, +/obj/item/rig_module/vision/sechud, +/obj/item/rig_module/device/flash, +/obj/item/rig_module/device/flash, +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, +/turf/unsimulated/floor/techfloor, +/area/map_template/rescue_base/base) +"Cm" = ( +/obj/structure/table/rack, +/obj/item/gun/energy/sniperrifle, +/turf/unsimulated/floor/techfloor{ + icon_state = "techfloor_grid" + }, +/area/map_template/rescue_base/base) +"Cz" = ( +/obj/item/gun/projectile/automatic/nt41, +/obj/item/gun/projectile/automatic/nt41{ + pixel_y = 8 + }, +/obj/structure/table/rack, +/turf/unsimulated/floor/techfloor{ + icon_state = "techfloor_grid" + }, +/area/map_template/rescue_base/base) +"DF" = ( +/obj/structure/handrail{ + dir = 4 + }, +/obj/item/device/radio/intercom/hailing{ + dir = 4; pixel_x = -24; pixel_y = -10 }, @@ -3337,9 +3307,15 @@ /turf/simulated/floor/plating, /area/map_template/rescue_base/start) "GI" = ( -/obj/shuttle_landmark/lift/armorysecond_top, +/obj/structure/table/rack, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, /turf/unsimulated/floor/techfloor, -/area/map_template/rescue_base/turbolift/armorysecond) +/area/map_template/rescue_base/base) "JH" = ( /obj/machinery/door/airlock/centcom{ name = "EVA"; @@ -3350,12 +3326,17 @@ }, /area/map_template/rescue_base/base) "Wi" = ( -/obj/machinery/computer/shuttle_control/lift/armoryheavy, -/turf/unsimulated/floor{ - icon_state = "wood"; - name = "plating" - }, +/obj/structure/table/rack, +/obj/item/gun/launcher/grenade, +/turf/unsimulated/floor/techfloor, /area/map_template/rescue_base/base) +"ZT" = ( +/obj/machinery/atmospherics/unary/tank/air{ + dir = 4; + start_pressure = 740.5 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) (1,1,1) = {" ad @@ -3424,8 +3405,8 @@ ew (2,1,1) = {" ad bd -Wi -ac +de +de de de de @@ -4423,7 +4404,7 @@ bB bB bB bB -gx +eU eU gh gp @@ -4485,9 +4466,9 @@ bB bB bB bB -gx -gx -gx +eU +fJ +eU eU gi fn @@ -4547,11 +4528,11 @@ bB bB bB bB -gx -gx -gx -gx -gx +eU +eU +eU +fM +ua eU gj gq @@ -4613,9 +4594,9 @@ gz eU eU eU -fJ -fJ -fJ +ZT +fn +Bh eU eU eU @@ -4678,8 +4659,8 @@ DF ft eU fF -fM -fQ +fn +fn fW fx gN @@ -4869,9 +4850,9 @@ gt fq fw eU -fI -fN -fN +fQ +fn +fn fY eU gL @@ -4905,13 +4886,13 @@ bg ao ao ad -cp -cp -cp -Cc -cp -cp -cp +et +bB +bB +bB +bB +bB +cZ ad ad aA @@ -4933,9 +4914,9 @@ fl eU eU eU -fJ -fJ -fJ +fI +fn +Bh eU eU eU @@ -4969,13 +4950,13 @@ bg ao ao ad -cp -cp -cp -cp -cp -cp -cp +eS +bB +bB +GI +bB +bB +eQ ad cq ao @@ -4995,10 +4976,10 @@ bB bB bB bB -gx -gx -gx -gx +eU +eU +eU +fN gx eU gm @@ -5033,13 +5014,13 @@ xK ao ao ad -cp -cp -cp -cp -cp -cp -cp +cz +bB +bB +dV +bB +bB +aF ad dh ao @@ -5061,9 +5042,9 @@ bB bB bB bB -gx -gx -gx +eU +fJ +eU eU fh eZ @@ -5097,13 +5078,13 @@ bg ao ao ad -cp -cp -cp -cp -cp -cp -cp +dg +bB +bB +uV +bB +bB +iC ad ab ao @@ -5127,7 +5108,7 @@ bB bB bB bB -gx +eU eU gn gA @@ -5161,13 +5142,13 @@ bg ao ao ad -cp -cp -cp -cp -cp -cp -cp +bK +bB +bB +ap +bB +bB +Wi ad aU ar @@ -5225,13 +5206,13 @@ ad ao ao ad -cp -cp -cp -cp -cp -cp -cp +Cc +bB +bB +bB +bB +bB +bP ad ar ar @@ -5289,13 +5270,13 @@ ao ao ao ad -cp -cp -cp -cp -cp -cp -cp +dx +bB +bB +bB +bB +bB +bB ad ad ad @@ -5353,18 +5334,18 @@ ao ao ao ad -cp -cp -cp -cp -cp -cp +aJ +bB +br +ac +fB +yR cp ad -cp -cp -cp -cp +eK +nZ +nZ +nZ ad ew ew @@ -5425,10 +5406,10 @@ ad ad ad ad -cp -cp -cp -cp +gZ +nZ +nZ +nZ ad ew ew @@ -5481,14 +5462,14 @@ ar ar ar ad -cp +Cm nZ -cp -cp -cp -cp -cp -ad +cs +cs +cs +cs +cs +ad ad ad ad @@ -5545,13 +5526,13 @@ ar ar ar ad -cp -cp -cp -cp -cp -cp -cp +nZ +nZ +nZ +nZ +nZ +nZ +nZ ad ew ew @@ -5609,13 +5590,13 @@ ar ar ar ad -cp -cp -cp -cp -cp -cp -cp +nZ +nZ +nZ +nZ +nZ +nZ +nZ ad ew ew @@ -5625,21 +5606,21 @@ ew ew ew ew -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew @@ -5673,13 +5654,13 @@ ar ar ar ad -cp -cp -cp -cp -cp -cp -cp +bG +ed +oT +bJ +an +Cz +aY ad ew ew @@ -5689,21 +5670,21 @@ ew ew ew ew -yR -ed -Cm -Cm -GI -Cm -Cm -bK -yR -yR -pk -eQ -eQ -eQ -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew @@ -5753,21 +5734,21 @@ ew ew ew ew -yR -an -Cm -Cm -dn -Cm -Cm -eS -yR -yR -iC -eQ -eQ -eQ -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew @@ -5817,21 +5798,21 @@ ew ew ew ew -yR -bf -Cm -Cm -bP -Cm -Cm -cs -yR -yR -yR -yR -yR -yR -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew @@ -5881,24 +5862,24 @@ ew ew ew ew -yR -ct -Cm -Cm -aF -Cm -Cm -aJ -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew @@ -5945,24 +5926,24 @@ ew ew ew ew -yR -eK -Cm -Cm -dw -Cm -Cm -dV -yR -yR -dg -uV -Cz -Cz -Cz -Cz -Cz -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew @@ -6009,24 +5990,24 @@ ew ew ew ew -yR -et -Cm -Cm -Cm -Cm -Cm -cz -yR -yR -oT -oT -oT -oT -oT -oT -oT -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew @@ -6073,24 +6054,24 @@ ew ew ew ew -yR -eq -Cm -Cm -Cm -Cm -Cm -Cm -yR -yR -oT -oT -oT -oT -oT -oT -oT -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew @@ -6137,24 +6118,24 @@ ew ew ew ew -yR -cZ -Cm -br -bG -gZ -bi -da -yR -yR -bJ -dx -fB -aW -ap -aY -bD -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew @@ -6201,24 +6182,24 @@ ew ew ew ew -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR -yR +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew +ew ew ew ew diff --git a/mods/_master_files/code/game/gamemodes/ert.dm b/mods/_master_files/code/game/gamemodes/ert.dm index f6586f28b5e41..c8d0ea2b104ef 100644 --- a/mods/_master_files/code/game/gamemodes/ert.dm +++ b/mods/_master_files/code/game/gamemodes/ert.dm @@ -3,10 +3,7 @@ prefix = "mods/_antagonists/maps/" suffixes = list("ert_base.dmm") shuttles_to_initialise = list( - /datum/shuttle/autodock/multi/antag/rescue, - /datum/shuttle/autodock/ferry/armorysecond, - /datum/shuttle/autodock/ferry/armoryheavy - ) + /datum/shuttle/autodock/multi/antag/rescue) apc_test_exempt_areas = list( /area/map_template/rescue_base = NO_SCRUBBER|NO_VENT|NO_APC ) @@ -48,72 +45,6 @@ landmark_tag = "nav_ert_dock" docking_controller = "rescue_shuttle_dock_airlock" -/datum/shuttle/autodock/ferry/armorysecond - name = "Second class equipment armory" - shuttle_area = /area/map_template/rescue_base/turbolift/armorysecond - warmup_time = 3 - waypoint_station = "nav_armorysecond_lift_top" - waypoint_offsite = "nav_armorysecond_lift_bottom" - sound_takeoff = 'sound/effects/lift_heavy_start.ogg' - sound_landing = 'sound/effects/lift_heavy_stop.ogg' - ceiling_type = null - knockdown = 0 - -/datum/shuttle/autodock/ferry/armoryheavy - name = "Restricted Equipment" - shuttle_area = /area/map_template/rescue_base/turbolift/armoryheavy - warmup_time = 3 - waypoint_station = "nav_armoryheavy_lift_top" - waypoint_offsite = "nav_armoryheavy_lift_bottom" - sound_takeoff = 'sound/effects/lift_heavy_start.ogg' - sound_landing = 'sound/effects/lift_heavy_stop.ogg' - ceiling_type = null - knockdown = 0 - -/obj/shuttle_landmark/lift/armorysecond_top - name = "Offbase Lift Location" - landmark_tag = "nav_armorysecond_lift_top" - base_area = /area/map_template/rescue_base/outer - base_turf = /turf/simulated/floor/plating - -/obj/shuttle_landmark/lift/armorysecond_bottom - name = "Armory on main ERT level" - landmark_tag = "nav_armorysecond_lift_bottom" - flags = SLANDMARK_FLAG_AUTOSET - base_area = /area/map_template/rescue_base/base - base_turf = /turf/simulated/floor/plating - -/obj/shuttle_landmark/lift/armoryheavy_top - name = "Offbase Lift Location" - landmark_tag = "nav_armoryheavy_lift_top" - base_area = /area/map_template/rescue_base/outer - base_turf = /turf/simulated/floor/plating - -/obj/shuttle_landmark/lift/armoryheavy_bottom - name = "Armory on main ERT level" - landmark_tag = "nav_armoryheavy_lift_bottom" - flags = SLANDMARK_FLAG_AUTOSET - base_area = /area/map_template/rescue_base/base - base_turf = /turf/simulated/floor/plating - -/obj/machinery/computer/shuttle_control/lift/armorysecond - name = "Second class equipment armory lift controls" - shuttle_tag = "Second class equipment armory" - ui_template = "shuttle_control_console_lift.tmpl" - icon_state = "tiny" - icon_keyboard = "tiny_keyboard" - icon_screen = "lift" - density = FALSE - -/obj/machinery/computer/shuttle_control/lift/armoryheavy - name = "Restricted Equipment controls" - shuttle_tag = "Restricted Equipment" - ui_template = "shuttle_control_console_lift.tmpl" - icon_state = "tiny" - icon_keyboard = "tiny_keyboard" - icon_screen = "lift" - density = FALSE - // Areas /area/map_template/rescue_base @@ -128,27 +59,10 @@ icon_state = "yellow" dynamic_lighting = 0 -/area/map_template/rescue_base/outer - name = "\improper Barracks" - icon_state = "yellow" - dynamic_lighting = 0 - /area/map_template/rescue_base/start name = "\improper Response Team Base" icon_state = "shuttlered" - base_turf = /turf/unsimulated/floor/reinforced - -/area/map_template/rescue_base/turbolift/armorysecond - name = "ERT - Armory lift" - icon_state = "shuttle3" - dynamic_lighting = 0 - base_turf = /turf/simulated/floor/plating - -/area/map_template/rescue_base/turbolift/armoryheavy - name = "ERT - Armory lift" - icon_state = "shuttle3" - dynamic_lighting = 0 - base_turf = /turf/simulated/floor/plating + base_turf = /turf/unsimulated/floor/techfloor //Objects