Skip to content

Commit

Permalink
Merge pull request #188 from Fluffy-Frontier/upstream-mirror-24440
Browse files Browse the repository at this point in the history
[MIRROR] [DONATOR] Dragon maid uniform
  • Loading branch information
ReezeBL authored Oct 20, 2023
2 parents 1cb737f + b9daf63 commit dbb5262
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 0 deletions.
Binary file not shown.
Binary file modified modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -1724,4 +1724,15 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)

return ..()

/obj/item/clothing/under/costume/dragon_maid
name = "dragon maid uniform"
desc = "A uniform for a kitchen maid, stylized to have draconic detailing."
icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi'
worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi'
icon_state = "dragon_maid"
body_parts_covered = CHEST|GROIN
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
can_adjust = FALSE

#undef NOBILITY_DRESSCOAT_WASHING_CREDITS_NEEDED
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,11 @@
item_path = /obj/item/clothing/suit/toggle/labcoat/medical/vic_dresscoat_donator
ckeywhitelist = list("nikotheguydude")

/datum/loadout_item/under/formal/dragon_maid
name = "Dragon Maid Uniform"
item_path = /obj/item/clothing/under/costume/dragon_maid
ckeywhitelist = list("sigmaralkahest")

/datum/loadout_item/head/catear_headphone
name = "Cat-Ear Headphones"
item_path = /obj/item/instrument/piano_synth/headphones/catear_headphone
Expand Down

0 comments on commit dbb5262

Please sign in to comment.