Polaris sync

code/modules/mob/dead/observer/observer.dm

@@ -32,7 +32,7 @@ var/global/list/image/ghost_sightless_images = list() //this is a list of images
 	var/anonsay = 0
 	var/image/ghostimage = null //this mobs ghost image, for deleting and stuff
 	var/ghostvision = 1 //is the ghost able to see things humans can't?
-	var/seedarkness = 1
+//	var/seedarkness = 1
 	incorporeal_move = 1
 
 	var/is_manifest = 0 //If set to 1, the ghost is able to whisper. Usually only set if a cultist drags them through the veil.
@@ -43,7 +43,6 @@ var/global/list/image/ghost_sightless_images = list() //this is a list of images
 		"Bland" = "ghost",
 		"Robed-B" = "ghost1",
 		"Robed-BAlt" = "ghost2",
-		"Corgi" = "corgi",
 		"King" = "ghostking",
 		"Shade" = "shade",
 		"Hecate" = "ghost-narsie",
@@ -53,11 +52,27 @@ var/global/list/image/ghost_sightless_images = list() //this is a list of images
 		"Harvester" = "harvester",
 		"Wraith" = "wraith",
 		"Viscerator" = "viscerator",
+		"Corgi" = "corgi",
+		"Tamaskan" = "tamaskan",
+		"Black Cat" = "blackcat",
+		"Lizard" = "lizard",
+		"Goat" = "goat",
+		"Space Bear" = "bear",
 		"Bats" = "bat",
+		"Chicken" = "chicken_white",
+		"Parrot"= "parrot_fly",
+		"Goose" = "goose",
+		"Penguin" = "penguin",
+		"Brown Crab" = "crab",
+		"Gray Crab" = "evilcrab",
+		"Trout" = "trout-swim",
+		"Salmon" = "salmon-swim",
+		"Pike" = "pike-swim",
+		"Koi" = "koi-swim",
+		"Carp" = "carp",
 		"Red Robes" = "robe_red",
 		"Faithless" = "faithless",
 		"Shadowform" = "forgotten",
-		"Black Cat" = "blackcat",
 		"Dark Ethereal" = "bloodguardian",
 		"Holy Ethereal" = "lightguardian",
 		"Red Elemental" = "magicRed",
@@ -69,8 +84,6 @@ var/global/list/image/ghost_sightless_images = list() //this is a list of images
 		"Guard Spider" = "guard",
 		"Hunter Spider" = "hunter",
 		"Nurse Spider" = "nurse",
-		"Carp" = "carp",
-		"Space Bear" = "bear",
 		"Rogue Drone" = "drone",
 		"ED-209" = "ed209",
 		"Beepsky" = "secbot"
@@ -290,10 +303,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		return
 	if(medHUD)
 		medHUD = 0
-		src << "\blue <B>Medical HUD Disabled</B>"
+		src << "<font color='blue'><B>Medical HUD Disabled</B></font>"
 	else
 		medHUD = 1
-		src << "\blue <B>Medical HUD Enabled</B>"
+		src << "<font color='blue'><B>Medical HUD Enabled</B></font>"
 
 /mob/observer/dead/verb/toggle_antagHUD()
 	set category = "Ghost"
@@ -304,11 +317,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		return
 	var/mentor = is_mentor(usr.client)
 	if(!config.antag_hud_allowed && (!client.holder || mentor))
-		src << "\red Admins have disabled this for this round."
+		src << "<font color='red'>Admins have disabled this for this round.</font>"
 		return
 	var/mob/observer/dead/M = src
 	if(jobban_isbanned(M, "AntagHUD"))
-		src << "\red <B>You have been banned from using this feature</B>"
+		src << "<font color='red'><B>You have been banned from using this feature</B></font>"
 		return
 	if(config.antag_hud_restricted && !M.has_enabled_antagHUD && (!client.holder || mentor))
 		var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No")
@@ -318,10 +331,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		M.has_enabled_antagHUD = 1
 	if(M.antagHUD)
 		M.antagHUD = 0
-		src << "\blue <B>AntagHUD Disabled</B>"
+		src << "<font color='blue'><B>AntagHUD Disabled</B></font>"
 	else
 		M.antagHUD = 1
