From d1b37bf481742d4d8bd0dc970a4c5104b8754823 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Tue, 9 May 2017 11:10:14 -0400 Subject: [PATCH] Split HoS locker into two --- .../crates_lockers/closets/secure/security.dm | 45 ++++++++++++------- maps/tether/tether-03-station.dmm | 4 +- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index a8ace582665..2bfbe7fe677 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -80,7 +80,7 @@ /obj/structure/closet/secure_closet/hos - name = "head of security's locker" + name = "head of security's attire" //VOREStation Edit req_access = list(access_hos) icon_state = "hossecure1" icon_closed = "hossecure" @@ -89,7 +89,7 @@ icon_broken = "hossecurebroken" icon_off = "hossecureoff" storage_capacity = 2.5 * MOB_MEDIUM - + //VOREStation Edit - This list split into two lockers New() ..() if(prob(50)) @@ -105,35 +105,50 @@ new /obj/item/clothing/suit/storage/vest/hoscoat/jensen(src) new /obj/item/clothing/suit/storage/vest/hoscoat(src) new /obj/item/clothing/head/helmet/HoS/dermal(src) - new /obj/item/weapon/cartridge/hos(src) new /obj/item/device/radio/headset/heads/hos(src) new /obj/item/device/radio/headset/heads/hos/alt(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) + new /obj/item/weapon/storage/belt/security(src) + new /obj/item/clothing/accessory/holster/waist(src) + new /obj/item/clothing/head/beret/sec/corporate/hos(src) + new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src) + new /obj/item/clothing/mask/gas/half(src) + return + +//VOREStation Edit - Locker has too much junk in it, splitting it up +/obj/structure/closet/secure_closet/hos2 + name = "head of security's gear" + req_access = list(access_hos) + icon_state = "hossecure1" + icon_closed = "hossecure" + icon_locked = "hossecure1" + icon_opened = "hossecureopen" + icon_broken = "hossecurebroken" + icon_off = "hossecureoff" + storage_capacity = 2.5 * MOB_MEDIUM + + New() + ..() + new /obj/item/weapon/cartridge/hos(src) new /obj/item/taperoll/police(src) - //new /obj/item/weapon/shield/riot(src) //VOREStation Edit new /obj/item/weapon/shield/riot/tele(src) new /obj/item/weapon/storage/box/holobadge/hos(src) new /obj/item/clothing/accessory/badge/holo/hos(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/weapon/crowbar/red(src) new /obj/item/weapon/storage/box/flashbangs(src) - new /obj/item/weapon/storage/belt/security(src) new /obj/item/device/flash(src) new /obj/item/weapon/melee/baton/loaded(src) - new /obj/item/weapon/gun/projectile/lamia(src) //VOREStation Edit - new /obj/item/ammo_magazine/a44 //VOREStation Edit - new /obj/item/ammo_magazine/a44 //VOREStation Edit - //new /obj/item/weapon/cell/device/weapon(src) //VOREStation Edit - new /obj/item/clothing/accessory/holster/waist(src) + new /obj/item/weapon/gun/projectile/lamia(src) + new /obj/item/ammo_magazine/a44/rubber(src) + new /obj/item/ammo_magazine/a44(src) + new /obj/item/ammo_magazine/a44(src) + new /obj/item/weapon/gun/energy/gun(src) + new /obj/item/weapon/cell/device/weapon(src) new /obj/item/weapon/melee/telebaton(src) - new /obj/item/clothing/head/beret/sec/corporate/hos(src) - new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src) new /obj/item/device/flashlight/maglight(src) - new /obj/item/clothing/mask/gas/half(src) return - - /obj/structure/closet/secure_closet/warden name = "warden's locker" req_access = list(access_armory) diff --git a/maps/tether/tether-03-station.dmm b/maps/tether/tether-03-station.dmm index c0befd7835b..bcb99c55522 100644 --- a/maps/tether/tether-03-station.dmm +++ b/maps/tether/tether-03-station.dmm @@ -3920,7 +3920,7 @@ "bxt" = (/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/security/briefing_room) "bxu" = (/obj/structure/grille,/obj/structure/cable/green,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 8},/obj/structure/window/reinforced/polarized{dir = 4},/obj/structure/window/reinforced/polarized{dir = 10; icon_state = "fwindow"; id = null},/turf/simulated/floor/plating,/area/crew_quarters/heads/hos) "bxv" = (/obj/effect/floor_decal/borderfloorblack{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) -"bxw" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/borderfloorblack{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) +"bxw" = (/obj/effect/floor_decal/borderfloorblack{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "bxx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/white,/area/security/forensics) "bxy" = (/obj/machinery/door/window/westleft,/turf/simulated/floor/tiled/white,/area/security/forensics) "bxz" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/white,/area/security/forensics) @@ -3953,7 +3953,7 @@ "bya" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 4},/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "byb" = (/obj/structure/table/woodentable,/obj/item/device/radio/off,/obj/item/device/megaphone,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "byc" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) -"byd" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/corner/red/border,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) +"byd" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/corner/red/border,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/closet/secure_closet/hos2,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "bye" = (/obj/structure/closet/secure_closet/hos,/obj/item/clothing/suit/space/void/security/fluff/hos{armor = list("melee" = 70, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 10); species_restricted = null},/obj/item/clothing/head/helmet/space/void/security/fluff/hos{armor = list("melee" = 70, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 10); species_restricted = null},/obj/effect/floor_decal/borderfloorblack{dir = 6},/obj/effect/floor_decal/corner/red/border{dir = 6},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "byf" = (/obj/effect/floor_decal/borderfloorwhite{dir = 10},/obj/effect/floor_decal/corner/red/border{dir = 10},/obj/structure/closet{name = "Evidence Closet"},/turf/simulated/floor/tiled/white,/area/security/forensics) "byg" = (/obj/machinery/light,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled/white,/area/security/forensics)