cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-11 01:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes most accessories being unwearable on plate carriers (#11300)

Browse Source
This commit is contained in:
Matt Atlas
2021-02-24 20:54:03 +01:00
committed by GitHub
parent dd6bee3a0c
commit 471093052e
4 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/clothing/suits/modular_armor.dm
View File

@@ -7,8 +7,8 @@
item_state = "plate_carrier"
blood_overlay_type = "armor"
w_class = ITEMSIZE_NORMAL
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMOR_PLATE, ACCESSORY_SLOT_ARM_GUARDS, ACCESSORY_SLOT_LEG_GUARDS, ACCESSORY_SLOT_ARMOR_POCKETS, ACCESSORY_SLOT_ARMOR_PIN, ACCESSORY_SLOT_CAPE, ACCESSORY_SLOT_BADGE)
valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_PLATE, ACCESSORY_SLOT_ARM_GUARDS, ACCESSORY_SLOT_LEG_GUARDS, ACCESSORY_SLOT_ARMOR_POCKETS, ACCESSORY_SLOT_ARMOR_PIN, ACCESSORY_SLOT_CAPE, ACCESSORY_SLOT_BADGE)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMOR_PLATE, ACCESSORY_SLOT_ARM_GUARDS, ACCESSORY_SLOT_LEG_GUARDS, ACCESSORY_SLOT_ARMOR_POCKETS)
valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_PLATE, ACCESSORY_SLOT_ARM_GUARDS, ACCESSORY_SLOT_LEG_GUARDS, ACCESSORY_SLOT_ARMOR_POCKETS, ACCESSORY_SLOT_GENERIC, ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_CAPE)
/obj/item/clothing/suit/armor/carrier/officer
starting_accessories = list(

1
code/modules/clothing/under/accessories/badges.dm
View File

@@ -11,7 +11,6 @@
item_state = "marshalbadge"
overlay_state = "marshalbadge"
slot_flags = SLOT_BELT | SLOT_TIE
slot = ACCESSORY_SLOT_BADGE
var/stored_name
var/badge_string = "Corporate Security"