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 0b2bdfbd6ff..c49250b6801 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -199,14 +199,30 @@ new /obj/item/clothing/under/rank/security/corp(src) return -/obj/structure/closet/secure_closet/security/blueshield +/obj/structure/closet/secure_closet/blueshield name = "Blueshield Locker" req_access = list(access_blueshield) + icon_state = "bssecure1" + icon_closed = "bssecure" + icon_locked = "bssecure1" + icon_opened = "bssecureopen" + icon_broken = "bssecurebroken" + icon_off = "bssecureoff" New() ..() + sleep(2) new /obj/item/weapon/storage/firstaid/adv(src) new /obj/item/weapon/gun/projectile/revolver/detective(src) + new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/grenade/flashbang(src) + new /obj/item/weapon/melee/baton(src) + new /obj/item/weapon/gun/energy/taser(src) + new /obj/item/clothing/tie/storage/black_vest(src) + new /obj/item/clothing/glasses/sunglasses(src) + new /obj/item/clothing/under/rank/centcom_officer(src) + new /obj/item/device/flash(src) + new /obj/item/weapon/handcuffs(src) return diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 92b50c1a089..71c5aaa6d9c 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -20,7 +20,17 @@ item_state = "hairflowerp" flags = FPRINT|TABLEPASS - +/obj/item/clothing/under/fluff/WornTurtleneck // DaveTheHeadcrab: Makkota Atani + name = "Worn Combat Turtleneck" + desc = "A worn out turtleneck with 'J.C. NSS Regnare' stitched on the inside of the collar. The tag reveals it to be 99% NanoCotton." + icon= 'icons/obj/clothing/uniforms.dmi' + icon_state = "syndicate" + item_state = "bl_suit" + _color = "syndicate" + has_sensor = 1 // Jumpsuit has no sensor by default + displays_id = 0 // Purely astetic, the ID does not show up on the player sprite when equipped. Examining still reveals it. + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // Standard Security jumpsuit stats + siemens_coefficient = 0. ////////////////////////////////// ////////// Fluff Items /////////// diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index a3955616ba2..f9e89cf8701 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/maps/tgstation-redux-WIP.dmm b/maps/tgstation-redux-WIP.dmm index 6101b12a2b7..8e08ca706c4 100644 --- a/maps/tgstation-redux-WIP.dmm +++ b/maps/tgstation-redux-WIP.dmm @@ -4758,7 +4758,7 @@ "bNz" = (/turf/simulated/floor/airless{dir = 4; icon_state = "warning"},/area/toxins/test_area) "bNA" = (/turf/simulated/floor/airless{tag = "icon-warningcorner (NORTH)"; icon_state = "warningcorner"; dir = 1},/area/toxins/test_area) "bNB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/aft) -"bNC" = (/obj/structure/closet/secure_closet/security/blueshield,/turf/simulated/floor/wood,/area/security/vacantoffice) +"bNC" = (/obj/structure/closet/secure_closet/blueshield,/turf/simulated/floor/wood,/area/security/vacantoffice) "bND" = (/obj/structure/rack,/obj/item/clothing/suit/armor/vest/fluff/deus_blueshield,/obj/item/clothing/suit/storage/lawyer/bluejacket,/obj/item/clothing/tie/blue,/obj/item/weapon/storage/briefcase{pixel_x = 3; pixel_y = 0},/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/shoes/centcom,/obj/item/clothing/under/rank/centcom_officer,/turf/simulated/floor/wood,/area/security/vacantoffice) "bNE" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/turf/simulated/floor/wood,/area/security/vacantoffice) "bNF" = (/obj/machinery/camera{c_tag = "Abandoned Office"; dir = 1; name = "Blueshield Camera"},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/wood,/area/security/vacantoffice)