From 09b9be4b72bc1b32ad31b3aabd32d8203b555f61 Mon Sep 17 00:00:00 2001 From: Mark9013100 Date: Fri, 11 Dec 2015 22:43:13 -0500 Subject: [PATCH] Adds a detective belt and other edits for security --- code/datums/supplypacks.dm | 1 + code/game/jobs/job/security.dm | 1 + .../objects/items/weapons/storage/belt.dm | 31 +++++++++++++++++++ .../crates_lockers/closets/secure/security.dm | 1 + maps/polaris-1.dmm | 2 +- 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index ea7a4d3f75..3fedc25800 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1651,6 +1651,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/device/camera, /obj/item/weapon/folder/red, /obj/item/weapon/folder/blue, + /obj/item/weapon/storage/belt/detective, /obj/item/clothing/gloves/black, /obj/item/device/taperecorder, /obj/item/device/mass_spectrometer, diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 4bf3fd442a..cc09386234 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -148,6 +148,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store) H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) if(H.backbag == 1) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 98eaeff727..4d4c9cb1e5 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -139,6 +139,37 @@ /obj/item/weapon/gun/projectile/colt/detective ) +/obj/item/weapon/storage/belt/detective + name = "forensic utility belt" + desc = "A belt for holding forensics equipment." + icon_state = "securitybelt" + item_state = "security" + storage_slots = 7 + max_w_class = 3 + can_hold = list( + /obj/item/device/taperecorder, + /obj/item/clothing/glasses, + /obj/item/device/flashlight, + /obj/item/weapon/reagent_containers/spray/luminol, + /obj/item/weapon/sample, + /obj/item/weapon/forensics/sample_kit/powder, + /obj/item/weapon/forensics/swab, + /obj/item/device/uv_light, + /obj/item/weapon/forensics/slide, + /obj/item/weapon/forensics/sample_kit, + /obj/item/weapon/photo, + /obj/item/device/camera_film, + /obj/item/device/camera, + /obj/item/weapon/autopsy_scanner, + /obj/item/device/mass_spectrometer, + /obj/item/device/reagent_scanner, + /obj/item/weapon/reagent_containers/dropper, + /obj/item/weapon/reagent_containers/syringe, + /obj/item/device/pda, + /obj/item/device/radio/headset, + /obj/item/taperoll/police + ) + /obj/item/weapon/storage/belt/soulstone name = "soul stone belt" desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away" 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 21022bceaa..7e74224156 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -278,6 +278,7 @@ new /obj/item/clothing/head/det(src) new /obj/item/clothing/head/det/grey(src) new /obj/item/clothing/shoes/laceup(src) + new /obj/item/weapon/storage/belt/detective(src) new /obj/item/weapon/storage/box/evidence(src) new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/device/radio/headset/headset_sec/alt(src) diff --git a/maps/polaris-1.dmm b/maps/polaris-1.dmm index ff4f890a51..47863941af 100644 --- a/maps/polaris-1.dmm +++ b/maps/polaris-1.dmm @@ -1166,7 +1166,7 @@ "awv" = (/obj/structure/table/standard,/obj/item/weapon/folder/red,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/main) "aww" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/red{dir = 9},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/security/brig) "awx" = (/obj/structure/table/standard,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/item/clothing/accessory/badge/holo,/obj/item/clothing/accessory/badge/holo,/obj/item/clothing/accessory/badge/holo/cord,/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/tiled,/area/security/security_lockerroom) -"awy" = (/obj/structure/table/standard,/obj/structure/reagent_dispensers/peppertank{pixel_x = 30},/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/simulated/floor/tiled,/area/security/security_lockerroom) +"awy" = (/obj/structure/table/standard,/obj/structure/reagent_dispensers/peppertank{pixel_x = 30},/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "awz" = (/obj/structure/curtain/open/shower/security,/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/northleft{name = "Shower"; req_access = list()},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "awA" = (/obj/structure/curtain/open/shower/security,/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/window/northright{dir = 1; name = "Shower"; req_access = list()},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "awB" = (/obj/structure/toilet{dir = 1},/obj/machinery/light/small{brightness_color = "#DA0205"; brightness_power = 1; brightness_range = 5},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom)