From e354fae541968b68cb7a6c819c6f04c980edfd80 Mon Sep 17 00:00:00 2001 From: David Winters Date: Sat, 10 Apr 2021 03:32:28 -0400 Subject: [PATCH] captain's rapier + belt slot fix --- .../crates_lockers/closets/secure/security_vr.dm | 16 ++++++++++++++++ .../clothing/under/accessories/holster_vr.dm | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm index af14ca3e30c..3d7e899dc22 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm @@ -178,3 +178,19 @@ if(prob(75)) new /obj/item/weapon/storage/backpack/dufflebag/sec(src) return ..() + +/obj/structure/closet/secure_closet/captains + starts_with = list( + /obj/item/weapon/storage/backpack/dufflebag/captain, + /obj/item/clothing/head/helmet, + /obj/item/clothing/suit/storage/vest, + /obj/item/weapon/cartridge/captain, + /obj/item/weapon/storage/lockbox/medal, + /obj/item/device/radio/headset/heads/captain, + /obj/item/device/radio/headset/heads/captain/alt, + /obj/item/weapon/gun/energy/gun, + /obj/item/weapon/melee/telebaton, + /obj/item/device/flash, + /obj/item/weapon/storage/box/ids, + /obj/item/weapon/melee/rapier, + /obj/item/clothing/accessory/holster/machete/rapier) \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/holster_vr.dm b/code/modules/clothing/under/accessories/holster_vr.dm index b4847c06886..b485014e2b8 100644 --- a/code/modules/clothing/under/accessories/holster_vr.dm +++ b/code/modules/clothing/under/accessories/holster_vr.dm @@ -8,7 +8,7 @@ desc = "A beautiful red sheath, probably for a beautiful blade." icon = 'icons/obj/clothing/ties_vr.dmi' icon_state = "sheath" - slot = SLOT_BELT | ACCESSORY_SLOT_WEAPON + slot_flags = SLOT_BELT | ACCESSORY_SLOT_WEAPON var/has_full_icon = 1 icon_override = 'icons/mob/ties_vr.dmi' overlay_state = "sheath"