diff --git a/code/__defines/accessories.dm b/code/__defines/accessories.dm index 5e6eccd03bf..90de1a5df9b 100644 --- a/code/__defines/accessories.dm +++ b/code/__defines/accessories.dm @@ -2,7 +2,6 @@ #define ACCESSORY_SLOT_UTILITY "utility" #define ACCESSORY_SLOT_CAPE "cape" #define ACCESSORY_SLOT_ARMBAND "armband" -#define ACCESSORY_SLOT_BADGE "badge" #define ACCESSORY_SLOT_ARMOR_PLATE "armor plate" #define ACCESSORY_SLOT_LEG_GUARDS "leg guards" #define ACCESSORY_SLOT_ARM_GUARDS "arm guards" diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index d6d7e8bd42c..f5776baab91 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -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( diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 191c182dc74..b43b6227190 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -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" diff --git a/html/changelogs/mattatlas-thanksme.yml b/html/changelogs/mattatlas-thanksme.yml new file mode 100644 index 00000000000..7d1c5762c39 --- /dev/null +++ b/html/changelogs/mattatlas-thanksme.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "You can now wear most accessories on plate carriers once again."