cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature

Browse Source
This commit is contained in:
Fox McCloud
2019-03-22 14:07:46 -04:00
parent 85b9fe2ebe 7b034f567e
commit 4f99cc91d3
23 changed files with 300 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/language.dm
+2 -2
View File
@@ -246,8 +246,8 @@
syllables = list("hs","zt","kr","st","sh")
/datum/language/diona/get_random_name()
var/new_name = "[pick(list("To Sleep Beneath", "Wind Over", "Embrace of", "Dreams of", "Witnessing", "To Walk Beneath", "Approaching the", "Glimmer of", "The Ripple of", "Colors of", "The Still of", "Silence of", "Gentle Breeze of", "Glistening Waters under", "Child of", "Blessed Plant-ling of", "Grass-Walker of", "Element of", "Spawn of"))]"
new_name += " [pick(list("the Void", "the Sky", "Encroaching Night", "Planetsong", "Starsong", "the Wandering Star", "the Empty Day", "Daybreak", "Nightfall", "the Rain", "the Stars", "the Waves", "Dusk", "Night", "the Wind", "the Summer Wind", "the Blazing Sun", "the Scorching Sun", "Eternal Fields", "the Soothing Plains", "the Undying Fiona", "Mother Nature's Bousum"))]"
var/new_name = "[pick(list("To Sleep Beneath", "Wind Over", "Embrace Of", "Dreams Of", "Witnessing", "To Walk Beneath", "Approaching The", "Glimmer Of", "The Ripple Of", "Colors Of", "The Still Of", "Silence Of", "Gentle Breeze Of", "Glistening Waters Under", "Child Of", "Blessed Plant-Ling Of", "Grass-Walker Of", "Element Of", "Spawn Of"))]"
new_name += " [pick(list("The Void", "The Sky", "Encroaching Night", "Planetsong", "Starsong", "The Wandering Star", "The Empty Day", "Daybreak", "Nightfall", "The Rain", "The Stars", "The Waves", "Dusk", "Night", "The Wind", "The Summer Wind", "The Blazing Sun", "The Scorching Sun", "Eternal Fields", "The Soothing Plains", "The Undying Fiona", "Mother Nature's Bousum"))]"
return new_name
/datum/language/trinary
code/modules/mob/new_player/sprite_accessories/human/human_hair.dm
+67
View File
@@ -684,6 +684,73 @@
//////END POLARIS HAIRSTYLES///////
//////////////////////////////////
//////////////////////
////Ume hairstyles////
//////////////////////
/datum/sprite_accessory/hair/eighties_ponytail
name = "80's ponytail"
icon_state = "80_ponytail"
/datum/sprite_accessory/hair/eighties_ponytailalt
name = "80's ponytail alt"
icon_state = "80_ponytail_alt"
/datum/sprite_accessory/hair/big_bow
name = "Big bow"
icon_state = "big_bow"
/datum/sprite_accessory/hair/buns
name = "Buns"
icon_state = "buns"
/datum/sprite_accessory/hair/himecut_long
name = "Himecut long"
icon_state = "himecut_long"
/datum/sprite_accessory/hair/himecut_long_ponytail
name = "Himecut long ponytail"
icon_state = "himecut_long_ponytail"
/datum/sprite_accessory/hair/himecut_ponytail
name = "Himecut ponytail"
icon_state = "himecut_ponytail"
/datum/sprite_accessory/hair/ombre_twintails
name = "Ombre twintails"
icon_state = "ombre_twintails"
/datum/sprite_accessory/hair/ombre_twintails_alt
name = "Ombre twintails alt"
icon_state = "ombre_twintails_alt"
/datum/sprite_accessory/hair/sailor
name = "Sailor"
icon_state = "sailor"
/datum/sprite_accessory/hair/amanita_short
name = "Amanita short"
icon_state = "amanita_short"
/datum/sprite_accessory/hair/long_curls
name = "Long curls"
icon_state = "long_curls"
/datum/sprite_accessory/hair/long_curls_alt
name = "Long curls alt"
icon_state = "long_curls_alt"
/datum/sprite_accessory/hair/long_buns
name = "Long buns"
icon_state = "long_buns"
/datum/sprite_accessory/hair/low_twins
name = "Low twins"
icon_state = "low_twins"
///Ume hairs end here///
///Fluff HairStyles//
/datum/sprite_accessory/hair/fluff/pinapple_fluff_hair //Pineapple Salad hair fluff its for a slime..has to go under human
name = "Sasook Hair"