Clown-Date: Hair and Markings (#1776)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Title. 
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

More options for Clown Characters.


![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/b4a56bee-6c71-4575-8dda-8aa661e07a5b)

## Proof Of Testing

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Clown Hair! Woo! Markings too!
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
This commit is contained in:
Cursor
2024-07-14 16:35:56 +02:00
committed by GitHub
parent 1bf298ed83
commit 540f738872
4 changed files with 89 additions and 71 deletions
@@ -9,7 +9,7 @@
recommended_species = null
/datum/body_marking/bubber/facedisc
name = "Face disc"
name = "Face Disc"
icon_state = "facedisc"
affected_bodyparts = HEAD
@@ -19,7 +19,7 @@
affected_bodyparts = HEAD
/datum/body_marking/bubber/verticalstripe
name = "Vertical stripe"
name = "Vertical Stripe"
icon_state = "verticalstripe"
affected_bodyparts = HEAD
@@ -33,6 +33,18 @@
icon_state = "fangs"
affected_bodyparts = HEAD
/datum/body_marking/bubber/clowncross
name = "Clown Cross"
icon_state = "clowncross"
affected_bodyparts = HEAD
gendered = FALSE
/datum/body_marking/bubber/clownlips
name = "Clown Lips"
icon_state = "clownlips"
affected_bodyparts = HEAD
gendered = FALSE
/datum/body_marking/bubber/longsock
name = "Longsock"
icon_state = "longsock"
@@ -38,6 +38,81 @@
icon_state = "royal_curls"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
/datum/sprite_accessory/hair/bubberclown
name = "Clown"
icon_state = "hair_clown"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
/datum/sprite_accessory/hair/emma
name = "Emma"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_emma"
/datum/sprite_accessory/hair/immovable
name = "Ozen"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_immovable"
/datum/sprite_accessory/hair/damsel
name = "Damsel"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_damsel"
/datum/sprite_accessory/hair/wavylong
name = "Long Wavy"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_wavylong"
/datum/sprite_accessory/hair/wavyovereye
name = "Wavy over eye"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_wavyovereye"
/datum/sprite_accessory/hair/straightovereye
name = "Straight over eye"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightovereye"
/datum/sprite_accessory/hair/straightside
name = "Side Straight"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightside"
/datum/sprite_accessory/hair/straightshort
name = "Straight Long"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightshort"
/datum/sprite_accessory/hair/straightlong
name = "Straight Long"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightlong"
/datum/sprite_accessory/hair/straightfloorlength
name = "Straight Long (Very)"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightfloorlength"
/datum/sprite_accessory/hair/deathhawk
name = "Deathhawk"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_deathhawk"
/datum/sprite_accessory/hair/bedheadhline
name = "Bedhead (+hairline)"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_bedheadhline"
/datum/sprite_accessory/hair/spicyalt
name = "Spicy (Alt)"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_spicyalt"
/datum/sprite_accessory/hair/honse
name = "Honse"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_honse"
//Sprite from Monkestation: https://github.com/Monkestation/MonkeStation
/datum/sprite_accessory/hair/marge
name = "Marge"
@@ -117,72 +192,3 @@
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/emma
name = "Emma"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_emma"
/datum/sprite_accessory/hair/immovable
name = "Ozen"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_immovable"
/datum/sprite_accessory/hair/damsel
name = "Damsel"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_damsel"
/datum/sprite_accessory/hair/wavylong
name = "Long Wavy"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_wavylong"
/datum/sprite_accessory/hair/wavyovereye
name = "Wavy over eye"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_wavyovereye"
/datum/sprite_accessory/hair/straightovereye
name = "Straight over eye"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightovereye"
/datum/sprite_accessory/hair/straightside
name = "Side Straight"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightside"
/datum/sprite_accessory/hair/straightshort
name = "Straight Long"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightshort"
/datum/sprite_accessory/hair/straightlong
name = "Straight Long"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightlong"
/datum/sprite_accessory/hair/straightfloorlength
name = "Straight Long (Very)"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightfloorlength"
/datum/sprite_accessory/hair/deathhawk
name = "Deathhawk"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_deathhawk"
/datum/sprite_accessory/hair/bedheadhline
name = "Bedhead (+hairline)"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_bedheadhline"
/datum/sprite_accessory/hair/spicyalt
name = "Spicy (Alt)"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_spicyalt"
/datum/sprite_accessory/hair/honse
name = "Honse"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_honse"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB