From 79bbc4e23f71d3153cd96cf1fd024603a3ddff29 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Mon, 27 Nov 2023 08:47:56 -0500 Subject: [PATCH] assorted fixes --- code/controllers/subsystem/ticker.dm | 2 +- .../datums/emergency_calls/big_game_hunter.dm | 2 +- code/datums/emergency_calls/cbrn.dm | 4 ++-- code/datums/emergency_calls/clf.dm | 2 +- code/datums/emergency_calls/cmb.dm | 4 ++-- code/datums/emergency_calls/contractor.dm | 4 ++-- code/datums/emergency_calls/cryo_marines.dm | 2 +- .../emergency_calls/cryo_marines_heavy.dm | 2 +- code/datums/emergency_calls/cryo_spec.dm | 2 +- code/datums/emergency_calls/deathsquad.dm | 4 ++-- code/datums/emergency_calls/deus_vult.dm | 2 +- code/datums/emergency_calls/dutch.dm | 2 +- code/datums/emergency_calls/goons.dm | 4 ++-- code/datums/emergency_calls/hefa_knight.dm | 2 +- code/datums/emergency_calls/inspection.dm | 12 +++++------ code/datums/emergency_calls/mercs.dm | 20 +++++++++---------- code/datums/emergency_calls/pirates.dm | 2 +- code/datums/emergency_calls/pizza.dm | 2 +- code/datums/emergency_calls/pmc.dm | 4 ++-- code/datums/emergency_calls/provost.dm | 2 +- code/datums/emergency_calls/riot.dm | 2 +- code/datums/emergency_calls/royal_marines.dm | 2 +- code/datums/emergency_calls/souto.dm | 2 +- code/datums/emergency_calls/tank_crew.dm | 2 +- code/datums/emergency_calls/upp.dm | 2 +- code/datums/emergency_calls/upp_commando.dm | 4 ++-- .../datums/emergency_calls/whiskey_outpost.dm | 2 +- code/datums/emergency_calls/xeno_cultists.dm | 2 +- code/game/jobs/job/marine/marine.dm | 2 +- .../carbon/xenomorph/castes/Predalien.dm | 14 ++++--------- code/stylesheet.dm | 4 ++-- 31 files changed, 56 insertions(+), 62 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index adf838984586..ba59c9dc9b21 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -252,7 +252,7 @@ SUBSYSTEM_DEF(ticker) save_mode(CONFIG_GET(string/gamemode_default)) if(GLOB.round_statistics) - to_chat(world, html = role_body("
Welcome to [GLOB.round_statistics.round_name]
")) + to_chat(world, html = role_header("Welcome to [GLOB.round_statistics.round_name]")) GLOB.supply_controller.process() //Start the supply shuttle regenerating points -- TLE diff --git a/code/datums/emergency_calls/big_game_hunter.dm b/code/datums/emergency_calls/big_game_hunter.dm index 54dcfb09594e..bcd85cd91578 100644 --- a/code/datums/emergency_calls/big_game_hunter.dm +++ b/code/datums/emergency_calls/big_game_hunter.dm @@ -25,4 +25,4 @@ to_chat(H, role_header("You are a big game hunter!")) to_chat(H, role_body("You've taken a shot at every beast of the earth, every fowl of the air, and everything that creepeth upon the earth. Mundane beasts now bore you (and there may be some minor poaching charges after the Misunderstanding) and so you have traveled to this backwater sector to hunt the most dangerous game wherever you can find it. You've heard grisly tales of murderous xenomorphs, triggerhappy soldiers, and bloodthirsty alien hunters (who sound like they have the right idea, not like those ghastl Arcturians at all!) but so far all you've potted has been penny-ante stuff.

Whether you recruit the natives for porters, beaters, and guides, or hunt them for sport, is entirely up to you. They'll point you at something excellent if they know what's good for them.")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/cbrn.dm b/code/datums/emergency_calls/cbrn.dm index d594c0ecdc94..67677c215032 100644 --- a/code/datums/emergency_calls/cbrn.dm +++ b/code/datums/emergency_calls/cbrn.dm @@ -36,7 +36,7 @@ to_chat(mob, role_header("You are a CBRN Squad Rifleman!")) to_chat(mob, role_body("You are a member of the USCM's CBRN. The CBRN is a force that specializes in handling chemical, biological, radiological, and nuclear threats.")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/cbrn/ert name = "CBRN (Distress)" @@ -77,4 +77,4 @@ to_chat(mob, role_header("You are a CBRN Specialist!")) to_chat(mob, role_body("You are a member of the USCM's CBRN. The CBRN is a force that specializes in handling chemical, biological, radiological, and nuclear threats.")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/clf.dm b/code/datums/emergency_calls/clf.dm index 36e6b529cba5..40cdd99255f2 100644 --- a/code/datums/emergency_calls/clf.dm +++ b/code/datums/emergency_calls/clf.dm @@ -66,7 +66,7 @@ arm_equipment(H, /datum/equipment_preset/clf/soldier, TRUE, TRUE) print_backstory(H) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/clf/platoon diff --git a/code/datums/emergency_calls/cmb.dm b/code/datums/emergency_calls/cmb.dm index 335028b6da4e..82f94544dc0b 100644 --- a/code/datums/emergency_calls/cmb.dm +++ b/code/datums/emergency_calls/cmb.dm @@ -53,7 +53,7 @@ print_backstory(mob) - addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/cmb/print_backstory(mob/living/carbon/human/M) @@ -159,7 +159,7 @@ print_backstory(mob) - addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/cmb/anchorpoint/print_backstory(mob/living/carbon/human/M) diff --git a/code/datums/emergency_calls/contractor.dm b/code/datums/emergency_calls/contractor.dm index 4d94896a827e..46aa70e0b5e9 100644 --- a/code/datums/emergency_calls/contractor.dm +++ b/code/datums/emergency_calls/contractor.dm @@ -51,7 +51,7 @@ print_backstory(mob) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/contractors/print_backstory(mob/living/carbon/human/M) @@ -145,5 +145,5 @@ print_backstory(H) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index 45f1dd9ecf32..910e1ec04a4c 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -83,7 +83,7 @@ sleep(10) if(!mind) human.free_for_ghosts() - to_chat(human, role_body("

Your objectives are:

[objectives]")) + to_chat(human, role_body("

Your objectives are:

[objectives]")) /datum/emergency_call/cryo_squad/platoon name = "Marine Cryo Reinforcements (Platoon)" diff --git a/code/datums/emergency_calls/cryo_marines_heavy.dm b/code/datums/emergency_calls/cryo_marines_heavy.dm index 39f1834a4b22..8c1b2b8c8ffe 100644 --- a/code/datums/emergency_calls/cryo_marines_heavy.dm +++ b/code/datums/emergency_calls/cryo_marines_heavy.dm @@ -68,7 +68,7 @@ to_chat(H, role_body("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name].")) sleep(10) - to_chat(H, role_body("

Your objectives are:

[objectives]")) + to_chat(H, role_body("

Your objectives are:

[objectives]")) /datum/emergency_call/cryo_squad_equipped/platoon diff --git a/code/datums/emergency_calls/cryo_spec.dm b/code/datums/emergency_calls/cryo_spec.dm index 22c1aae405bf..3226a444a028 100644 --- a/code/datums/emergency_calls/cryo_spec.dm +++ b/code/datums/emergency_calls/cryo_spec.dm @@ -40,4 +40,4 @@ sleep(10) if(!mind) human.free_for_ghosts() - to_chat(human, role_body("

Your objectives are:

[objectives]")) + to_chat(human, role_body("

Your objectives are:

[objectives]")) diff --git a/code/datums/emergency_calls/deathsquad.dm b/code/datums/emergency_calls/deathsquad.dm index a913c0e94b46..39a165cd2a96 100644 --- a/code/datums/emergency_calls/deathsquad.dm +++ b/code/datums/emergency_calls/deathsquad.dm @@ -47,7 +47,7 @@ to_chat(person, role_body("Whiteout protocol is in effect for the target, all assets onboard are to be liquidated with expediency unless otherwise instructed by Weyland Yutani personnel holding the position of Director or above.")) arm_equipment(person, /datum/equipment_preset/pmc/w_y_whiteout, TRUE, TRUE) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), person, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), person, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/death/low_threat name = "Weyland Whiteout Operators" @@ -82,7 +82,7 @@ to_chat(person, role_body("Whiteout protocol is in effect for the target, all assets onboard are to be liquidated with expediency unless otherwise instructed by Weyland Yutani personnel holding the position of Director or above.")) arm_equipment(person, /datum/equipment_preset/pmc/w_y_whiteout/low_threat, TRUE, TRUE) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), person, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), person, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) //################################################################################################ // Marine commandos - USCM Deathsquad. Event only diff --git a/code/datums/emergency_calls/deus_vult.dm b/code/datums/emergency_calls/deus_vult.dm index f6bdc066e5c1..f77cf9341f7b 100644 --- a/code/datums/emergency_calls/deus_vult.dm +++ b/code/datums/emergency_calls/deus_vult.dm @@ -37,4 +37,4 @@ to_chat(H, role_body("You must clear out any traces of the unholy from this wretched place!")) to_chat(H, role_body("Follow any orders directly from the Higher Power!")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/dutch.dm b/code/datums/emergency_calls/dutch.dm index 0b2c24d8eb08..24f25bfe52a0 100644 --- a/code/datums/emergency_calls/dutch.dm +++ b/code/datums/emergency_calls/dutch.dm @@ -36,7 +36,7 @@ arm_equipment(H, /datum/equipment_preset/dutch/medic, TRUE, TRUE) else arm_equipment(H, /datum/equipment_preset/dutch, TRUE, TRUE) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/dutch/full_dozen //AWWW YEAH DA FULL DOZEN FO TODAY name = "Dutch's Dozen - Full Strength" diff --git a/code/datums/emergency_calls/goons.dm b/code/datums/emergency_calls/goons.dm index 40e82091a381..e9018b310769 100644 --- a/code/datums/emergency_calls/goons.dm +++ b/code/datums/emergency_calls/goons.dm @@ -27,7 +27,7 @@ print_backstory(mob) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/goon/print_backstory(mob/living/carbon/human/M) to_chat(M, role_body("You were born [pick(75;"in Europe", 15;"in Asia", 10;"on Mars")] to a poor family.")) @@ -78,7 +78,7 @@ print_backstory(mob) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/goon/chem_retrieval/print_backstory(mob/living/carbon/human/backstory_human) if(backstory_human.job == JOB_WY_GOON_RESEARCHER) diff --git a/code/datums/emergency_calls/hefa_knight.dm b/code/datums/emergency_calls/hefa_knight.dm index c12c053bb08d..5946f4b7b851 100644 --- a/code/datums/emergency_calls/hefa_knight.dm +++ b/code/datums/emergency_calls/hefa_knight.dm @@ -18,4 +18,4 @@ M.transfer_to(H, TRUE) arm_equipment(H, /datum/equipment_preset/fun/hefa/melee, FALSE, TRUE) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/inspection.dm b/code/datums/emergency_calls/inspection.dm index 69faec10d942..60d60925509b 100644 --- a/code/datums/emergency_calls/inspection.dm +++ b/code/datums/emergency_calls/inspection.dm @@ -32,7 +32,7 @@ to_chat(H, role_body("You are being assigned as part escort, part assistant and part law enforcer to the Inspector that is being dispatched to the [MAIN_SHIP_NAME]")) to_chat(H, role_body("You are not expected to enforce ML on the ship, however the Inspector may ask you to perform MP duties as part of their investigation in which case you are obligated to act like any other MP.")) to_chat(H, role_header("This role requires familiarity with Marine Law and Standard Operating Procedure. Ahelp if you have any questions or wish to surrender the character to someone else.")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/inspection_provost/spawn_items() @@ -76,7 +76,7 @@ to_chat(H, role_body("An inspection is scheduled for the [MAIN_SHIP_NAME] during their current assignment. You serve both as security detail to the officer performing the inspection and their assistant should they need your expertise.")) to_chat(H, role_body("Follow the inspector as they perform their duties on the ship. Feel free to offer your insight if you feel like you have any and help then as they request it. Remember, while you do not answer directly to the officers on the ship, you still need to respect their position.")) to_chat(H, role_header("Remember, you may not interrupt regular operation and are expected to follow orders of the Inspector at all times. Ahelp if you have any questions of you wish to offer the role to someone else.")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) //UAAC-TIS /datum/emergency_call/inspection_tis @@ -111,7 +111,7 @@ to_chat(H, role_body("You have been assigned as an escort for an UAAC-TIS Officer being dispatched to the [MAIN_SHIP_NAME]. Technically, the TIS has no direct authority over you, however you have been ordered to follow the instructions of the TIS Officer.")) to_chat(H, role_body("You are not expected to enforce ML on the ship and are generally expected to follow the instruction of the Officer you are protecting. Remember that should they start acting in a way that you believe puts the USCM in danger, you are not obligated to follow their orders and should report this to the Provost at once.")) to_chat(H, role_header("This role requires familiarity with Marine Law and Standard Operating Procedure. Ahelp if you have any questions or wish to surrender the character to someone else.")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/inspection_tis/spawn_items() var/turf/drop_spawn @@ -155,7 +155,7 @@ to_chat(H, role_body("While officially your outfit does mundane security work for Weyland-Yutani, in practice you serve as both official and unofficial investigators into conduct of Company personnel. The Lead Investigator is in charge, your duty is to provide backup, counsel and any other form of assistance you can render to make sure their mission is a success.")) to_chat(H, role_body("Remember that the USCM, or at least some parts of it, may be hostile towards your presence on the ship. Unless ordered otherwise by Dispatch, you and your Team Leader are to avoid open conflict with the Marines. Your main priority is making sure that your Lead survives to write the report they are due.")) to_chat(H, role_header("Unless ordered otherwise by Dispatch, you are to avoid open conflict with the Marines. Your priority is the safety of your team, if the ship gets to hot, your best bet is evacuation. Ahelp if you have any more questions or wish to release this character for other players.")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/inspection_wy/spawn_items() var/turf/drop_spawn @@ -220,7 +220,7 @@ print_backstory(mob) - addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/inspection_cmb/print_backstory(mob/living/carbon/human/M) @@ -303,4 +303,4 @@ print_backstory(mob) - addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/mercs.dm b/code/datums/emergency_calls/mercs.dm index d99b164805e0..a44393b651b7 100644 --- a/code/datums/emergency_calls/mercs.dm +++ b/code/datums/emergency_calls/mercs.dm @@ -45,11 +45,11 @@ to_chat(H, role_body("Taking up arms as a mercenary, the Freelancers have become a powerful force of order in the system.")) to_chat(H, role_body("While they are motivated primarily by money, many colonists see the Freelancers as the main forces of order in the Neroid Sector.")) if(hostility) - to_chat(H, SPAN_NOTICE(role_body("Despite this, you have been tasked to ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way."))) - to_chat(H, SPAN_NOTICE(role_body("Any UPP, CLF or WY forces also responding are to be considered neutral parties unless proven hostile."))) + to_chat(H, role_body("Despite this, you have been tasked to ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way.")) + to_chat(H, role_body("Any UPP, CLF or WY forces also responding are to be considered neutral parties unless proven hostile.")) else - to_chat(H, SPAN_NOTICE(role_body("To this end, you have been contacted by Weyland-Yutani of the USCSS Royce to assist the [MAIN_SHIP_NAME].."))) - to_chat(H, SPAN_NOTICE(role_body("Ensure they are not destroyed."))) + to_chat(H, role_body("To this end, you have been contacted by Weyland-Yutani of the USCSS Royce to assist the [MAIN_SHIP_NAME]..")) + to_chat(H, role_body("Ensure they are not destroyed.")) /datum/emergency_call/mercs/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() @@ -75,7 +75,7 @@ to_chat(H, role_header("You are a Freelancer Mercenary!")) print_backstory(H) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/mercs/platoon name = "Freelancers (Platoon)" @@ -126,11 +126,11 @@ to_chat(H, role_body("Taking up arms as a mercenary, the Freelancers have become a powerful force of order in the system.")) to_chat(H, role_body("While they are motivated primarily by money, many colonists see the Freelancers as the main forces of order in the Neroid Sector.")) if(hostility) - to_chat(H, SPAN_NOTICE(role_body("Despite this, you have been specially tasked to ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way."))) - to_chat(H, SPAN_NOTICE(role_body("Any UPP, CLF or WY forces also responding are to be considered neutral parties unless proven hostile."))) + to_chat(H, role_body("Despite this, you have been specially tasked to ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way.")) + to_chat(H, role_body("Any UPP, CLF or WY forces also responding are to be considered neutral parties unless proven hostile.")) else - to_chat(H, SPAN_NOTICE(role_body("To this end, you have been contacted by Weyland-Yutani of the USCSS Royce to assist the [MAIN_SHIP_NAME].."))) - to_chat(H, SPAN_NOTICE(role_body("Ensure they are not destroyed."))) + to_chat(H, role_body("To this end, you have been contacted by Weyland-Yutani of the USCSS Royce to assist the [MAIN_SHIP_NAME]..")) + to_chat(H, role_body("Ensure they are not destroyed.")) /datum/emergency_call/heavy_mercs/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() @@ -164,4 +164,4 @@ to_chat(H, role_header("You are an Elite Mercenary!")) print_backstory(H) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/pirates.dm b/code/datums/emergency_calls/pirates.dm index bc43fc51011d..67ac9d875796 100644 --- a/code/datums/emergency_calls/pirates.dm +++ b/code/datums/emergency_calls/pirates.dm @@ -27,4 +27,4 @@ to_chat(H, role_header("You are a jolly pirate! Yarr!")) to_chat(H, role_body("Loot this place for all its worth! Take everything of value that's not nailed down!")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/pizza.dm b/code/datums/emergency_calls/pizza.dm index c3ba8d879e0c..e5170942280e 100644 --- a/code/datums/emergency_calls/pizza.dm +++ b/code/datums/emergency_calls/pizza.dm @@ -25,7 +25,7 @@ to_chat(H, role_header("You are a pizza deliverer! Your employer is the [pizzatxt] Corporation.")) to_chat(H, role_body("Your job is to deliver your pizzas. You're PRETTY sure this is the right place...")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/pizza/cryo diff --git a/code/datums/emergency_calls/pmc.dm b/code/datums/emergency_calls/pmc.dm index 5591062b7cd7..e2c3a58c388a 100644 --- a/code/datums/emergency_calls/pmc.dm +++ b/code/datums/emergency_calls/pmc.dm @@ -56,7 +56,7 @@ print_backstory(mob) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/pmc/print_backstory(mob/living/carbon/human/M) @@ -140,7 +140,7 @@ print_backstory(H) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /obj/effect/landmark/ert_spawns/distress_pmc name = "Distress_PMC" diff --git a/code/datums/emergency_calls/provost.dm b/code/datums/emergency_calls/provost.dm index fc573dc9350e..7ccf181037b6 100644 --- a/code/datums/emergency_calls/provost.dm +++ b/code/datums/emergency_calls/provost.dm @@ -31,7 +31,7 @@ to_chat(H, role_body("Follow any orders directly from High Command or your Team Leader!")) to_chat(H, role_body("You only answer to your superior, Marine Law and High Command!")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/provost_enforcer/spawn_items() diff --git a/code/datums/emergency_calls/riot.dm b/code/datums/emergency_calls/riot.dm index b7db71c51b40..53bf45cb0597 100644 --- a/code/datums/emergency_calls/riot.dm +++ b/code/datums/emergency_calls/riot.dm @@ -29,7 +29,7 @@ to_chat(H, role_body("Follow any orders directly from High Command or your superior!")) to_chat(H, role_body("You only answer to your superior, the Marine Law and the High Command!")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/riot/spawn_items() diff --git a/code/datums/emergency_calls/royal_marines.dm b/code/datums/emergency_calls/royal_marines.dm index 0f8493745b55..38f755251654 100644 --- a/code/datums/emergency_calls/royal_marines.dm +++ b/code/datums/emergency_calls/royal_marines.dm @@ -46,7 +46,7 @@ print_backstory(mob) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/royal_marines/print_backstory(mob/living/carbon/human/spawning_mob) diff --git a/code/datums/emergency_calls/souto.dm b/code/datums/emergency_calls/souto.dm index 4b18a633f48a..0d077c42d3fa 100644 --- a/code/datums/emergency_calls/souto.dm +++ b/code/datums/emergency_calls/souto.dm @@ -25,7 +25,7 @@ to_chat(H, role_header("You are Souto Man! You should bring awareness to the Souto brand!")) to_chat(H, role_body("Your job is to party hard and share Souto. Make sure those marines are never thirsty again!")) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/souto/cryo name = "Souto Man (Cryo)" diff --git a/code/datums/emergency_calls/tank_crew.dm b/code/datums/emergency_calls/tank_crew.dm index c8fc2d23d151..d7f0205f49ef 100644 --- a/code/datums/emergency_calls/tank_crew.dm +++ b/code/datums/emergency_calls/tank_crew.dm @@ -28,7 +28,7 @@ to_chat(H, role_header("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced.")) sleep(10) - to_chat(H, role_body("

Your objectives are:

[objectives]")) + to_chat(H, role_body("

Your objectives are:

[objectives]")) GLOB.data_core.manifest_inject(H) //Put people in crew manifest diff --git a/code/datums/emergency_calls/upp.dm b/code/datums/emergency_calls/upp.dm index 54d076da4857..2e93397e6d59 100644 --- a/code/datums/emergency_calls/upp.dm +++ b/code/datums/emergency_calls/upp.dm @@ -96,7 +96,7 @@ print_backstory(H) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/upp/hostile diff --git a/code/datums/emergency_calls/upp_commando.dm b/code/datums/emergency_calls/upp_commando.dm index 8856184dd24e..4eaacc6f12fd 100644 --- a/code/datums/emergency_calls/upp_commando.dm +++ b/code/datums/emergency_calls/upp_commando.dm @@ -49,7 +49,7 @@ arm_equipment(H, /datum/equipment_preset/upp/commando, TRUE, TRUE) print_backstory(H) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) /datum/emergency_call/upp_commando/low_threat name = "UPP Commandos" @@ -76,4 +76,4 @@ arm_equipment(person, /datum/equipment_preset/upp/commando/low_threat, TRUE, TRUE) print_backstory(person) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), person, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), person, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/whiskey_outpost.dm b/code/datums/emergency_calls/whiskey_outpost.dm index 4af8e7adce92..e8fdbd042cde 100644 --- a/code/datums/emergency_calls/whiskey_outpost.dm +++ b/code/datums/emergency_calls/whiskey_outpost.dm @@ -50,7 +50,7 @@ to_chat(mob, SPAN_BOLDNOTICE("You are a Rifleman in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name].")) sleep(10) - to_chat(mob, "

