I'll show you who's the boss of this security department: Armory Reworks & Energy Sec (#160)

* all da mapz n' cargo

* ammo workbenches

* lighting pass

* Delta style pass

* Update MetaStation_bubber.dmm
This commit is contained in:
KathrinBailey
2023-04-12 02:39:05 +01:00
committed by GitHub
parent ac67e2ecf4
commit 70661b60a0
6 changed files with 2138 additions and 1365 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+276 -209
View File
@@ -10,13 +10,6 @@
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
"aag" = (
/obj/structure/chair/sofa/corp/right{
desc = "Looks like someone threw it out. Covered in donut crumbs.";
name = "couch"
},
/turf/open/space/basic,
/area/space)
"aah" = (
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating,
@@ -287,7 +280,7 @@
/area/station/science/research)
"agc" = (
/obj/effect/turf_decal/bot,
/mob/living/simple_animal/bot/secbot/beepsky/armsky,
/obj/machinery/ammo_workbench,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"ago" = (
@@ -503,12 +496,12 @@
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"akE" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/effect/turf_decal/trimline/dark_red/filled/corner{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"akG" = (
@@ -667,13 +660,6 @@
"anS" = (
/turf/open/floor/plating/airless,
/area/space/nearstation)
"anT" = (
/obj/structure/chair/sofa/corp/left{
desc = "Looks like someone threw it out. Covered in donut crumbs.";
name = "couch"
},
/turf/open/space/basic,
/area/space)
"aok" = (
/turf/open/floor/iron,
/area/station/cargo/storage)
@@ -6082,11 +6068,10 @@
/turf/closed/wall,
/area/station/construction/storage_wing)
"clE" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"clQ" = (
/turf/closed/wall,
@@ -6606,13 +6591,17 @@
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"cuY" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/blue/half/contrasted{
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 4
},
/obj/item/melee/hammer,
/obj/item/melee/hammer,
/obj/item/melee/hammer,
/obj/structure/rack,
/obj/item/gun/energy/laser{
pixel_y = 7
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser{
pixel_y = -7
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"cuZ" = (
@@ -8322,20 +8311,19 @@
/turf/open/floor/wood,
/area/station/service/lawoffice)
"daO" = (
/obj/item/grenade/barrier{
pixel_x = -3;
pixel_y = 1
},
/obj/item/grenade/barrier,
/obj/item/grenade/barrier{
pixel_x = 3;
pixel_y = -1
},
/obj/item/grenade/barrier{
pixel_x = 6;
pixel_y = -2
},
/obj/structure/rack,
/obj/effect/turf_decal/trimline/dark_red/filled/warning{
dir = 8
},
/obj/item/storage/box/flashes{
pixel_y = -3
},
/obj/item/storage/box/firingpins{
pixel_y = 4
},
/obj/item/gun/energy/temperature/security,
/obj/item/gun/energy/ionrifle,
/obj/item/clothing/suit/hooded/ablative,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"daS" = (
@@ -11189,7 +11177,7 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
},
/obj/effect/turf_decal/trimline/darkblue/filled/warning{
/obj/effect/turf_decal/trimline/dark_red/filled/warning{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -11455,18 +11443,33 @@
/turf/open/floor/iron,
/area/station/security/warden)
"eew" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 8
},
/obj/structure/rack,
/obj/item/gun/energy/ionrifle,
/obj/item/gun/energy/temperature/security,
/obj/item/clothing/suit/hooded/ablative,
/obj/item/gun/grenadelauncher,
/obj/item/storage/box/teargas{
pixel_x = 1;
pixel_y = -2
/obj/item/clothing/suit/armor/bulletproof/old{
pixel_x = -7;
pixel_y = -3
},
/obj/item/storage/box/flashes{
pixel_x = 3
/obj/item/clothing/suit/armor/bulletproof/old{
pixel_y = -3
},
/obj/item/clothing/suit/armor/bulletproof/old{
pixel_x = 7;
pixel_y = -3
},
/obj/item/clothing/head/helmet/alt{
pixel_x = -7;
pixel_y = 6
},
/obj/item/clothing/head/helmet/alt{
pixel_y = 6
},
/obj/item/clothing/head/helmet/alt{
pixel_x = 7;
pixel_y = 6
},
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"efa" = (
@@ -13943,6 +13946,8 @@
dir = 1
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"eZR" = (
@@ -15151,6 +15156,7 @@
dir = 4
},
/obj/structure/cable,
/mob/living/simple_animal/bot/secbot/beepsky/armsky,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"fzl" = (
@@ -18720,6 +18726,8 @@
/obj/machinery/light/directional/west,
/obj/structure/cable,
/obj/structure/sign/poster/official/random/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"gNT" = (
@@ -20756,9 +20764,45 @@
/turf/open/floor/iron/white/corner,
/area/station/hallway/secondary/entry)
"hxF" = (
/obj/effect/turf_decal/bot_blue,
/obj/structure/closet/secure_closet/smartgun,
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{
dir = 8
},
/obj/structure/rack,
/obj/item/clothing/suit/armor/riot{
pixel_x = -7;
pixel_y = -6
},
/obj/item/clothing/suit/armor/riot{
pixel_y = -6
},
/obj/item/clothing/suit/armor/riot{
pixel_x = 7;
pixel_y = -6
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -6;
pixel_y = 8
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 8
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 6;
pixel_y = 8
},
/obj/item/shield/riot{
pixel_x = -8;
pixel_y = -8
},
/obj/item/shield/riot{
pixel_y = -8
},
/obj/item/shield/riot{
pixel_x = 8;
pixel_y = -8
},
/obj/structure/window/reinforced,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"hxV" = (
@@ -20930,17 +20974,30 @@
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"hBR" = (
/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted,
/obj/structure/rack,
/obj/item/shield/riot{
pixel_x = -3;
pixel_y = 3
/obj/item/melee/hammer{
pixel_x = -7
},
/obj/item/shield/riot,
/obj/item/shield/riot{
pixel_x = 3;
pixel_y = -3
/obj/item/melee/hammer,
/obj/item/melee/hammer{
pixel_x = 7
},
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/obj/item/melee/baton/security/loaded{
pixel_x = -7
},
/obj/item/melee/baton/security/loaded,
/obj/item/melee/baton/security/loaded{
pixel_x = 7
},
/obj/item/flashlight/seclite{
pixel_x = 2
},
/obj/item/flashlight/seclite{
pixel_x = 2;
pixel_y = -7
},
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"hBY" = (
@@ -22128,13 +22185,11 @@
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
"hXJ" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/head/helmet/sec/peacekeeper,
/obj/machinery/vending/wardrobe/sec_wardrobe/red,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"hXK" = (
@@ -23359,11 +23414,9 @@
/area/station/science/xenobiology)
"irs" = (
/obj/structure/cable,
/obj/machinery/computer/cryopod{
pixel_y = 32
},
/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/computer/cryopod/directional/north,
/turf/open/floor/iron,
/area/station/common/cryopods)
"irL" = (
@@ -25193,36 +25246,31 @@
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
"iRG" = (
/obj/structure/rack,
/obj/item/clothing/suit/armor/riot{
pixel_x = 3;
pixel_y = 2
},
/obj/item/clothing/suit/armor/riot{
pixel_y = 2
},
/obj/item/clothing/suit/armor/riot{
pixel_x = -3;
pixel_y = 2
},
/obj/item/clothing/suit/armor/bulletproof{
pixel_x = 3;
pixel_y = -2
},
/obj/item/clothing/suit/armor/bulletproof{
pixel_y = -2
},
/obj/item/clothing/suit/armor/bulletproof{
pixel_x = -3;
pixel_y = -2
},
/obj/machinery/requests_console/directional/north{
assistance_requestable = 1;
department = "Security";
name = "Security Requests Console";
supplies_requestable = 1
},
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/effect/turf_decal/tile/dark_red/half/contrasted,
/obj/structure/rack,
/obj/item/grenade/barrier{
pixel_x = -6
},
/obj/item/grenade/barrier,
/obj/item/grenade/barrier{
pixel_x = 6
},
/obj/item/storage/box/teargas{
pixel_x = 3;
pixel_y = 3
},
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/flashbangs{
pixel_x = -3;
pixel_y = -3
},
/obj/item/gun/grenadelauncher,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"iRO" = (
@@ -25456,10 +25504,10 @@
/turf/open/floor/plating,
/area/station/commons/dorms)
"iVO" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/trimline/dark_red/filled/corner{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"iWc" = (
@@ -28692,6 +28740,9 @@
succrange = 2
},
/obj/machinery/light_switch/directional/east,
/obj/effect/turf_decal/trimline/dark_red/filled/warning{
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"kaF" = (
@@ -31548,8 +31599,12 @@
/turf/closed/wall,
/area/station/science/lab)
"kZF" = (
/turf/closed/wall,
/area/station/security/prison)
/obj/effect/turf_decal/trimline/dark_red/filled/corner,
/obj/machinery/holopad{
pixel_y = 16
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"kZG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -32013,6 +32068,8 @@
},
/obj/structure/cable,
/obj/machinery/bluespace_vendor/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"ljf" = (
@@ -34701,10 +34758,10 @@
/turf/open/floor/iron,
/area/station/common/cryopods)
"mgc" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/dark_red/filled/corner{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"mgh" = (
@@ -36581,6 +36638,8 @@
dir = 8
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"mKv" = (
@@ -39293,7 +39352,7 @@
"nEZ" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/security/prison)
/area/station/security/prison/rec)
"nFa" = (
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
@@ -39451,11 +39510,9 @@
/area/station/science/xenobiology)
"nJu" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/head/helmet/sec/peacekeeper,
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"nJA" = (
@@ -39610,9 +39667,8 @@
/area/station/maintenance/starboard/aft)
"nMw" = (
/obj/machinery/airalarm/directional/north,
/obj/structure/rack/gunrack,
/obj/effect/spawner/armory_spawn/microfusion,
/obj/effect/turf_decal/delivery/red,
/obj/structure/closet/secure_closet/smartgun,
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/security/armory)
"nMz" = (
@@ -41680,7 +41736,7 @@
/obj/structure/bed/maint,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/security/prison)
/area/station/security/prison/rec)
"ovX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/turf/closed/wall/r_wall,
@@ -44132,6 +44188,8 @@
dir = 1
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"prT" = (
@@ -44273,10 +44331,15 @@
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
"pti" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/head/helmet/sec/peacekeeper,
/obj/structure/table,
/obj/machinery/recharger{
pixel_x = -6;
pixel_y = 2
},
/obj/machinery/recharger{
pixel_x = 6;
pixel_y = 2
},
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"ptE" = (
@@ -46235,11 +46298,6 @@
"qcd" = (
/turf/closed/wall/r_wall,
/area/station/engineering/atmos/pumproom)
"qcf" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
/turf/open/floor/plating,
/area/space)
"qcC" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -51688,18 +51746,20 @@
/turf/open/floor/iron/pool,
/area/station/security/prison/rec)
"rRf" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/blue/half/contrasted{
/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{
dir = 4
},
/obj/item/gun/energy/disabler{
pixel_y = 6
/obj/structure/rack,
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 1
},
/obj/item/gun/energy/disabler{
pixel_y = 2
/obj/item/gun/energy/e_gun{
pixel_y = 7
},
/obj/item/gun/energy/disabler{
pixel_y = -2
/obj/item/gun/energy/e_gun,
/obj/item/gun/energy/e_gun{
pixel_y = -7
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
@@ -53951,13 +54011,46 @@
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"sDw" = (
/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{
dir = 1
},
/obj/structure/rack,
/obj/item/storage/barricade{
/obj/item/clothing/glasses/hud/security/sunglasses/redsec{
pixel_x = -3;
pixel_y = 3
},
/obj/item/clothing/glasses/hud/security/sunglasses/redsec{
pixel_y = 3
},
/obj/item/clothing/glasses/hud/security/sunglasses/redsec{
pixel_x = 3;
pixel_y = 3
},
/obj/item/clothing/head/helmet/sec/redsec{
pixel_x = -7;
pixel_y = 6
},
/obj/item/clothing/head/helmet/sec/redsec{
pixel_y = 6
},
/obj/item/clothing/head/helmet/sec/redsec{
pixel_x = 7;
pixel_y = 6
},
/obj/item/clothing/suit/armor/vest/alt/sec/redsec{
pixel_x = -7;
pixel_y = -5
},
/obj/item/storage/barricade,
/obj/item/storage/barricade{
pixel_y = 5
/obj/item/clothing/suit/armor/vest/alt/sec/redsec{
pixel_y = -5
},
/obj/item/clothing/suit/armor/vest/alt/sec/redsec{
pixel_x = 7;
pixel_y = -5
},
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 1
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
@@ -54748,6 +54841,8 @@
dir = 1
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"sSx" = (
@@ -55089,7 +55184,7 @@
/obj/machinery/light/small/directional/east,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/security/prison)
/area/station/security/prison/rec)
"sWO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -55654,29 +55749,22 @@
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"tgy" = (
/obj/structure/rack,
/obj/item/clothing/glasses/hud/security/sunglasses/gars{
pixel_x = 3;
pixel_y = -2
},
/obj/item/clothing/glasses/hud/security/sunglasses/gars{
pixel_x = 3;
pixel_y = 2
},
/obj/item/clothing/glasses/hud/security/sunglasses{
pixel_x = -3;
pixel_y = -2
},
/obj/item/clothing/glasses/hud/security/sunglasses{
pixel_x = -3;
pixel_y = 2
},
/obj/machinery/airalarm/directional/west,
/obj/machinery/camera/motion/directional/west{
c_tag = "Armory - Internal"
},
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted,
/obj/structure/rack,
/obj/structure/window/reinforced,
/obj/item/gun/energy/disabler{
pixel_y = 6
},
/obj/item/gun/energy/disabler{
pixel_y = 2
},
/obj/item/gun/energy/disabler{
pixel_y = -2
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"tgC" = (
@@ -55971,10 +56059,10 @@
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
"tms" = (
/obj/effect/turf_decal/trimline/darkblue/filled/corner,
/obj/effect/turf_decal/trimline/darkblue/filled/warning{
/obj/effect/turf_decal/trimline/dark_red/filled/warning{
dir = 1
},
/obj/effect/turf_decal/trimline/dark_red/filled/corner,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"tmz" = (
@@ -57223,7 +57311,7 @@
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
"tJE" = (
/obj/effect/turf_decal/trimline/red/filled/corner,
/obj/effect/turf_decal/trimline/dark_red/filled/corner,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"tJF" = (
@@ -59030,14 +59118,13 @@
/turf/open/floor/plating,
/area/station/medical/abandoned)
"upR" = (
/obj/structure/table,
/obj/machinery/recharger{
pixel_y = 4
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
/obj/structure/closet/secure_closet/security/sec,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/head/helmet/sec/peacekeeper,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"upT" = (
@@ -59426,32 +59513,23 @@
/turf/open/floor/iron,
/area/station/engineering/main)
"uwg" = (
/obj/structure/rack,
/obj/machinery/light/directional/west,
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = 2
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 2
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 2
},
/obj/item/clothing/head/helmet/alt{
pixel_x = 3;
pixel_y = -2
},
/obj/item/clothing/head/helmet/alt{
pixel_y = -2
},
/obj/item/clothing/head/helmet/alt{
pixel_x = -3;
pixel_y = -2
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/effect/turf_decal/tile/dark_red/half/contrasted,
/obj/structure/rack,
/obj/item/storage/barricade{
pixel_y = 5
},
/obj/item/storage/barricade,
/obj/item/storage/barricade{
pixel_y = -5
},
/obj/item/storage/box/chemimp{
pixel_x = 6
},
/obj/item/storage/box/trackimp{
pixel_x = -3
},
/obj/item/storage/lockbox/loyalty,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"uwh" = (
@@ -59802,15 +59880,14 @@
},
/area/station/medical/medbay/lobby)
"uBP" = (
/obj/structure/table,
/obj/machinery/recharger{
pixel_y = 4
},
/obj/structure/cable,
/obj/machinery/newscaster/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/structure/closet/secure_closet/security/sec,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/head/helmet/sec/peacekeeper,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"uCq" = (
@@ -61124,13 +61201,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"uZa" = (
/obj/effect/spawner/random/structure/girder{
loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
name = "falsewall or wall spawner"
},
/turf/open/floor/plating,
/area/station/security/prison)
"uZj" = (
/obj/structure/sign/directions/security{
dir = 1;
@@ -61158,9 +61228,6 @@
/obj/structure/cable,
/turf/open/floor/carpet,
/area/station/service/chapel)
"uZF" = (
/turf/closed/wall/r_wall,
/area/space)
"uZK" = (
/obj/structure/sign/warning/vacuum/external/directional/north,
/obj/effect/turf_decal/stripes/line{
@@ -65464,7 +65531,7 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
"wzF" = (
/obj/effect/turf_decal/trimline/darkblue/filled/warning{
/obj/effect/turf_decal/trimline/dark_red/filled/warning{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -89101,7 +89168,7 @@ sbX
irh
wyn
iOr
uZF
iOr
raz
aaa
aaa
@@ -89358,7 +89425,7 @@ qDS
tVo
ese
rAW
qcf
cmB
raz
raz
raz
@@ -90130,7 +90197,7 @@ dHQ
jjM
vfy
iOr
uZF
iOr
mji
aaa
aaa
@@ -90387,7 +90454,7 @@ fbX
cnk
wFY
qox
uZF
iOr
aUn
aaa
aaa
@@ -92179,8 +92246,8 @@ gQT
gQT
mMQ
gQT
kZF
kZF
gQT
gQT
wZz
wZz
wZz
@@ -92436,7 +92503,7 @@ gQT
mAe
odB
nyf
uZa
mou
nEZ
tYo
bmX
@@ -92693,7 +92760,7 @@ hOR
ybs
nNB
wuh
kZF
gQT
ovL
wZz
dXA
@@ -92950,7 +93017,7 @@ gQT
lUY
cfa
otM
kZF
gQT
sWF
wZz
wOm
@@ -97596,7 +97663,7 @@ tms
kVU
tJE
kVU
tJE
kZF
fzi
wTp
jxV
@@ -98862,7 +98929,7 @@ aaa
aaa
aaa
aaa
aav
aaa
aaa
aaa
aaa
@@ -101174,7 +101241,7 @@ aaa
aaa
aaa
aaa
aav
aaa
aaa
aaa
aaa
@@ -105560,8 +105627,8 @@ liO
sSs
prE
gNF
ewk
ewk
lOU
lOU
mKu
lOU
hSG
@@ -106326,7 +106393,7 @@ qWw
qWw
qWw
yhK
szp
eZN
ewf
jNK
lFU
@@ -106576,14 +106643,14 @@ aaa
aaa
aaa
aaa
aag
aaa
dwJ
yhK
idh
qgf
qgf
qWw
dYl
eZN
sqz
crA
dYl
@@ -106833,7 +106900,7 @@ aaa
aaa
aaa
aaa
anT
aaa
dwJ
yhK
irs
@@ -107097,7 +107164,7 @@ njS
dSQ
kBR
qWw
dYl
tgo
mnl
crA
cxU
@@ -107354,7 +107421,7 @@ qWw
qWw
qWw
yhK
szp
tgo
sqH
vHu
kuB
+155 -106
View File
@@ -13355,21 +13355,17 @@
/area/station/commons/dorms)
"dSa" = (
/obj/structure/rack,
/obj/item/clothing/head/helmet/alt{
pixel_x = -6;
pixel_y = -4
},
/obj/item/clothing/head/helmet/alt{
pixel_y = 6
},
/obj/item/clothing/head/helmet/alt{
pixel_x = 6;
pixel_y = -4
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/item/gun/energy/laser{
pixel_y = 7
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser{
pixel_y = -7
},
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"dSc" = (
@@ -22052,11 +22048,11 @@
/area/station/medical/medbay/central)
"gra" = (
/obj/structure/rack/gunrack,
/obj/effect/spawner/armory_spawn/microfusion,
/obj/effect/turf_decal/tile/dark_red/half{
dir = 1
},
/obj/effect/turf_decal/delivery,
/obj/effect/spawner/armory_spawn/shotguns,
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"grg" = (
@@ -40068,17 +40064,22 @@
/turf/open/floor/carpet/royalblack,
/area/station/command/heads_quarters/hos)
"lqX" = (
/obj/structure/rack,
/obj/item/gun/energy/e_gun/dragnet,
/obj/item/gun/energy/e_gun/dragnet,
/obj/item/melee/hammer,
/obj/item/melee/hammer,
/obj/item/melee/hammer,
/obj/effect/turf_decal/tile/dark_red/half,
/obj/machinery/camera/directional/south{
c_tag = "Armory - Interior"
},
/obj/effect/turf_decal/bot,
/obj/structure/rack,
/obj/item/storage/box/teargas{
pixel_x = 3;
pixel_y = 3
},
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/flashbangs{
pixel_x = -3;
pixel_y = -3
},
/obj/item/gun/grenadelauncher,
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"lqY" = (
@@ -46652,16 +46653,6 @@
/turf/open/floor/wood/large,
/area/station/service/library)
"nbs" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/armor/bulletproof{
pixel_y = 6
},
/obj/item/clothing/suit/armor/bulletproof{
pixel_x = -4
},
/obj/item/clothing/suit/armor/bulletproof{
pixel_x = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -46671,6 +46662,40 @@
/obj/item/storage/secure/safe/directional/east,
/obj/machinery/light/warm/directional/east,
/obj/effect/turf_decal/delivery,
/obj/structure/rack,
/obj/item/clothing/glasses/hud/security/sunglasses/redsec{
pixel_x = -3;
pixel_y = 3
},
/obj/item/clothing/glasses/hud/security/sunglasses/redsec{
pixel_y = 3
},
/obj/item/clothing/glasses/hud/security/sunglasses/redsec{
pixel_x = 3;
pixel_y = 3
},
/obj/item/clothing/head/helmet/sec/redsec{
pixel_x = -7;
pixel_y = 6
},
/obj/item/clothing/head/helmet/sec/redsec{
pixel_y = 6
},
/obj/item/clothing/head/helmet/sec/redsec{
pixel_x = 7;
pixel_y = 6
},
/obj/item/clothing/suit/armor/vest/alt/sec/redsec{
pixel_x = -7;
pixel_y = -5
},
/obj/item/clothing/suit/armor/vest/alt/sec/redsec{
pixel_y = -5
},
/obj/item/clothing/suit/armor/vest/alt/sec/redsec{
pixel_x = 7;
pixel_y = -5
},
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"nbt" = (
@@ -48507,18 +48532,6 @@
},
/area/station/hallway/primary/fore)
"nzM" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/armor/riot{
pixel_x = -7;
pixel_y = 5
},
/obj/item/clothing/suit/armor/riot{
pixel_y = 5
},
/obj/item/clothing/suit/armor/riot{
pixel_x = 7;
pixel_y = 5
},
/obj/structure/window/reinforced,
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -48530,6 +48543,40 @@
pixel_x = 32
},
/obj/effect/turf_decal/delivery,
/obj/structure/rack,
/obj/item/clothing/suit/armor/riot{
pixel_x = -7;
pixel_y = -6
},
/obj/item/clothing/suit/armor/riot{
pixel_y = -6
},
/obj/item/clothing/suit/armor/riot{
pixel_x = 7;
pixel_y = -6
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -6;
pixel_y = 8
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 8
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 6;
pixel_y = 8
},
/obj/item/shield/riot{
pixel_x = -8;
pixel_y = -8
},
/obj/item/shield/riot{
pixel_y = -8
},
/obj/item/shield/riot{
pixel_x = 8;
pixel_y = -8
},
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"nzP" = (
@@ -59468,12 +59515,6 @@
/area/station/cargo/blacksmith)
"qBO" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/hooded/ablative{
pixel_y = 7
},
/obj/item/gun/energy/temperature/security{
pixel_y = 5
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4;
@@ -59484,6 +59525,13 @@
dir = 8
},
/obj/effect/turf_decal/delivery,
/obj/item/storage/box/firingpins,
/obj/item/clothing/suit/hooded/ablative{
pixel_y = 7
},
/obj/item/gun/energy/temperature/security{
pixel_y = 5
},
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"qBR" = (
@@ -60113,18 +60161,6 @@
},
/area/station/science/ordnance/testlab)
"qKP" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/armor/vest/alt/sec{
pixel_y = 2
},
/obj/item/clothing/suit/armor/vest/alt/sec{
pixel_x = -4;
pixel_y = -6
},
/obj/item/clothing/suit/armor/vest/alt/sec{
pixel_x = 4;
pixel_y = -6
},
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 1
@@ -60139,6 +60175,29 @@
pixel_x = 32
},
/obj/effect/turf_decal/delivery,
/obj/structure/rack,
/obj/item/clothing/suit/armor/bulletproof/old{
pixel_x = -7;
pixel_y = -3
},
/obj/item/clothing/suit/armor/bulletproof/old{
pixel_y = -3
},
/obj/item/clothing/suit/armor/bulletproof/old{
pixel_x = 7;
pixel_y = -3
},
/obj/item/clothing/head/helmet/alt{
pixel_x = -7;
pixel_y = 6
},
/obj/item/clothing/head/helmet/alt{
pixel_y = 6
},
/obj/item/clothing/head/helmet/alt{
pixel_x = 7;
pixel_y = 6
},
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"qLf" = (
@@ -67267,9 +67326,9 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/effect/landmark/secequipment,
/obj/effect/turf_decal/tile/red/diagonal_centre,
/obj/effect/turf_decal/bot,
/obj/machinery/vending/wardrobe/sec_wardrobe/red,
/turf/open/floor/iron/dark/diagonal,
/area/station/security/office)
"sJk" = (
@@ -72915,25 +72974,31 @@
/area/station/maintenance/starboard/aft)
"ult" = (
/obj/structure/rack,
/obj/item/melee/baton/security/loaded,
/obj/item/melee/baton/security/loaded,
/obj/item/melee/baton/security/loaded,
/obj/item/shield/riot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/shield/riot,
/obj/item/shield/riot{
pixel_x = 3;
pixel_y = -3
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/effect/turf_decal/tile/dark_red/half,
/obj/machinery/light/warm/directional/south,
/obj/structure/reagent_dispensers/wall/peppertank/directional/south,
/obj/effect/turf_decal/bot,
/obj/item/melee/hammer{
pixel_x = -7
},
/obj/item/melee/hammer,
/obj/item/melee/hammer{
pixel_x = 7
},
/obj/item/melee/baton/security/loaded{
pixel_x = -7
},
/obj/item/melee/baton/security/loaded,
/obj/item/melee/baton/security/loaded{
pixel_x = 7
},
/obj/item/flashlight/seclite{
pixel_x = 2
},
/obj/item/flashlight/seclite{
pixel_x = 2;
pixel_y = -7
},
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"ulA" = (
@@ -77398,16 +77463,6 @@
/turf/open/floor/iron/smooth_large,
/area/station/cargo/sorting)
"vwn" = (
/obj/item/gun/energy/disabler{
pixel_y = -2
},
/obj/item/gun/energy/disabler{
pixel_y = 2
},
/obj/item/gun/energy/disabler{
pixel_y = 6
},
/obj/structure/rack,
/obj/effect/turf_decal/tile/dark_red/anticorner{
dir = 1
},
@@ -80632,17 +80687,6 @@
/area/station/service/chapel)
"wrA" = (
/obj/structure/rack,
/obj/item/clothing/head/helmet/sec{
pixel_y = 6
},
/obj/item/clothing/head/helmet/sec{
pixel_x = -6;
pixel_y = -4
},
/obj/item/clothing/head/helmet/sec{
pixel_x = 6;
pixel_y = -4
},
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 1
@@ -80651,6 +80695,13 @@
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/item/gun/energy/e_gun{
pixel_y = 7
},
/obj/item/gun/energy/e_gun,
/obj/item/gun/energy/e_gun{
pixel_y = -7
},
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"wrH" = (
@@ -80871,20 +80922,20 @@
/area/station/medical/coldroom)
"wtg" = (
/obj/structure/rack,
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 8
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -5
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 6
},
/obj/structure/window/reinforced,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/item/gun/energy/disabler{
pixel_y = 6
},
/obj/item/gun/energy/disabler{
pixel_y = 2
},
/obj/item/gun/energy/disabler{
pixel_y = -2
},
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"wtJ" = (
@@ -85545,8 +85596,6 @@
/turf/open/floor/plating,
/area/station/security/execution/transfer)
"xMF" = (
/obj/structure/rack/gunrack,
/obj/effect/spawner/armory_spawn/shotguns,
/obj/effect/turf_decal/tile/dark_red/half{
dir = 1
},
File diff suppressed because it is too large Load Diff
+4 -6
View File
@@ -67,7 +67,8 @@
cost = CARGO_CRATE_VALUE * 2
contains = list(/obj/item/clothing/head/helmet/sec = 3)
crate_name = "helmet crate"
*/
// SKYRAT EDIT REMOVAL END
/datum/supply_pack/security/laser
name = "Lasers Crate"
desc = "Contains three lethal, high-energy laser guns. Requires Security access to open."
@@ -75,8 +76,6 @@
access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/energy/laser = 3)
crate_name = "laser crate"
*/
// SKYRAT EDIT REMOVAL END
/datum/supply_pack/security/securitybarriers
name = "Security Barrier Grenades"
@@ -242,7 +241,8 @@
cost = CARGO_CRATE_VALUE * 5
contains = list(/obj/item/gun/energy/e_gun/dragnet = 3)
crate_name = "\improper DRAGnet crate"
*/
// SKYRAT EDIT REMOVAL END
/datum/supply_pack/security/armory/energy
name = "Energy Guns Crate"
desc = "Contains two Energy Guns, capable of firing both nonlethal and lethal \
@@ -251,8 +251,6 @@
contains = list(/obj/item/gun/energy/e_gun = 2)
crate_name = "energy gun crate"
crate_type = /obj/structure/closet/crate/secure/plasma
*/
// SKYRAT EDIT REMOVAL END
/datum/supply_pack/security/armory/exileimp
name = "Exile Implants Crate"