From 43efab49728875e18f33c17f4cd7963a9b2fecbd Mon Sep 17 00:00:00 2001 From: Constellado Date: Fri, 14 Jun 2024 15:52:04 +1200 Subject: [PATCH] Moves PR#3 to a special pentest modules folder. --- PentestModules/code/mob/hair.dm | 89 +++++++++++++++++++++++++ PentestModules/icons/mob/maplehair.dmi | Bin 0 -> 10979 bytes shiptest.dme | 1 + 3 files changed, 90 insertions(+) create mode 100644 PentestModules/code/mob/hair.dm create mode 100644 PentestModules/icons/mob/maplehair.dmi diff --git a/PentestModules/code/mob/hair.dm b/PentestModules/code/mob/hair.dm new file mode 100644 index 000000000000..ae17e0810b90 --- /dev/null +++ b/PentestModules/code/mob/hair.dm @@ -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-- +*/ diff --git a/PentestModules/icons/mob/maplehair.dmi b/PentestModules/icons/mob/maplehair.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a2b3d3f415cdef3f012a2982e8095948db7dadb1 GIT binary patch literal 10979 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 HWbFHIBfCk% literal 0 HcmV?d00001 diff --git a/shiptest.dme b/shiptest.dme index 70a39551e007..815968885fe9 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3490,4 +3490,5 @@ #include "interface\menu.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" +#include "PentestModules\code\mob\hair.dm" // END_INCLUDE