Your objectives are:

[objectives]") + to_chat(mob, "

Your objectives are:

[objectives]") GLOB.RoleAuthority.randomize_squad(mob) mob.sec_hud_set_ID() mob.hud_set_squad() diff --git a/code/datums/emergency_calls/xeno_cultists.dm b/code/datums/emergency_calls/xeno_cultists.dm index 915d34501f42..2ae4f8191e87 100644 --- a/code/datums/emergency_calls/xeno_cultists.dm +++ b/code/datums/emergency_calls/xeno_cultists.dm @@ -34,4 +34,4 @@ arm_equipment(H, /datum/equipment_preset/other/xeno_cultist, TRUE, TRUE) print_backstory(H) - addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), H, role_body("

Your objectives are:

[objectives]")), 1 SECONDS) diff --git a/code/game/jobs/job/marine/marine.dm b/code/game/jobs/job/marine/marine.dm index 286a1399182b..4a0cb970f6f8 100644 --- a/code/game/jobs/job/marine/marine.dm +++ b/code/game/jobs/job/marine/marine.dm @@ -7,7 +7,7 @@ /datum/job/marine/generate_entry_message(mob/living/carbon/human/current_human) if(current_human.assigned_squad) - entry_message_intro = "

You are a [title]!

You have been assigned to: [current_human.assigned_squad.name] Squad!.[Check_WO() ? "" : " Make your way to the cafeteria for some post-cryosleep chow, and then get equipped in your squad's prep room." ]" + entry_message_intro = "

