Allows the detective's and nuke op's holsters to be placed in the suit storage slot of armor vests (#59976)

* single line change that will break everything

* now they work even better

* Trailing comma

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
This commit is contained in:
Paxilmaniac
2021-07-04 02:37:30 -07:00
committed by GitHub
co-authored by Mothblocks
parent 3157e7ae3d
commit 92c6b5f4f2
3 changed files with 6 additions and 2 deletions
+4
View File
@@ -207,6 +207,8 @@ GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
/obj/item/restraints/handcuffs,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/storage/belt/holster/detective,
/obj/item/storage/belt/holster/nukie,
)))
GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(
@@ -218,6 +220,8 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(
/obj/item/melee/classic_baton,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/storage/belt/holster/detective,
/obj/item/storage/belt/holster/nukie,
)))
/// String for items placed into the left pocket.
+2 -2
View File
@@ -9,7 +9,7 @@
/obj/item/storage/belt/holster/equipped(mob/user, slot)
. = ..()
if(slot == ITEM_SLOT_BELT)
if(slot == ITEM_SLOT_BELT || ITEM_SLOT_SUITSTORE)
ADD_TRAIT(user, TRAIT_GUNFLIP, CLOTHING_TRAIT)
/obj/item/storage/belt/holster/dropped(mob/user)
@@ -63,7 +63,7 @@
/obj/item/storage/belt/holster/chameleon
name = "syndicate holster"
desc = "A hip holster that uses chameleon technology to disguise itself, it can hold handguns and their ammo."
desc = "A hip holster that uses chameleon technology to disguise itself, due to the added chameleon tech, it cannot be mounted onto armor."
icon_state = "syndicate_holster"
inhand_icon_state = "syndicate_holster"
worn_icon_state = "syndicate_holster"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB