diff --git a/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm b/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm index 817c83f312d..4ca7cbbe51b 100644 --- a/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm +++ b/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm @@ -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" diff --git a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm index 639410bc846..7aa13521909 100644 --- a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -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" diff --git a/modular_zubbers/icons/mob/body_markings/markings.dmi b/modular_zubbers/icons/mob/body_markings/markings.dmi index d64ac5a24ec..eb298ef5d26 100644 Binary files a/modular_zubbers/icons/mob/body_markings/markings.dmi and b/modular_zubbers/icons/mob/body_markings/markings.dmi differ diff --git a/modular_zubbers/icons/mob/species/human/humanface.dmi b/modular_zubbers/icons/mob/species/human/humanface.dmi index 8d84e240d42..71db7abad89 100644 Binary files a/modular_zubbers/icons/mob/species/human/humanface.dmi and b/modular_zubbers/icons/mob/species/human/humanface.dmi differ