You are a [title]!

You have been assigned to: [current_human.assigned_squad.name] Squad![Check_WO() ? "" : " Make your way to the cafeteria for some post-cryosleep chow, and then get equipped in your squad's prep room." ]" return ..() /datum/job/marine/generate_entry_conditions(mob/living/carbon/human/current_human) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm index 14aa31b1f1e8..a3386f624c87 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm @@ -81,15 +81,9 @@ if(!loc) return FALSE - to_chat(src, {" -|______________________| -You are a predator-alien hybrid! -You are a very powerful xenomorph creature that was born of a Yautja warrior body. -You are stronger, faster, and smarter than a regular xenomorph, but you must still listen to the queen. -You have a degree of freedom to where you can hunt and claim the heads of the hive's enemies, so check your verbs. -Your health meter will not regenerate normally, so kill and die for the hive! -|______________________| -"}) + to_chat(src, role_header("You are a predator-alien hybrid!")) + to_chat(src, role_body("You are a very powerful xenomorph creature that was born of a Yautja warrior body.

You are stronger, faster, and smarter than a regular xenomorph, but you must still listen to the queen. You have a degree of freedom to where you can hunt and claim the heads of the hive's enemies, so check your verbs.")) + to_chat(src, role_header("Your health meter will not regenerate normally, so kill and die for the hive!")) emote("roar") /datum/behavior_delegate/predalien_base @@ -147,7 +141,7 @@ Your health meter will not regenerate normally, so kill and die for the hive!