Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins

# Conflicts: # code/modules/mob/new_player/sprite_accessories.dm # code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm # icons/mob/human_face.dmi # icons/mob/suit.dmi
2026-08-27 22:16:23 +01:00 · 2017-01-17 22:05:38 -06:00
parent 2c86a0a465 b0faa7c06c
commit d53cfc4773
137 changed files with 2730 additions and 596 deletions
@@ -60,6 +60,11 @@
 			else
 				output += "<p><a href='byond://?src=\ref[src];showpoll=1'>Show Player Polls</A></p>"

+	if(client.check_for_new_server_news())
+		output += "<p><b><a href='byond://?src=\ref[src];shownews=1'>Show News</A> (NEW!)</b></p>"
+	else
+		output += "<p><a href='byond://?src=\ref[src];shownews=1'>Show News</A></p>"
+
 	output += "</div>"

 	panel = new(src, "Welcome","Welcome", 210, 280, src)
@@ -277,6 +282,29 @@
 					if(!isnull(href_list["option_[optionid]"]))	//Test if this optionid was selected
 						vote_on_poll(pollid, optionid, 1)

+	if(href_list["shownews"])
+		handle_server_news()
+		return
+
+/mob/new_player/proc/handle_server_news()
+	if(!client)
+		return
+	var/savefile/F = get_server_news()
+	if(F)
+		client.prefs.lastnews = md5(F["body"])
+		client.prefs.save_preferences()
+
+		var/dat = "<html><body><center>"
+		dat += "<h1>[F["title"]]</h1>"
+		dat += "<br>"
+		dat += "[F["body"]]"
+		dat += "<br>"
+		dat += "<font size='2'><i>Last written by [F["author"]], on [F["timestamp"]].</i></font>"
+		dat += "</center></body></html>"
+		var/datum/browser/popup = new(src, "Server News", "Server News", 450, 300, src)
+		popup.set_content(dat)
+		popup.open()
+
 /mob/new_player/proc/IsJobAvailable(rank)
 	var/datum/job/job = job_master.GetJob(rank)
 	if(!job)	return 0
@@ -61,51 +61,6 @@
 		name = "Short Hair 2"
 		icon_state = "hair_shorthair3"

-	teshari
-		name = "Teshari Default"
-		icon_state = "seromi_default"
-		species_allowed = list("Teshari")
-
-	teshari_altdefault
-		name = "Teshari Alt. Default"
-		icon_state = "seromi_ears"
-		species_allowed = list("Teshari")
-
-	teshari_tight
-		name = "Teshari Tight"
-		icon_state = "seromi_tight"
-		species_allowed = list("Teshari")
-
-	teshari_excited
-		name = "Teshari Spiky"
-		icon_state = "seromi_spiky"
-		species_allowed = list("Teshari")
-
-	teshari_spike
-		name = "Teshari Spike"
-		icon_state = "seromi_spike"
-		species_allowed = list("Teshari")
-
-	teshari_long
-		name = "Teshari Overgrown"
-		icon_state = "seromi_long"
-		species_allowed = list("Teshari")
-
-	teshari_burst
-		name = "Teshari Starburst"
-		icon_state = "seromi_burst"
-		species_allowed = list("Teshari")
-
-	teshari_shortburst
-		name = "Teshari Short Starburst"
-		icon_state = "seromi_burst_short"
-		species_allowed = list("Teshari")
-
-	teshari_mohawk
-		name = "Teshari Mohawk"
-		icon_state = "seromi_mohawk"
-		species_allowed = list("Teshari")
-
 	cut
 		name = "Cut Hair"
 		icon_state = "hair_c"
@@ -328,6 +283,10 @@
 		name = "Emo"
 		icon_state = "hair_emo"

+	emo2
+		name = "Emo Alt"
+		icon_state = "hair_emo2"
+
 	longemo
 		name = "Long Emo"
 		icon_state = "hair_emolong"
@@ -522,6 +481,60 @@
 		name = "Oxton"
 		icon_state = "hair_oxton"

