Skip to content

Commit

Permalink
Merge pull request #4 from Constellado/Constellad's-Host-Extras
Browse files Browse the repository at this point in the history
Moves drag's earlier PR to a new modules folder.
  • Loading branch information
Constellado authored Jun 14, 2024
2 parents 0906df8 + 43efab4 commit 682c824
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 1 deletion.
89 changes: 89 additions & 0 deletions PentestModules/code/mob/hair.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
//Hairsyles for Pentest!!

/* Got new hair that you made yourself? Make a dmi named hair.dmi with it inside, put it in PentestModules/icons/mob/ and uncomment this!!
/datum/sprite_accessory/hair/pentest
icon = 'PentestModules/icons/mob/hair.dmi'
datum/sprite_accessory/hair/pentest/hairnamehere
name = "Hair Name Here"
icon_state = "hair_name_here"
*/

/datum/sprite_accessory/hair/pentest/maplehair
icon = 'PentestModules/icons/mob/maplehair.dmi'

/*
/////////////////////////////////////
/ =---------------------------= /
/ =Hairstyles from MapleStation = /
/ =---------------------------= /
/////////////////////////////////////
*/
/datum/sprite_accessory/hair/pentest/maplehair/overeyebraid
name = "Over Eye Braid"
icon_state = "hair_overeyebraid"

/datum/sprite_accessory/hair/maplehair/messy_pigtail
name = "Messy Pigtails"
icon_state = "hair_pigtailmessy"

/datum/sprite_accessory/hair/maplehair/unkempt
name = "Unkept Short"
icon_state = "hair_unkempt"

/datum/sprite_accessory/hair/maplehair/styledponytail
name = "Styled Ponytail"
icon_state = "hair_styled"

/datum/sprite_accessory/hair/maplehair/researcher
name = "Researcher Curls"
icon_state = "hair_researcher"

/datum/sprite_accessory/hair/maplehair/paperlike
name = "Long and Wide"
icon_state = "hair_paperlike"

/datum/sprite_accessory/hair/maplehair/monalisa
name = "Mona Lisa"
icon_state = "hair_monalisa"

/datum/sprite_accessory/hair/maplehair/messystripe
name = "Messy Stripe"
icon_state = "hair_messystripe"

/datum/sprite_accessory/hair/maplehair/loseponytail
name = "Lose Ponytail"
icon_state = "hair_loosepony"

/datum/sprite_accessory/hair/maplehair/disheveled
name = "Disheveled"
icon_state = "hair_disheveled"

/datum/sprite_accessory/hair/maplehair/noblebun
name = "Noble Bun"
icon_state = "hair_noblebun"

/datum/sprite_accessory/hair/maplehair/messythorns
name = "Thorny Long"
icon_state = "hair_thorns"

/datum/sprite_accessory/hair/maplehair/princely
name = "Princely"
icon_state = "hair_princely"

/datum/sprite_accessory/hair/maplehair/oldmanyaoi
name = "Side Styled"
icon_state = "hair_oldstriped"

/datum/sprite_accessory/hair/maplehair/oldmanyaoibutagain
name = "Short Styled"
icon_state = "hair_fruity"
//Maple station hair over



/*
--ADD MORE HAIR HERE--
*/
Empty file.
Binary file added PentestModules/icons/mob/maplehair.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- **Discord:** <https://shiptest.net/discord>
- **Coderbus Discord:** <https://discord.gg/Vh8TJp9>

This is the codebase for the Ship-based Shiptest flavoured fork of SpaceStation 13.
This is Constellado's fork of the Ship-based Shiptest flavoured fork of SpaceStation 13.

Shiptest is a thrill-packed round-based exploration and roleplaying game set against the backdrop of a whimsical metal spacefaring machine masquerading as a spaceship, with charming spritework designed to represent the sci-fi setting and it's dangerous undertones. Have fun, and survive with your crew!

Expand Down
1 change: 1 addition & 0 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3490,4 +3490,5 @@
#include "interface\menu.dm"
#include "interface\stylesheet.dm"
#include "interface\skin.dmf"
#include "PentestModules\code\mob\hair.dm"
// END_INCLUDE

0 comments on commit 682c824

Please sign in to comment.