From ec3009017b7b8dd8562d7eca221d963ace057346 Mon Sep 17 00:00:00 2001 From: Nut2 Date: Sun, 16 Jul 2023 04:51:07 -0500 Subject: [PATCH 1/3] Update deck4.dmm --- maps/triumph/levels/deck4.dmm | 1194 +++++++++++++++++++++++++++++---- 1 file changed, 1062 insertions(+), 132 deletions(-) diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index ffde4d85dd1..444584f0b56 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -2469,6 +2469,7 @@ /obj/machinery/recharger/wallcharger{ pixel_x = -22 }, +/obj/machinery/camera/network/security, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "bVh" = ( @@ -2529,6 +2530,9 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "bWp" = ( @@ -4923,6 +4927,9 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "dOp" = ( @@ -5032,6 +5039,24 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, +/obj/item/cell/device/weapon{ + pixel_x = 3 + }, +/obj/item/cell/device/weapon{ + pixel_x = 3 + }, +/obj/item/cell/device/weapon{ + pixel_x = 3 + }, +/obj/item/cell/device/weapon{ + pixel_x = 3 + }, +/obj/item/cell/device/weapon{ + pixel_x = 3 + }, +/obj/item/cell/device/weapon{ + pixel_x = 3 + }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "dSN" = ( @@ -6192,6 +6217,94 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) +"eGF" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/armoury) "eGK" = ( /obj/structure/table/woodentable, /obj/item/radio/off, @@ -8831,30 +8944,30 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "gzM" = ( -/obj/structure/table/rack/steel, +/obj/structure/table/rack/shelf/steel, /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/clothing/shoes/leg_guard/riot, -/obj/item/clothing/gloves/arm_guard/riot, -/obj/item/clothing/mask/balaclava, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/shield/riot, -/obj/item/melee/baton/loaded, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/suit/armor/pcarrier/ballistic{ + pixel_x = -5; + pixel_y = -2 }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 1 +/obj/item/clothing/suit/armor/pcarrier/ballistic{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/ballistic{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/ballistic{ + pixel_x = 5; + pixel_y = -2 }, /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/light{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "gzW" = ( @@ -11122,6 +11235,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) +"ibB" = ( +/obj/effect/floor_decal/corner/black/full, +/turf/simulated/wall/r_wall, +/area/security/tactical) "ich" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -11997,6 +12114,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/effect/floor_decal/corner/black/full, /turf/simulated/floor/tiled/dark, /area/security/tactical) "iHh" = ( @@ -12141,6 +12259,33 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) +"iOd" = ( +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/storage/box/survival_knife{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/box/survival_knife{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/storage/box/survival_knife{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/survival_knife{ + pixel_x = -4; + pixel_y = -4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/security_equiptment_storage) "iOF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -13303,19 +13448,31 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "jIK" = ( -/obj/structure/table/rack/steel, -/obj/structure/window/reinforced, -/obj/item/clothing/shoes/leg_guard/laserproof, -/obj/item/clothing/gloves/arm_guard/laserproof, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/head/helmet/ablative, +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/suit/armor/pcarrier/ablative{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/ablative{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/ablative{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/ablative{ + pixel_x = 5; + pixel_y = -2 + }, /obj/effect/floor_decal/corner/red{ dir = 10 }, -/obj/effect/floor_decal/industrial/outline/red, /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "jJc" = ( @@ -14926,6 +15083,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "kWY" = ( @@ -15835,6 +15993,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/holowarrant, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "lAR" = ( @@ -15942,20 +16101,64 @@ /turf/simulated/floor/plating, /area/maintenance/central) "lDQ" = ( -/obj/structure/table/rack/steel, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/clothing/shoes/leg_guard/combat, -/obj/item/clothing/gloves/arm_guard/combat, -/obj/item/clothing/suit/armor/combat, -/obj/item/clothing/head/helmet/combat, /obj/effect/floor_decal/corner/black/full, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/accessory/armor/armorplate/heavy{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/heavy{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/heavy{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/ballistic{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/ballistic{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/ballistic{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/combat{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/combat{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/combat{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/tactical{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/tactical{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/tactical{ + pixel_x = 5; + pixel_y = -3 + }, /turf/simulated/floor/tiled/dark, /area/security/tactical) "lEt" = ( @@ -16734,6 +16937,9 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "mhX" = ( @@ -19328,6 +19534,9 @@ /obj/item/ammo_magazine/m762, /obj/item/gun/ballistic/automatic/z8, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/tactical) "ois" = ( @@ -19777,6 +19986,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/mimeoffice) +"ovC" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/rack/shelf/steel, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/turf/space/basic, +/area/space) "ovY" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -20016,7 +20232,6 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "oFW" = ( -/obj/mecha/working/hoverpod/shuttlecraft, /obj/effect/floor_decal/industrial/danger{ dir = 10 }, @@ -20024,6 +20239,7 @@ dir = 8 }, /obj/machinery/mech_recharger, +/obj/mecha/combat/fighter/baron/sec/loaded, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) "oFY" = ( @@ -23462,11 +23678,6 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "qRE" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/shoes/leg_guard/combat, -/obj/item/clothing/gloves/arm_guard/combat, -/obj/item/clothing/suit/armor/combat, -/obj/item/clothing/head/helmet/combat, /obj/machinery/light, /obj/effect/floor_decal/corner/black/full{ dir = 4 @@ -23478,6 +23689,40 @@ name = "east bump"; pixel_x = 24 }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -5; + pixel_y = -7 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -5; + pixel_y = -7 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -5; + pixel_y = -7 + }, +/obj/item/shield/riot/tower/swat{ + pixel_x = 4 + }, +/obj/item/shield/riot/tower/swat{ + pixel_x = 4 + }, +/obj/item/shield/riot/tower/swat{ + pixel_x = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/tactical) "qRG" = ( @@ -23739,14 +23984,6 @@ /area/bridge) "qZL" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/armor/vest/wolftaur{ - pixel_x = -16; - pixel_y = 4 - }, -/obj/item/clothing/suit/armor/vest/wolftaur{ - pixel_x = -12; - pixel_y = 9 - }, /obj/effect/floor_decal/corner/red{ dir = 6 }, @@ -23754,6 +23991,198 @@ dir = 9 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/stab{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/clothing/accessory/armor/tag/nts{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/accessory/armor/tag/ntc{ + pixel_y = 3; + pixel_x = -5 + }, +/obj/item/clothing/accessory/armor/tag/ntc{ + pixel_y = 3; + pixel_x = -5 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet{ + pixel_x = -6; + pixel_y = -6 + }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "qZU" = ( @@ -24278,6 +24707,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "rrP" = ( @@ -24953,18 +25383,66 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "rSC" = ( -/obj/structure/table/steel, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/light{ + dir = 1 }, -/obj/item/storage/box/empslite{ - pixel_y = 3 +/obj/item/clothing/accessory/armor/armguards/ablative{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/clothing/accessory/armor/armguards/ablative{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/clothing/accessory/armor/armguards/ablative{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/clothing/accessory/armor/armguards/ablative{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/clothing/accessory/armor/legguards/ablative{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/ablative{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/ablative{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/ablative{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/head/helmet/ablative{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ablative{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ablative{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ablative{ + pixel_x = -5; + pixel_y = 4 }, /obj/effect/floor_decal/corner/red/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "rTa" = ( @@ -25852,11 +26330,56 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "sBq" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches/large/navy{ + pixel_y = 3 + }, +/obj/item/clothing/accessory/storage/pouches/large/navy{ + pixel_y = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/deployable/barrier, /turf/simulated/floor/tiled/dark, /area/security/armoury) "sBU" = ( @@ -26279,28 +26802,46 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) "sNZ" = ( +/obj/structure/table/rack/shelf/steel, /obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/suit/armor/pcarrier/riot{ + pixel_x = 5; + pixel_y = -2 }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 1 +/obj/item/clothing/suit/armor/pcarrier/riot{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/riot{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/riot{ + pixel_x = -5; + pixel_y = -2 }, /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/camera/network/security, -/obj/structure/table/rack/steel, -/obj/item/clothing/shoes/leg_guard/riot, -/obj/item/clothing/gloves/arm_guard/riot, -/obj/item/clothing/mask/balaclava, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/shield/riot, -/obj/item/melee/baton/loaded, +/obj/item/shield/riot{ + pixel_x = 11; + pixel_y = -3 + }, +/obj/item/shield/riot{ + pixel_x = 11; + pixel_y = -3 + }, +/obj/item/shield/riot{ + pixel_x = 11; + pixel_y = -3 + }, +/obj/item/shield/riot{ + pixel_x = 11; + pixel_y = -3 + }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "sOc" = ( @@ -26764,11 +27305,11 @@ /turf/simulated/floor/tiled/old_tile/red, /area/maintenance/security/starboard) "ted" = ( -/obj/mecha/working/hoverpod/shuttlecraft, /obj/effect/floor_decal/industrial/danger{ dir = 10 }, /obj/machinery/mech_recharger, +/obj/mecha/combat/fighter/baron/sec/loaded, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) "teu" = ( @@ -27358,11 +27899,56 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "tCO" = ( -/obj/machinery/deployable/barrier, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = 5 }, -/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, /area/security/armoury) "tDb" = ( @@ -28424,6 +29010,7 @@ "usF" = ( /obj/structure/closet/secure_closet/security, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "usH" = ( @@ -28929,6 +29516,97 @@ /obj/fiftyspawner/steel, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"uOC" = ( +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/legguards/navy{ + pixel_y = -1; + pixel_x = -4 + }, +/obj/item/clothing/accessory/armor/legguards/navy{ + pixel_y = -1; + pixel_x = 7 + }, +/obj/item/clothing/accessory/armor/armguards/navy, +/obj/item/clothing/accessory/armor/armguards/navy, +/obj/item/clothing/accessory/armor/legguards/navy{ + pixel_y = -1; + pixel_x = -4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/armoury) "uOJ" = ( /turf/simulated/floor/tiled/monotile, /area/security/brig) @@ -30301,30 +30979,66 @@ /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "vJe" = ( -/obj/structure/table/rack/steel, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/structure/table/rack/shelf/steel, /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/clothing/shoes/leg_guard/riot, -/obj/item/clothing/gloves/arm_guard/riot, -/obj/item/clothing/mask/balaclava, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/shield/riot, -/obj/item/melee/baton/loaded, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/accessory/armor/legguards/ballistic{ + pixel_x = 6; + pixel_y = -6 }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 1 +/obj/item/clothing/accessory/armor/legguards/ballistic{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/legguards/ballistic{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/legguards/ballistic{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/armguards/ballistic{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/armguards/ballistic{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/armguards/ballistic{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/armguards/ballistic{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 }, /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "vJi" = ( @@ -30443,6 +31157,7 @@ pixel_x = -26 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "vMM" = ( @@ -30533,10 +31248,6 @@ "vOb" = ( /obj/structure/table/rack/steel, /obj/structure/window/reinforced, -/obj/item/clothing/shoes/leg_guard/bulletproof, -/obj/item/clothing/gloves/arm_guard/bulletproof, -/obj/item/clothing/suit/armor/bulletproof/alt, -/obj/item/clothing/head/helmet/ballistic, /obj/machinery/light, /obj/effect/floor_decal/corner/red{ dir = 10 @@ -30545,6 +31256,10 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "vPg" = ( @@ -30731,6 +31446,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "vSM" = ( @@ -31300,35 +32016,81 @@ /turf/simulated/floor/lino, /area/security/detectives_office) "wmC" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/shoes/leg_guard/riot, -/obj/item/clothing/gloves/arm_guard/riot, -/obj/item/clothing/mask/balaclava, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/shield/riot, -/obj/item/melee/baton/loaded, -/obj/effect/floor_decal/borderfloorblack{ - dir = 5 - }, +/obj/structure/table/rack/shelf/steel, /obj/structure/window/reinforced{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/red, /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 5 +/obj/item/clothing/mask/balaclava{ + pixel_x = -4; + pixel_y = 7 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 +/obj/item/clothing/mask/balaclava{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/clothing/mask/balaclava{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/clothing/mask/balaclava{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/accessory/armor/legguards/riot{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/riot{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/riot{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/riot{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/armguards/riot{ + pixel_x = -4; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/armguards/riot{ + pixel_x = -4; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/armguards/riot{ + pixel_x = -4; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/armguards/riot{ + pixel_x = -4; + pixel_y = -7 }, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "wne" = ( @@ -31849,8 +32611,27 @@ dir = 8 }, /obj/machinery/camera/network/security, -/obj/structure/closet/wardrobe/tactical, /obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack/shelf/steel, +/obj/item/gun/ballistic/automatic/wt550{ + pixel_y = 7 + }, +/obj/item/gun/ballistic/automatic/wt550{ + pixel_y = -7 + }, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, +/obj/item/ammo_magazine/m9mmt, /turf/simulated/floor/tiled/dark, /area/security/tactical) "wGK" = ( @@ -31880,7 +32661,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/closet/wardrobe/tactical, /obj/effect/floor_decal/corner/black/full{ dir = 1 }, @@ -31890,6 +32670,19 @@ layer = 3.3; pixel_x = 26 }, +/obj/structure/table/rack/shelf/steel, +/obj/item/gun/ballistic/fiveseven, +/obj/item/gun/ballistic/fiveseven, +/obj/item/gun/ballistic/fiveseven, +/obj/item/ammo_magazine/m57x28mm/fiveseven/ap, +/obj/item/ammo_magazine/m57x28mm/fiveseven/ap, +/obj/item/ammo_magazine/m57x28mm/fiveseven/ap, +/obj/item/ammo_magazine/m57x28mm/fiveseven/ap, +/obj/item/ammo_magazine/m57x28mm/fiveseven/ap, +/obj/item/ammo_magazine/m57x28mm/fiveseven/ap, +/obj/item/ammo_magazine/m57x28mm/fiveseven/ap, +/obj/item/ammo_magazine/m57x28mm/fiveseven/ap, +/obj/item/ammo_magazine/m57x28mm/fiveseven/ap, /turf/simulated/floor/tiled/dark, /area/security/tactical) "wIf" = ( @@ -32065,32 +32858,144 @@ /area/security/eva) "wPq" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/armor/vest/alt{ - pixel_x = -4; - pixel_y = -6 +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/red{ + dir = 6 }, -/obj/item/clothing/suit/armor/vest/alt{ +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/clothing/suit/armor/pcarrier{ pixel_x = 6; - pixel_y = -6 + pixel_y = 6 }, -/obj/item/clothing/suit/armor/vest/alt{ - pixel_x = -4; +/obj/item/clothing/suit/armor/pcarrier{ + pixel_x = 6; pixel_y = 6 }, -/obj/item/clothing/suit/armor/vest/alt{ +/obj/item/clothing/suit/armor/pcarrier{ pixel_x = 6; pixel_y = 6 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/item/clothing/suit/armor/pcarrier{ + pixel_x = 6; + pixel_y = 6 }, -/obj/effect/floor_decal/corner/red{ - dir = 6 +/obj/item/clothing/suit/armor/pcarrier{ + pixel_x = 6; + pixel_y = 6 }, -/obj/effect/floor_decal/corner/red{ - dir = 9 +/obj/item/clothing/suit/armor/pcarrier{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/suit/armor/pcarrier{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/suit/armor/pcarrier{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/suit/armor/pcarrier/navy{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/clothing/suit/armor/pcarrier/navy{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/clothing/suit/armor/pcarrier/navy{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/clothing/suit/armor/pcarrier/navy{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/clothing/suit/armor/pcarrier/navy{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/clothing/suit/armor/pcarrier/navy{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/clothing/suit/armor/pcarrier/navy{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/clothing/suit/armor/pcarrier/navy{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches/navy{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/navy{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/navy{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/navy{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/navy{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/navy{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/navy{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches/navy{ + pixel_x = -5; + pixel_y = -2 }, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "wPX" = ( @@ -32707,6 +33612,30 @@ dir = 6 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/clothing/accessory/armor/helmcover/navy{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/armor/helmcover/navy{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/armor/helmcover/navy{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/armor/helmcover/navy{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/armor/helmcover/navy{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/armor/helmcover/navy{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/armor/helmcover/navy{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/armor/helmcover/navy{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "xoa" = ( @@ -33797,6 +34726,7 @@ /obj/structure/closet/secure_closet/security, /obj/structure/window/basic, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "yat" = ( @@ -39728,7 +40658,7 @@ vIl sfo sfo sfo -sfo +iOd npe npe nIK @@ -42422,9 +43352,9 @@ rsu plC lUE eFy +uOC sBq -sBq -tCO +eGF tCO nzO plC @@ -42716,7 +43646,7 @@ plC nIK clY nIK -nIK +ovC nIK nIK nIK @@ -43988,7 +44918,7 @@ xAC iga xAC xAC -xAC +ibB xAC xAC nIK From bc918f203e749a70fd7d8df2c75be4ef18715468 Mon Sep 17 00:00:00 2001 From: Nut2 Date: Sun, 16 Jul 2023 05:42:04 -0500 Subject: [PATCH 2/3] Update deck4.dmm --- maps/triumph/levels/deck4.dmm | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index 444584f0b56..daf89462e28 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -4930,6 +4930,11 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "dOp" = ( @@ -11235,10 +11240,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) -"ibB" = ( -/obj/effect/floor_decal/corner/black/full, -/turf/simulated/wall/r_wall, -/area/security/tactical) "ich" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -12105,16 +12106,9 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "iGE" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/effect/floor_decal/corner/black/full, /turf/simulated/floor/tiled/dark, /area/security/tactical) "iHh" = ( @@ -15083,7 +15077,6 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "kWY" = ( @@ -15993,7 +15986,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/holowarrant, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "lAR" = ( @@ -19987,10 +19979,6 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/mimeoffice) "ovC" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/table/rack/shelf/steel, -/obj/item/melee/baton/loaded, -/obj/item/melee/baton/loaded, /turf/space/basic, /area/space) "ovY" = ( @@ -24707,7 +24695,6 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "rrP" = ( @@ -29010,7 +28997,6 @@ "usF" = ( /obj/structure/closet/secure_closet/security, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "usH" = ( @@ -31157,7 +31143,6 @@ pixel_x = -26 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "vMM" = ( @@ -31446,7 +31431,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "vSM" = ( @@ -34726,7 +34710,6 @@ /obj/structure/closet/secure_closet/security, /obj/structure/window/basic, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/holowarrant, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "yat" = ( @@ -44918,7 +44901,7 @@ xAC iga xAC xAC -ibB +xAC xAC xAC nIK From 1b724102b6744c0fb9157199d511b6dec434759b Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Sun, 16 Jul 2023 12:47:48 +0200 Subject: [PATCH 3/3] Baywallifies the security department --- maps/triumph/levels/deck4.dmm | 227 ++++++++-------------------------- 1 file changed, 54 insertions(+), 173 deletions(-) diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index daf89462e28..7374fbd1bf2 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -907,8 +907,6 @@ /turf/simulated/floor/tiled, /area/bridge/hallway) "aMe" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -922,16 +920,10 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced/full, /obj/structure/curtain/black{ anchored = 1 }, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/brig) "aME" = ( @@ -1479,12 +1471,10 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "bkw" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/breakroom) "bky" = ( @@ -2430,12 +2420,10 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "bSB" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/range) "bTf" = ( @@ -2970,8 +2958,6 @@ /turf/simulated/floor/tiled/dark, /area/gateway) "cnI" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -2980,13 +2966,7 @@ opacity = 0 }, /obj/structure/cable/green, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/brig) "cnK" = ( @@ -6661,8 +6641,6 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "ePd" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -6671,16 +6649,10 @@ opacity = 0 }, /obj/structure/cable/green, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced/full, /obj/structure/curtain/black{ anchored = 1 }, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/brig) "ePg" = ( @@ -6852,16 +6824,6 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "eWD" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "sec_processing" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -6875,6 +6837,9 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "sec_processing" + }, /turf/simulated/floor/plating, /area/security/lobby) "eWF" = ( @@ -6902,22 +6867,9 @@ /turf/simulated/floor/carpet, /area/maintenance/security/starboard) "eWL" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "sec_processing" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -6925,6 +6877,9 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "sec_processing" + }, /turf/simulated/floor/plating, /area/security/lobby) "eXf" = ( @@ -9700,12 +9655,10 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/sauna) "heB" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/forensics) "heR" = ( @@ -9823,13 +9776,11 @@ /turf/simulated/floor/tiled, /area/exploration/excursion_dock) "hhJ" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/breakroom) "hhP" = ( @@ -10178,9 +10129,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) "hvN" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/brig) "hvO" = ( @@ -10780,8 +10729,6 @@ /area/exploration/explorer_prep) "hOa" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green, /obj/machinery/door/blast/regular{ density = 0; @@ -10790,6 +10737,7 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/prison/cell_block) "hOO" = ( @@ -11749,12 +11697,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "ity" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/lobby) "itM" = ( @@ -12582,12 +12528,10 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "jao" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/brig) "jaC" = ( @@ -12787,16 +12731,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/hos) "jik" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "sec_processing" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12807,6 +12741,9 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "sec_processing" + }, /turf/simulated/floor/plating, /area/security/lobby) "jiv" = ( @@ -16293,10 +16230,8 @@ /turf/simulated/floor/tiled, /area/security/eva) "lIz" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/prison/cell_block) "lIC" = ( @@ -17969,8 +17904,6 @@ /turf/simulated/floor/tiled, /area/security/brig) "mWQ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -17984,13 +17917,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/brig) "mWX" = ( @@ -18768,12 +18695,10 @@ /turf/simulated/floor/carpet/tealcarpet, /area/maintenance/central) "nBV" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/warden) "nBX" = ( @@ -19795,9 +19720,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/library) "ooz" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/breakroom) "ooF" = ( @@ -20301,14 +20224,12 @@ /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) "oIi" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "hos_office" + }, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "oIP" = ( @@ -20542,8 +20463,6 @@ /turf/simulated/open, /area/medical/patient_wing) "oRJ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -20551,11 +20470,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/hanger) "oRN" = ( @@ -20587,12 +20502,10 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) "oTf" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/prison) "oTs" = ( @@ -21249,10 +21162,8 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/civvie/general) "pkC" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/range) "plC" = ( @@ -22197,6 +22108,10 @@ }, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) +"pXk" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/security/lobby) "pXl" = ( /obj/effect/floor_decal/techfloor, /obj/landmark/spawnpoint/latejoin/station/shuttle_dock, @@ -22857,13 +22772,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/security/breakroom) "qpW" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/lobby) "qpZ" = ( @@ -23295,17 +23208,15 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "qEu" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "hos_office" + }, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "qFh" = ( @@ -23624,11 +23535,10 @@ /area/hallway/secondary/docking_hallway) "qPg" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/prison/cell_block) "qPI" = ( @@ -23650,12 +23560,10 @@ /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "qQW" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_lockerroom) "qRg" = ( @@ -24857,10 +24765,8 @@ /turf/simulated/floor/plating, /area/exploration/explorer_prep) "rzp" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_processing) "rzr" = ( @@ -26268,12 +26174,10 @@ /turf/simulated/floor/tiled/monotile, /area/security/prison) "sAd" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_processing) "sAi" = ( @@ -27614,15 +27518,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "trW" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/hanger) "tsv" = ( @@ -28260,14 +28156,12 @@ /turf/simulated/floor/plating, /area/security/brig) "tSR" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "hos_office" + }, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "tTk" = ( @@ -28651,11 +28545,10 @@ /area/maintenance/security/starboard) "ugB" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/prison/cell_block) "ugO" = ( @@ -30813,15 +30706,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "vFo" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/forensics) "vFH" = ( @@ -30876,12 +30767,10 @@ /turf/simulated/floor/tiled, /area/bridge/hallway) "vGB" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_lockerroom) "vGG" = ( @@ -31110,9 +30999,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "vLR" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -31120,6 +31006,7 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/lobby) "vMk" = ( @@ -32078,12 +31965,10 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "wne" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/prison) "wns" = ( @@ -32739,12 +32624,10 @@ /turf/simulated/floor/airless/ceiling, /area/security/hanger) "wKb" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/warden) "wMH" = ( @@ -33680,12 +33563,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge) "xqv" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_lockerroom) "xqQ" = ( @@ -41186,7 +41067,7 @@ jIb nWX jIb lrZ -xxQ +pXk qjp tJG wEy