Merge pull request #856 from ArchieBeepBoop/archiefixesshit

Fixes missing crushed monkey energy sprites + Cryo announcement + Ghost Role Text
2026-07-16 02:17:19 +01:00 · 2021-01-10 15:47:17 +00:00
parent 8c60d61428 9dc6837dd4
commit 9aef54768c
8 changed files with 15 additions and 11 deletions
@@ -1009,7 +1009,7 @@
 /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space{
 	assignedrole = "Space Syndicate";
 	dir = 8;
-	flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. <b>Monitor enemy activity as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> Use the communication equipment to provide support to any field agents, and sow disinformation to throw Kinaris off your trail. Do not let the base fall into enemy hands!</b>"
+	flavour_text = "You are a syndicate agent, assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. Monitor enemy activity as best you can, and try to keep a low profile. DON'T abandon the base without good cause. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Kinaris off your trail. Do not let the base fall into enemy hands!"
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 8;
@@ -236,7 +236,7 @@
 /area/template_noop)
 "aY" = (
 /obj/effect/mob_spawn/human/hermit{
-	flavour_text = "<span class='big bold'>You've been late to awaken from your cryo slumber. Blasted machine, you set it to 10 days not 10 weeks!</span><b> Where have the others gone while we were out? Did they manage to survive? These thoughts are dispelled by yet another recollection of how you got here... ";
+	flavour_text = "You've been late to awaken from your cryo slumber. Blasted machine, you set it to 10 days not 10 weeks! Where have the others gone while we were out? Did they manage to survive? These thoughts are dispelled by yet another recollection of how you got here... ";
 	job_description = "Space Hermit"
 	},
 /turf/open/floor/mineral/titanium,
@@ -162,7 +162,7 @@
 	uniform = /obj/item/clothing/under/rank/bartender;
 	death = 0;
 	desc = "Looks secure.";
-	flavour_text = "<span class='big bold'>You are a bartender for the beach!</span>";
+	flavour_text = "You are a bartender for the beach!";
 	icon = 'icons/obj/machines/sleeper.dmi';
 	icon_state = "sleeper";
 	mob_name = "Jerry Thomas";
@@ -18,9 +18,10 @@ GLOBAL_LIST_EMPTY(announcement_systems)

 	var/obj/item/radio/headset/radio
 	var/arrival = "%PERSON has signed up as %DISP_RANK (%RANK)"
-	var/arrivalToggle = 1
+	var/arrivalToggle = TRUE
 	var/newhead = "%PERSON, %DISP_RANK (%RANK), is the department head."
-	var/newheadToggle = 1
+	var/newheadToggle = TRUE
+	var/cryostorage = "%PERSON, %RANK, has been moved into cryogenic storage." // this shouldnt be changed

 	var/greenlight = "Light_Green"
 	var/pinklight = "Light_Pink"
@@ -91,7 +92,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 		message = CompileText(newhead, user, rank, displayed_rank)
 	//CITADEL EDIT for cryopods
 	else if(message_type == "CRYOSTORAGE")
-		message = CompileText("%PERSON, %DISP_RANK (%RANK) has been moved to cryo storage.", user, rank, displayed_rank)
+		message = CompileText(cryostorage, user, rank, displayed_rank)
 	//END EDIT
 	else if(message_type == "ARRIVALS_BROKEN")
 		message = "The arrivals shuttle has been damaged. Docking for repairs..."
@@ -48,6 +48,7 @@
 	anchored = FALSE
 	move_resist = MOVE_FORCE_NORMAL
 	density = FALSE
+	short_desc = "You are an ash walker. Your tribe worships the Necropolis."
 	flavour_text = "The wastes are sacred ground, its monsters a blessed bounty. You would never willingly leave your homeland behind. \
 	You have seen lights in the distance... they foreshadow the arrival of outsiders to your domain. However, their intentions have yet to be judged.\
 	Ensure your nest remains protected at all costs."
@@ -250,7 +251,7 @@
 			outfit.back = /obj/item/storage/backpack/medic
 			outfit.shoes = /obj/item/clothing/shoes/sneakers/black
 		if(4)
-			flavour_text += "you were always joked about by your friends for \"not playing with a full deck\", as they so <i>kindly</i> put it. It seems that they were right when you, on a tour \
+			flavour_text += "you were always joked about by your friends for \"not playing with a full deck\", as they so kindly put it. It seems that they were right when you, on a tour \
 			at one of Nanotrasen's state-of-the-art research facilities, were in one of the escape pods alone and saw the red button. It was big and shiny, and it caught your eye. You pressed \
 			it, and after a terrifying and fast ride for days, you landed here. You've had time to wisen up since then, and you think that your old friends wouldn't be laughing now."
 			outfit.uniform = /obj/item/clothing/under/color/grey/glorf
@@ -267,10 +268,10 @@
 	desc = "A small sleeper typically used to instantly restore minor wounds. This one seems broken, and its occupant is comatose."
 	job_description = "Lavaland Veterinarian"
 	mob_name = "a translocated vet"
-	short_desc = "You are a animal doctor who just woke up in lavaland"
+	short_desc = "You are an animal doctor who just woke up in lavaland"
 	flavour_text = "What...? Where are you? Where are the others? This is still the animal hospital - you should know, you've been an intern here for weeks - but \
 	you see them right now. So where is \
-	everyone? Where did they go? What happened to the hospital? And is that <i>smoke</i> you smell? You need to find someone else. Maybe they c	everyone's gone. One of the cats scratched you just a few minutes ago. That's why you were in the pod - to heal the scratch. The scabs are still fresh; an tell you what happened."
+	everyone? Where did they go? What happened to the hospital? And is that smoke you smell? You need to find someone else. Maybe everyone's gone. One of the cats scratched you just a few minutes ago. That's why you were in the pod - to heal the scratch. The scabs are still fresh; and tell you what happened."
 	assignedrole = "Translocated Vet"
 	mirrorcanloadappearance = TRUE

@@ -609,7 +609,7 @@
 			else
 				M.visible_message("<b>[M]</b> flexes [M.p_their()] arms.")
 	if(prob(10))
-		M.say(pick("Shit was SO cash.", "You are everything bad in the world.", "What sports do you play, other than 'jack off to naked drawn Japanese people?'", "Don’t be a stranger. Just hit me with your best shot.", "My name is John and I hate every single one of you."), forced = "spraytan")
+		M.say(pick("Shit was SO cash.", "You are everything bad in the world.", "What sports do you play, other than 'jack off to naked drawn Japanese people?'", "Don’t be a stranger. Just hit me with your best shot.", "My name is John and I hate every single one of you.", "I was captain of the football team, and starter on my basketball team.", "What the fuck did you just fucking say about me, you little bitch?", "I am trained in monkey warfare."), forced = "spraytan")
 	..()
 	return

@@ -10,7 +10,8 @@
 	death = FALSE
 	random = TRUE
 	mob_species = /datum/species/human
-	flavour_text = "<span class='big bold'>You and another have been stranded in this planet for quite some time now.</span><b> Each day you barely scrape by, and between the terrible \
+	short_desc = "You are lost."
+	flavour_text = "You and another have been stranded in this planet for quite some time now. Each day you barely scrape by, and between the terrible \
 	conditions of your makeshift shelter, the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \
 	the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you and your friend got here... "
 	assignedrole = "Hermit"
@@ -58,6 +59,7 @@
 	death = FALSE
 	random = TRUE
 	mob_species = /datum/species/human
+	short_desc = "You've been left behind."
 	flavour_text = "As the last escape shuttle left the sector, you were left for dead, stranded in a cold hell where you make do, until hopefully someone finds you. \
 	Every day, you pause and recollect your memories from before it all happened... "
 	assignedrole = "Arctic Exile"