Merge pull request #6164 from CHOMPStation2/upstream-merge-14823

[MIRROR] Added striped dungarees and tiny tophat
This commit is contained in:
Nadyr
2023-04-30 22:49:59 -04:00
committed by GitHub
8 changed files with 32 additions and 2 deletions

View File

@@ -98,3 +98,9 @@ Talon hats
/datum/gear/head/beret/talon
display_name = "beret, Talon"
path = /obj/item/clothing/head/beret
// tiny tophat
/datum/gear/head/tiny_tophat
display_name = "tiny tophat"
path = /obj/item/clothing/head/tinytophat

View File

@@ -369,4 +369,10 @@ Talon jumpsuit
"jumper skirt"=/obj/item/clothing/under/skirt/colorable/jumper,
"jumper dress"=/obj/item/clothing/under/skirt/colorable/jumperdress
)
gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice)
gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice)
// gwen beedells clown clothes
/datum/gear/uniform/stripeddungarees
display_name = "striped dungarees"
path = /obj/item/clothing/under/stripeddungarees

View File

@@ -163,3 +163,12 @@
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
)
// tiny tophat
/obj/item/clothing/head/tinytophat
name = "tiny tophat"
desc = "A tophat that is far too small to properly sit on someone's head!"
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "tiny_tophat"

View File

@@ -586,4 +586,13 @@
desc = "A dress held up by suspenders. Not quite a skirt anymore."
icon_state = "skirt_jumperdress"
item_state = "skirt_jumperdress"
worn_state = "skirt_jumperdress"
worn_state = "skirt_jumperdress"
// Gwen Beedell's clown outfit
/obj/item/clothing/under/stripeddungarees
name = "striped dungarees"
desc = "A colourful set of striped dungarees, pretty funny lookin'."
icon = 'icons/inventory/uniform/item_vr.dmi'
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "striped_clown_uniform"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 100 KiB