-		src << "\blue <B>AntagHUD Enabled</B>"
+		src << "<font color='blue'><B>AntagHUD Enabled</B></font>"
 
 /mob/observer/dead/proc/dead_tele(var/area/A in return_sorted_areas())
 	set category = "Ghost"
@@ -453,11 +466,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 /mob/observer/dead/memory()
 	set hidden = 1
-	src << "\red You are dead! You have no mind to store memory!"
+	src << "<font color='red'>You are dead! You have no mind to store memory!</font>"
 
 /mob/observer/dead/add_memory()
 	set hidden = 1
-	src << "\red You are dead! You have no mind to store memory!"
+	src << "<font color='red'>You are dead! You have no mind to store memory!</font>"
 
 /mob/observer/dead/Post_Incorpmove()
 	following = null
@@ -477,16 +490,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	var/pressure = environment.return_pressure()
 	var/total_moles = environment.total_moles
 
-	src << "\blue <B>Results:</B>"
+	src << "<font color='blue'><B>Results:</B></font>"
 	if(abs(pressure - ONE_ATMOSPHERE) < 10)
-		src << "\blue Pressure: [round(pressure,0.1)] kPa"
+		src << "<font color='blue'>Pressure: [round(pressure,0.1)] kPa</font>"
 	else
-		src << "\red Pressure: [round(pressure,0.1)] kPa"
+		src << "<font color='red'>Pressure: [round(pressure,0.1)] kPa</font>"
 	if(total_moles)
 		for(var/g in environment.gas)
-			src << "\blue [gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)"
-		src << "\blue Temperature: [round(environment.temperature-T0C,0.1)]&deg;C ([round(environment.temperature,0.1)]K)"
-		src << "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]"
+			src << "<font color='blue'>[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)</font>"
+		src << "<font color='blue'>Temperature: [round(environment.temperature-T0C,0.1)]&deg;C ([round(environment.temperature,0.1)]K)</font>"
+		src << "<font color='blue'>Heat Capacity: [round(environment.heat_capacity(),0.1)]</font>"
 
 /mob/observer/dead/verb/become_mouse()
 	set name = "Become mouse"
@@ -562,7 +575,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set desc = "If the round is sufficiently spooky, write a short message in blood on the floor or a wall. Remember, no IC in OOC or OOC in IC."
 
 	if(!(config.cult_ghostwriter))
-		src << "\red That verb is not currently permitted."
+		src << "<font color='red'>That verb is not currently permitted.</font>"
 		return
 
 	if (!src.stat)
@@ -576,8 +589,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		if(cult.current_antagonists.len > config.cult_ghostwriter_req_cultists)
 			ghosts_can_write = 1
 
-	if(!ghosts_can_write)
-		src << "\red The veil is not thin enough for you to do that."
+	if(!ghosts_can_write && !check_rights(R_ADMIN, 0)) //Let's allow for admins to write in blood for events and the such.
+		src << "<font color='red'>The veil is not thin enough for you to do that.</font>"
 		return
 
 	var/list/choices = list()
@@ -627,7 +640,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		W.update_icon()
 		W.message = message
 		W.add_hiddenprint(src)
-		W.visible_message("\red Invisible fingers crudely paint something in blood on [T]...")
+		W.visible_message("<font color='red'>Invisible fingers crudely paint something in blood on [T]...</font>")
 
 /mob/observer/dead/pointed(atom/A as mob|obj|turf in view())
 	if(!..())

code/modules/mob/dead/observer/say.dm

@@ -10,7 +10,7 @@
 		if(message)
 			client.handle_spam_prevention(MUTE_DEADCHAT)
 			if(src.client.prefs.muted & MUTE_DEADCHAT)
-				src << "\red You cannot talk in deadchat (muted)."
+				src << "<font color='red'>You cannot talk in deadchat (muted).</font>"
 				return
 
 	. = src.say_dead(message)
@@ -31,7 +31,7 @@
 		if(message)
 			client.handle_spam_prevention(MUTE_DEADCHAT)
 			if(src.client.prefs.muted & MUTE_DEADCHAT)
-				src << "\red You cannot emote in deadchat (muted)."
+				src << "<font color='red'>You cannot emote in deadchat (muted).</font>"
 				return
 
 	. = src.emote_dead(message)