Skip to content

Commit

Permalink
Revert "[MIRROR] Shuffles both armouries (#2849)"
Browse files Browse the repository at this point in the history 
This reverts commit 2714605.
  • Loading branch information
@Lexanx
Lexanx authored Nov 24, 2024
1 parent 279aa02 commit b643b77
Showing 1 changed file with 35 additions and 37 deletions.
72 changes: 35 additions & 37 deletions maps/torch/torch5_deck1.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9156,9 +9156,9 @@
/obj/structure/table/rack,
/obj/item/clothing/shoes/dutyboots,
/obj/item/clothing/accessory/storage/holster/thigh,
/obj/item/clothing/glasses/tacgoggles,
/obj/item/clothing/suit/armor/pcarrier/medium/sol,
/obj/item/clothing/head/helmet,
/obj/item/clothing/accessory/glassesmod/nvg,
/turf/simulated/floor/tiled/techfloor/grid,
/area/command/armoury/tactical)
"aEH" = (
Expand Down Expand Up @@ -10376,15 +10376,15 @@
/turf/simulated/wall/prepainted,
/area/maintenance/firstdeck/centralport)
"aKv" = (
/obj/structure/table/rack,
/obj/floor_decal/industrial/outline/grey,
/obj/item/storage/box/ammo/pistol,
/obj/item/storage/box/ammo/pistol,
/obj/item/storage/box/ammo/pistol,
/obj/item/storage/box/ammo/pistol,
/obj/machinery/light{
dir = 1
},
/obj/structure/table/steel,
/obj/item/reagent_containers/food/snacks/toastedsandwich{
desc = "Discontinued after a slew of food poisoning related incidents following a failed attempt at using th'oom cheese, the beloved MRE Menu 9 grilled cheese is a well-sought after trophy for spacers and members of the Defense Forces alike.";
name = "special toasted sandwich"
},
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"aKw" = (
Expand Down Expand Up @@ -10830,8 +10830,10 @@
/obj/machinery/light{
dir = 1
},
/obj/item/gun/energy/laser/xenofauna,
/obj/item/gun/energy/laser/xenofauna,
/obj/item/storage/box/ammo/pistol/rubber,
/obj/item/storage/box/ammo/pistol/rubber,
/obj/item/storage/box/ammo/pistol/rubber,
/obj/item/storage/box/ammo/pistol/rubber,
/turf/simulated/floor/tiled/dark,
/area/security/secure_storage)
"aMD" = (
Expand Down Expand Up @@ -14018,15 +14020,13 @@
/turf/space,
/area/space)
"aWQ" = (
/obj/structure/closet/secure_closet/guncabinet/sidearm,
/obj/machinery/power/apc{
name = "south bump";
pixel_y = -28
},
/obj/structure/cable/green,
/obj/floor_decal/industrial/outline/grey,
/obj/structure/table/rack,
/obj/item/storage/box/ammo/smg,
/obj/item/storage/box/ammo/smg,
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"aXb" = (
Expand Down Expand Up @@ -14273,10 +14273,6 @@
d2 = 4;
icon_state = "2-4"
},
/obj/structure/closet/secure_closet{
name = "Secure Evidence Locker";
req_access = list("ACCESS_SECURITY")
},
/turf/simulated/floor/plating,
/area/security/wing)
"bpA" = (
Expand Down Expand Up @@ -18300,10 +18296,10 @@
/obj/structure/table/rack,
/obj/item/clothing/shoes/dutyboots,
/obj/item/clothing/accessory/storage/holster/thigh,
/obj/item/clothing/glasses/tacgoggles,
/obj/item/clothing/suit/armor/pcarrier/medium/sol,
/obj/item/clothing/head/helmet,
/obj/machinery/rotating_alarm/security_alarm,
/obj/item/clothing/accessory/glassesmod/nvg,
/turf/simulated/floor/tiled/techfloor/grid,
/area/command/armoury/tactical)
"hrE" = (
Expand Down Expand Up @@ -21106,11 +21102,9 @@
/area/maintenance/substation/firstdeck)
"kSs" = (
/obj/structure/table/rack,
/obj/item/gun/energy/ionrifle/small,
/obj/item/gun/energy/ionrifle/small,
/obj/floor_decal/industrial/outline/grey,
/obj/item/gun/projectile/shotgun/pump/empty,
/obj/item/gun/projectile/shotgun/pump/empty,
/obj/item/storage/box/ammo/beanbags,
/obj/item/storage/box/ammo/beanbags,
/turf/simulated/floor/tiled/dark,
/area/security/secure_storage)
"kTb" = (
Expand Down Expand Up @@ -23922,8 +23916,10 @@
"ozG" = (
/obj/structure/table/rack,
/obj/floor_decal/industrial/outline/grey,
/obj/item/storage/box/ammo/pistol/rubber,
/obj/item/storage/box/ammo/pistol/rubber,
/obj/item/storage/box/ammo/smg/rubber,
/obj/item/storage/box/ammo/smg/rubber,
/obj/item/storage/box/ammo/smg/rubber,
/obj/item/storage/box/ammo/smg/rubber,
/turf/simulated/floor/tiled/dark,
/area/security/secure_storage)
"oAp" = (
Expand Down Expand Up @@ -24298,8 +24294,6 @@
/obj/item/gun/projectile/automatic/sec_smg/empty,
/obj/item/gun/projectile/automatic/sec_smg/empty,
/obj/item/gun/projectile/automatic/sec_smg/empty,
/obj/item/storage/box/ammo/smg/rubber,
/obj/item/storage/box/ammo/smg/rubber,
/turf/simulated/floor/tiled/dark,
/area/security/secure_storage)
"oXx" = (
Expand Down Expand Up @@ -24573,7 +24567,6 @@
"pud" = (
/obj/structure/table/steel,
/obj/floor_decal/industrial/outline/grey,
/obj/machinery/recharger,
/turf/simulated/floor/tiled/techfloor,
/area/security/armoury)
"puw" = (
Expand Down Expand Up @@ -24636,10 +24629,12 @@
/turf/simulated/floor/plating,
/area/maintenance/firstdeck/aftport)
"pxv" = (
/obj/floor_decal/industrial/outline/grey,
/obj/item/storage/box/ammo/pistol,
/obj/item/storage/box/ammo/pistol,
/obj/structure/table/rack,
/obj/item/storage/box/ammo/smg/rubber,
/obj/item/storage/box/ammo/smg/rubber,
/obj/item/storage/box/ammo/smg/rubber,
/obj/item/storage/box/ammo/smg/rubber,
/obj/floor_decal/industrial/outline/grey,
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"pyb" = (
Expand Down Expand Up @@ -25995,6 +25990,8 @@
/area/rnd/xenobiology/xenoflora)
"rby" = (
/obj/structure/table/rack,
/obj/item/gun/projectile/shotgun/pump/empty,
/obj/item/gun/projectile/shotgun/pump/empty,
/obj/floor_decal/industrial/outline/grey,
/obj/machinery/rotating_alarm/security_alarm{
dir = 8
Expand All @@ -26003,8 +26000,6 @@
dir = 4
},
/obj/machinery/mech_recharger,
/obj/item/gun/energy/ionrifle/small,
/obj/item/gun/energy/ionrifle/small,
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"rcb" = (
Expand Down Expand Up @@ -26525,9 +26520,11 @@
/area/thruster/d1starboard)
"rEK" = (
/obj/structure/table/rack,
/obj/item/storage/box/ammo/smg,
/obj/item/storage/box/ammo/smg,
/obj/item/storage/box/ammo/smg,
/obj/item/storage/box/ammo/smg,
/obj/floor_decal/industrial/outline/grey,
/obj/item/storage/box/ammo/stunshells,
/obj/item/storage/box/ammo/stunshells,
/turf/simulated/floor/tiled/techfloor,
/area/security/armoury)
"rFb" = (
Expand Down Expand Up @@ -27481,11 +27478,10 @@
/turf/simulated/floor/tiled/freezer,
/area/rnd/xenobiology/xenoflora)
"sBg" = (
/obj/structure/table/rack,
/obj/item/storage/box/ammo/beanbags,
/obj/item/storage/box/ammo/beanbags,
/obj/floor_decal/industrial/outline/grey,
/obj/structure/closet/secure_closet{
name = "Secure Evidence Locker";
req_access = list("ACCESS_SECURITY")
},
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"sCb" = (
Expand Down Expand Up @@ -28701,11 +28697,13 @@
/turf/simulated/floor/plating,
/area/maintenance/firstdeck/aftport)
"uie" = (
/obj/structure/table/rack,
/obj/floor_decal/industrial/outline/grey,
/obj/item/storage/box/ammo/stunshells,
/obj/item/storage/box/ammo/stunshells,
/obj/machinery/camera/network/security{
c_tag = "Security - Brig Secure Armory"
},
/obj/structure/closet/secure_closet/guncabinet/sidearm,
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"uiY" = (
Expand Down

0 comments on commit b643b77

Please sign in to comment.