+	lowfade
+		name = "Low Fade"
+		icon_state = "hair_lowfade"
+		gender = MALE
+
+	medfade
+		name = "Medium Fade"
+		icon_state = "hair_medfade"
+
+	highfade
+		name = "High Fade"
+		icon_state = "hair_highfade"
+		gender = MALE
+
+	baldfade
+		name = "Balding Fade"
+		icon_state = "hair_baldfade"
+		gender = MALE
+
+	nofade
+		name = "Regulation Cut"
+		icon_state = "hair_nofade"
+		gender = MALE
+
+	trimflat
+		name = "Trimmed Flat Top"
+		icon_state = "hair_trimflat"
+		gender = MALE
+
+	trimmed
+		name = "Trimmed"
+		icon_state = "hair_trimmed"
+		gender = MALE
+
+	tightbun
+		name = "Tight Bun"
+		icon_state = "hair_tightbun"
+		gender = FEMALE
+
+	coffeehouse
+		name = "Coffee House Cut"
+		icon_state = "hair_coffeehouse"
+		gender = MALE
+
+	undercut
+		name = "Undercut"
+		icon_state = "hair_undercut"
+		gender = MALE
+
+	partfade
+		name = "Parted Fade"
+		icon_state = "hair_shavedpart"
+		gender = MALE
+

 /*
 ///////////////////////////////////
@@ -542,24 +555,6 @@
 		gender = NEUTER
 		species_allowed = list("Human","Unathi","Tajara","Skrell", "Machine","Teshari", "Vox")

-	teshari_beard
-		name = "Teshari Beard"
-		icon_state = "seromi_chin"
-		species_allowed = list("Teshari")
-		gender = NEUTER
-
-	teshari_scraggly
-		name = "Teshari Scraggly"
-		icon_state = "seromi_scraggly"
-		species_allowed = list("Teshari")
-		gender = NEUTER
-
-	teshari_chops
-		name = "Teshari Chops"
-		icon_state = "seromi_gap"
-		species_allowed = list("Teshari")
-		gender = NEUTER
-
 	watson
 		name = "Watson Mustache"
 		icon_state = "facial_watson"
@@ -629,31 +624,41 @@
 		name = "Dwarf Beard"
 		icon_state = "facial_dwarf"

-	shadow
-		name = "Five O'Clock Shadow"
-		icon_state = "facial_shadow"
+		threeOclock
+		name = "3 O'clock Shadow"
+		icon_state = "facial_3oclock"

-//unathi horn beards and the like
+	threeOclockstache
+		name = "3 O'clock Shadow and Moustache"
+		icon_state = "facial_3oclockmoustache"

-	una_chinhorn
-		name = "Unathi Chin Horn"
-		icon_state = "facial_chinhorns"
-		species_allowed = list("Unathi")
+	fiveOclock
+		name = "5 O'clock Shadow"
+		icon_state = "facial_5oclock"

-	una_hornadorns
-		name = "Unathi Horn Adorns"
-		icon_state = "facial_hornadorns"
-		species_allowed = list("Unathi")
+	fiveOclockstache
+		name = "5 O'clock Shadow and Moustache"
+		icon_state = "facial_5oclockmoustache"

-	una_spinespikes
-		name = "Unathi Spine Spikes"
-		icon_state = "facial_spikes"
-		species_allowed = list("Unathi")
+	sevenOclock
+		name = "7 O'clock Shadow"
+		icon_state = "facial_7oclock"

-	una_dorsalfrill
-		name = "Unathi Dorsal Frill"
-		icon_state = "facial_dorsalfrill"
-		species_allowed = list("Unathi")
+	sevenOclockstache
+		name = "7 O'clock Shadow and Moustache"
+		icon_state = "facial_7oclockmoustache"
+
+	mutton
+		name = "Mutton Chops"
+		icon_state = "facial_mutton"
+
+	muttonstache
+		name = "Mutton Chops and Moustache"
+		icon_state = "facial_muttonmus"
+
+	walrus
+		name = "Walrus Moustache"
+		icon_state = "facial_walrus"

 /*
 ///////////////////////////////////
@@ -709,6 +714,7 @@
 		icon_state = "unathi_sidefrills"
 		species_allowed = list("Unathi")

+//Skrell 'hairstyles'
 	skr_tentacle_m
 		name = "Skrell Male Tentacles"
 		icon_state = "skrell_hair_m"
@@ -721,6 +727,7 @@
 		species_allowed = list("Skrell")
 		gender = FEMALE

+//Tajaran hairstyles
 	taj_ears
 		name = "Tajaran Ears"
 		icon_state = "ears_plain"
@@ -806,6 +813,77 @@
 		icon_state = "hair_fingerwave"
 		species_allowed = list("Tajara")

+//Teshari things
+	teshari
+		name = "Teshari Default"
+		icon_state = "teshari_default"
+		species_allowed = list("Teshari")
+
+	teshari_altdefault
+		name = "Teshari Alt. Default"
+		icon_state = "teshari_ears"
+		species_allowed = list("Teshari")
+
+	teshari_tight
+		name = "Teshari Tight"
+		icon_state = "teshari_tight"
+		species_allowed = list("Teshari")
+
+	teshari_excited
+		name = "Teshari Spiky"
+		icon_state = "teshari_spiky"
+		species_allowed = list("Teshari")
+
+	teshari_spike
+		name = "Teshari Spike"
+		icon_state = "teshari_spike"
+		species_allowed = list("Teshari")
+
+	teshari_long
+		name = "Teshari Overgrown"
+		icon_state = "teshari_long"
+		species_allowed = list("Teshari")
+
+	teshari_burst
+		name = "Teshari Starburst"
+		icon_state = "teshari_burst"
+		species_allowed = list("Teshari")
+
+	teshari_shortburst
+		name = "Teshari Short Starburst"
+		icon_state = "teshari_burst_short"
+		species_allowed = list("Teshari")
+
+	teshari_mohawk
+		name = "Teshari Mohawk"
+		icon_state = "teshari_mohawk"
+		species_allowed = list("Teshari")
+
+	teshari_pointy
+		name = "Teshari Pointy"
+		icon_state = "teshari_pointy"
+		species_allowed = list("Teshari")
+
+	teshari_upright
+		name = "Teshari Upright"
+		icon_state = "teshari_upright"
+		species_allowed = list("Teshari")
+
+	teshari_mane
+		name = "Teshari Mane"
+		icon_state = "teshari_mane"
+		species_allowed = list("Teshari")
+
+	teshari_droopy
+		name = "Teshari Droopy"
+		icon_state = "teshari_droopy"
+		species_allowed = list("Teshari")
+
+	teshari_mushroom
+		name = "Teshari Mushroom"
+		icon_state = "teshari_mushroom"
+		species_allowed = list("Teshari")
+
 	vox_quills_short
 		name = "Short Vox Quills"
 		icon_state = "vox_shortquills"
@@ -853,6 +931,48 @@
 		icon_state = "facial_smallstache"
 		species_allowed = list("Tajara")

+//unathi horn beards and the like
+
+	una_chinhorn
+		name = "Unathi Chin Horn"
+		icon_state = "facial_chinhorns"
+		species_allowed = list("Unathi")
+
+	una_hornadorns
+		name = "Unathi Horn Adorns"
+		icon_state = "facial_hornadorns"
+		species_allowed = list("Unathi")
+
+	una_spinespikes
+		name = "Unathi Spine Spikes"
+		icon_state = "facial_spikes"
+		species_allowed = list("Unathi")
+
+	una_dorsalfrill
+		name = "Unathi Dorsal Frill"
+		icon_state = "facial_dorsalfrill"
+		species_allowed = list("Unathi")
+
+
+//Teshari things
+	teshari_beard
+		name = "Teshari Beard"
+		icon_state = "teshari_chin"
+		species_allowed = list("Teshari")
+		gender = NEUTER
+
+	teshari_scraggly
+		name = "Teshari Scraggly"
+		icon_state = "teshari_scraggly"
+		species_allowed = list("Teshari")
+		gender = NEUTER
+
+	teshari_chops
+		name = "Teshari Chops"
+		icon_state = "teshari_gap"
+		species_allowed = list("Teshari")
+		gender = NEUTER
+
 //skin styles - WIP
 //going to have to re-integrate this with surgery
 //let the icon_state hold an icon preview for now