diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index cb92962d6752..5feff2c8bd24 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -107,16 +107,6 @@ icon_file = 'icons/mob/inhands/clothing/gloves_righthand.dmi' json_config = 'code/datums/greyscale/json_configs/gloves_inhand.json' -/datum/greyscale_config/opera_gloves - name = "Opera gloves" - icon_file = 'monkestation/icons/obj/clothing/gloves.dmi' - json_config = 'code/datums/greyscale/json_configs/opera_gloves.json' - -/datum/greyscale_config/opera_gloves_worn - name = "Opera gloves worn" - icon_file = 'monkestation/icons/mob/clothing/gloves.dmi' - json_config = 'code/datums/greyscale/json_configs/opera_gloves.json' - /datum/greyscale_config/jumpsuit name = "Jumpsuit" icon_file = 'icons/obj/clothing/under/color.dmi' diff --git a/code/datums/greyscale/json_configs/opera_gloves.json b/code/datums/greyscale/json_configs/opera_gloves.json deleted file mode 100644 index 5b87a79d22e7..000000000000 --- a/code/datums/greyscale/json_configs/opera_gloves.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "greyopera_gloves": [ - { - "type": "icon_state", - "icon_state": "opera_gloves", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ] -} diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 025f646d206b..a9b9b5e36e95 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -168,7 +168,6 @@ /obj/item/clothing/suit/costume/cheongsam_blue = 1, /obj/item/clothing/under/wonka = 1, /obj/item/clothing/shoes/heels = 4, // MONKESTATION EDIT ADDITION - /obj/item/clothing/gloves/operagloves = 1, ), ), list( diff --git a/monkestation/code/modules/clothing/gloves/gloves.dm b/monkestation/code/modules/clothing/gloves/gloves.dm index 502363936b1f..9f5474a0f0e3 100644 --- a/monkestation/code/modules/clothing/gloves/gloves.dm +++ b/monkestation/code/modules/clothing/gloves/gloves.dm @@ -53,14 +53,3 @@ /datum/armor/surgeon bio = 100 -/obj/item/clothing/gloves/operagloves - name = "opera gloves" - desc = "Long, silky gloves made for the finest of events. Under the internal hem has 'VA' embroidered" - inhand_icon_state = null - icon = 'monkestation/icons/obj/clothing/gloves.dmi' - worn_icon = 'monkestation/icons/mob/clothing/gloves.dmi' - icon_state = "opera_gloves" - greyscale_colors = "#FFFFFF" - greyscale_config = /datum/greyscale_config/opera_gloves - greyscale_config_worn = /datum/greyscale_config/opera_gloves_worn - flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/monkestation/code/modules/loadouts/items/heads.dm b/monkestation/code/modules/loadouts/items/heads.dm index 6574c29673f2..cc6016fc79b1 100644 --- a/monkestation/code/modules/loadouts/items/heads.dm +++ b/monkestation/code/modules/loadouts/items/heads.dm @@ -183,6 +183,10 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea name = "Bowler Hat" item_path = /obj/item/clothing/head/hats/bowler +/datum/loadout_item/head/mini_crown + name = "Mini Crown" + item_path = /obj/item/clothing/head/costume/minicrown + /datum/loadout_item/head/tragic name = "Tragic Mime Headpiece" item_path = /obj/item/clothing/head/tragic diff --git a/monkestation/code/modules/store/store_items/head.dm b/monkestation/code/modules/store/store_items/head.dm index 1d4dce0102b9..195f6a3bc867 100644 --- a/monkestation/code/modules/store/store_items/head.dm +++ b/monkestation/code/modules/store/store_items/head.dm @@ -178,6 +178,11 @@ GLOBAL_LIST_INIT(store_head, generate_store_items(/datum/store_item/head)) item_path = /obj/item/clothing/head/hats/bowler item_cost = 3000 +/datum/store_item/head/mini_crown + name = "Mini Crown" + item_path = /obj/item/clothing/head/costume/minicrown + item_cost = 3000 + /* * HALLOWEEN */ diff --git a/monkestation/icons/mob/clothing/gloves.dmi b/monkestation/icons/mob/clothing/gloves.dmi index 7de092815019..960bf8462f9e 100644 Binary files a/monkestation/icons/mob/clothing/gloves.dmi and b/monkestation/icons/mob/clothing/gloves.dmi differ diff --git a/monkestation/icons/obj/clothing/gloves.dmi b/monkestation/icons/obj/clothing/gloves.dmi index 22cf05f47f53..90b9210e13a1 100644 Binary files a/monkestation/icons/obj/clothing/gloves.dmi and b/monkestation/icons/obj/clothing/gloves.dmi differ