Skip to content

Commit

Permalink
very fun
Browse files Browse the repository at this point in the history
  • Loading branch information
Shoddd committed Oct 2, 2024
1 parent 2733261 commit a02ebcb
Show file tree
Hide file tree
Showing 12 changed files with 51 additions and 0 deletions.
10 changes: 10 additions & 0 deletions code/datums/greyscale/config_types/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@
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'
Expand Down
10 changes: 10 additions & 0 deletions code/datums/greyscale/json_configs/opera_gloves.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"greyopera_gloves": [
{
"type": "icon_state",
"icon_state": "opera_gloves",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
10 changes: 10 additions & 0 deletions code/datums/greyscale/json_configs/worn_opera_gloves.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"opera_gloves": [
{
"type": "icon_state",
"icon_state": "opera_gloves",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
7 changes: 7 additions & 0 deletions code/modules/clothing/head/crown.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,10 @@
name = "magnificent crown"
desc = "A crown worn by only the highest emperors of the <s>land</s> space."
icon_state = "fancycrown"


/obj/item/clothing/head/costume/minicrown
name = "Mini crown"
desc = "A cute crown for the cutest prince or princess. Has the initials 'VA' embroidered inside of the cap.."
icon_state = "minicrown"
inhand_icon_state = null
2 changes: 2 additions & 0 deletions code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
/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(
Expand Down Expand Up @@ -281,6 +282,7 @@
/obj/item/clothing/suit/costume/drfreeze_coat = 1,
/obj/item/clothing/under/costume/drfreeze = 1,
/obj/item/clothing/head/costume/drfreezehat = 1,
/obj/item/clothing/head/costume/minicrown = 1,
)
refill_canister = /obj/item/vending_refill/autodrobe
default_price = PAYCHECK_CREW * 0.8 //Default of 40.
Expand Down
Binary file modified icons/mob/clothing/head/costume.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/gloves_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/head/costume.dmi
Binary file not shown.
12 changes: 12 additions & 0 deletions monkestation/code/modules/clothing/gloves/gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,15 @@

/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
Binary file modified monkestation/icons/mob/clothing/gloves.dmi
Binary file not shown.
Binary file modified monkestation/icons/obj/clothing/gloves.dmi
Binary file not shown.

0 comments on commit a02ebcb

Please sign in to comment.