From 03caee7be9333960a5d3a6ed32e8e8b1f30d6068 Mon Sep 17 00:00:00 2001 From: alberyk Date: Sun, 10 Oct 2021 22:57:59 -0300 Subject: [PATCH] changes --- code/game/jobs/faction/nanotrasen.dm | 6 +++--- code/game/jobs/faction/scc.dm | 4 ++-- .../human/species/station/skrell/skrell_subspecies.dm | 2 +- .../human/species/station/vaurca/vaurca_subspecies.dm | 4 ++-- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 4 ++-- code/modules/reagents/reagent_containers/food/drinks.dm | 4 ++-- .../reagents/reagent_containers/food/drinks/bottle.dm | 2 +- code/modules/reagents/reagent_containers/food/snacks.dm | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/game/jobs/faction/nanotrasen.dm b/code/game/jobs/faction/nanotrasen.dm index 5579623f59a..77a59954920 100644 --- a/code/game/jobs/faction/nanotrasen.dm +++ b/code/game/jobs/faction/nanotrasen.dm @@ -1,9 +1,9 @@ /datum/faction/nano_trasen name = "NanoTrasen" description = {"Considered the largest megacorporation within the Orion Spur, many will find themselves doing the biddings of NanoTrasen -- be it direct or indirect. Initially a biotechnical - research company, it rapidly grew in size after the discovery of Phoron. The corporation’s monopoly on the resource catapulted it into the limelight, where it has remained for the last - forty-odd years. Its acceleration into the spotlight has prompted many prying eyes to uncover evidence of rather questionable actions, with rumours perpetuating that they’ve instigated - wars on both Adhomai and Moghes in an attempt to exploit the species for a profit. NanoTrasen’s power has since begun to waver as their ability to supply Phoron dwindled -- resulting in + research company, it rapidly grew in size after the discovery of Phoron. The corporation's monopoly on the resource catapulted it into the limelight, where it has remained for the last + forty-odd years. Its acceleration into the spotlight has prompted many prying eyes to uncover evidence of rather questionable actions, with rumours perpetuating that they've instigated + wars on both Adhomai and Moghes in an attempt to exploit the species for a profit. NanoTrasen's power has since begun to waver as their ability to supply Phoron dwindled -- resulting in their profit margins diminishing considerably. Whilst the corporation has attempted its best to hide its waning influence, the facade has begun to crumble with scrutinizing individuals being able to see its vulnerability. Despite the effects of the Phoron Scarcity on the megacorporation, NanoTrasen has managed to secure itself as a crucial member of the newly-founded Stellar Corporate Conglomerate (SCC) with Miranda Trasen serving as the Acting Director of Operations -- which has managed to bolster the company and secure themselves as the dominant diff --git a/code/game/jobs/faction/scc.dm b/code/game/jobs/faction/scc.dm index d4b1ca0be05..9afbdc3f30d 100644 --- a/code/game/jobs/faction/scc.dm +++ b/code/game/jobs/faction/scc.dm @@ -4,8 +4,8 @@ over the Orion Spur. The Chainlink was founded to secure privately owned assets within Tau Ceti owned by the various megacorporations during the Second Solarian Incursion. After the invasion, the SCC has found itself willing and eager to supersede any and all higher authority placed before it, with no signs of stopping any time soon. The Conglomerate has basically bound the largest shareholders and chief executive officers of the corporations to the whim and will of the Trasen family, who hold an unsteady authority over the colorful cast. Cooperation has been - deemed essential at this point in time. The corporations remain in a shaky peace, to contrast the cutthroat, espionage-ridden past. Of course, this doesnt stop the greed or the lust for - power and glory - theyre just corporations, after all. The SCC's largest threat is Einstein Engines - this growing giant is older than all others on the galactic stage, and + deemed essential at this point in time. The corporations remain in a shaky peace, to contrast the cutthroat, espionage-ridden past. Of course, this doesn't stop the greed or the lust for + power and glory - they're just corporations, after all. The SCC's largest threat is Einstein Engines - this growing giant is older than all others on the galactic stage, and recently resurfaced in power due to the growing prominence of warp travel.

Stellar Corporate Conglomerate employees can be in the following departments: diff --git a/code/modules/mob/living/carbon/human/species/station/skrell/skrell_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/skrell/skrell_subspecies.dm index fca2ce3d9d5..3b36abb2eaf 100644 --- a/code/modules/mob/living/carbon/human/species/station/skrell/skrell_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/skrell/skrell_subspecies.dm @@ -2,7 +2,7 @@ name = SPECIES_SKRELL_AXIORI preview_icon = 'icons/mob/human_races/skrell/skrell_axiori_preview.dmi' blurb = "Axiori, which can be approximately translated to “aquatics” or “ocean-dwellers”, are notably better \ - adapted to survive within the depths of the Homeworld’s seas. Typically sporting much more pronounced webbings \ + adapted to survive within the depths of the Homeworld's seas. Typically sporting much more pronounced webbings \ for faster swimming, as well as larger and more monocular eyes to better perceive their environment. They also \ possess a small tail that acts as a rudder; making them capable of changing direction at high speeds when underwater. \ The high-pressure environments in which they thrived and evolved have also resulted in a lower metabolic rate for \ diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm index d0e9a591d60..e4dcef8afa6 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm @@ -215,8 +215,8 @@ mob_size = 12 taste_sensitivity = TASTE_DULL - blurb = {"Type E Vaurca, otherwise known as the Bulwarks, are a new bodyform derived from the worker caste in a collaboration by the C’thur and Jargon scientists. Originally only the C’thur had access to these behemoths, but after a short amount of time, the bodyform started appearing in the ranks of the Zo’ra and K’lax as well, causing an even more strained relationship between the hives.
-Similar to Workers, Bulwarks are generally passive, and prefer to flee a fight rather than resist. Though due to their speed, they may still choose to defend themselves should they be unable to properly escape a battle. The main exception to this is when another Vaurca is in danger. When this occurs, they tend to put themselves in between the attacker and the Vaurca, acting as a shield of sorts. They won’t go out of their way to take down the attacker, but will ensure the others get away safely.
+ blurb = {"Type E Vaurca, otherwise known as the Bulwarks, are a new bodyform derived from the worker caste in a collaboration by the C'thur and Jargon scientists. Originally only the C'thur had access to these behemoths, but after a short amount of time, the bodyform started appearing in the ranks of the Zo'ra and K'lax as well, causing an even more strained relationship between the hives.
+Similar to Workers, Bulwarks are generally passive, and prefer to flee a fight rather than resist. Though due to their speed, they may still choose to defend themselves should they be unable to properly escape a battle. The main exception to this is when another Vaurca is in danger. When this occurs, they tend to put themselves in between the attacker and the Vaurca, acting as a shield of sorts. They won't go out of their way to take down the attacker, but will ensure the others get away safely.
Bulwarks are much larger and have significantly thicker carapaces than most Vaurca, making them slow but resistant to most hits, including a complete immunity to radiation. Their powerful arms and claws grant them stronger punches, enough to bend metal, and is often used to pry open non-functional doors.
Type E Vaurca are typically used for heavy lifting, agricultural and industrial work, thus they can typically be found as Engineers, Cargo Technicians, Miners and similar jobs, though they can also be found in positions such as janitor and Assistant should they be needed."} diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 59b2982cddb..b3538d0b744 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1069,12 +1069,12 @@ /decl/reagent/drink/milk/adhomai/mutthir name = "Mutthir" - description = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs." + description = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs." taste_description = "sweet fatty yogurt" glass_icon_state = "mutthir_glass" glass_name = "glass of mutthir" - glass_desc = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs." + glass_desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs." /decl/reagent/drink/milk/beetle name = "Hakhma Milk" diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index c0f2c98881b..3421a32387d 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -431,8 +431,8 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I /obj/item/reagent_containers/food/drinks/carton/mutthir name = "mutthir carton" icon_state = "mutthir" - desc = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs." - desc_fluff = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \ + desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs." + desc_fluff = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \ The drink can also be smoked for flavor. Mutthir is believed to have originated from the worldwide appreciated Fatshouters' fermented milk. Rock Nomads living in the Nomadic Host \ were quick to adopt the drink to their diet." diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 29f636011c2..e9210faeb95 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -623,7 +623,7 @@ desc = "A soft drink made from honey and tree syrup. The label claims it is good as the tap version." icon_state = "midynhrwater" center_of_mass = list("x" = 16,"y" = 5) - desc_fluff = "A soft drink based on Yve’kha's honey and tree syrups. The drink has a creamy consistency and is served cold from the tap of traditional soda fountains. Native to \ + desc_fluff = "A soft drink based on Yve'kha's honey and tree syrups. The drink has a creamy consistency and is served cold from the tap of traditional soda fountains. Native to \ Das'nrra, the beverage is now widespread in the Al'mariist territories. Bottled versions exist, but they are considered to be inferior to what is served in bars and restaurants." reagents_to_add = list(/decl/reagent/drink/midynhr_water = 30) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index ec951b99e6a..dac59a5660c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -4824,7 +4824,7 @@ slices_num = 5 reagents_to_add = list(/decl/reagent/nutriment/protein = 10, /decl/reagent/nutriment = 10, /decl/reagent/alcohol/messa_mead = 5) reagent_data = list(/decl/reagent/nutriment/protein = list("juicy meat" = 10), /decl/reagent/nutriment = list("flaky dough" = 5, "savoury vegetables" = 5)) - desc_fluff = "for a time was considered the benchmark by which to rate the abilities of a chef. The production of this exquisite dish is no easy task, the preparation process begins with the aging of a high-grade tenderloin steak acquired from a Fatshouter fed exclusively on dirtberries. The high starch content of the dirtberries ensures that the creature has a high fat percentage and imparts a unique flavour to the meat and traditionally Noble families would keep a raise small herds of Fatshouters specifically for the production of this dish. After 28 days of dry aging, the tenderloin is ready for use. One day prior to serving the dish, a pâté is made by sauteéing thinly sliced pieces of earthenroot soaked in a generous amount of Messa’s Mead and then thickened with lard before being ground into a fine paste and left to - chill. On the day that the dish is to be served a flaky pastry dough is made. Next the aged 7 tenderloin is trimmed of accumulated mold and rind and coated in a dryrub after which the chilled pâté is spread across the surface of the meat and it is wrapped in the thinly rolled pastry dough. Next the pastry is washed with a small amount of clarified lard to give the crust a nice shine, after which it is placed into a large oven and cooked at a high heat for around 40 minutes. Though the dish was regarded as a symbol of the blatant excess and overindulgence of the ruling elite, it has since been reintroduced to the public by enterprising chefs seeking to recapture the high-class culinary culture of the past." + desc_fluff = "for a time was considered the benchmark by which to rate the abilities of a chef. The production of this exquisite dish is no easy task, the preparation process begins with the aging of a high-grade tenderloin steak acquired from a Fatshouter fed exclusively on dirtberries. The high starch content of the dirtberries ensures that the creature has a high fat percentage and imparts a unique flavour to the meat and traditionally Noble families would keep a raise small herds of Fatshouters specifically for the production of this dish. After 28 days of dry aging, the tenderloin is ready for use. One day prior to serving the dish, a pâté is made by sauteéing thinly sliced pieces of earthenroot soaked in a generous amount of Messa's Mead and then thickened with lard before being ground into a fine paste and left to - chill. On the day that the dish is to be served a flaky pastry dough is made. Next the aged 7 tenderloin is trimmed of accumulated mold and rind and coated in a dryrub after which the chilled pâté is spread across the surface of the meat and it is wrapped in the thinly rolled pastry dough. Next the pastry is washed with a small amount of clarified lard to give the crust a nice shine, after which it is placed into a large oven and cooked at a high heat for around 40 minutes. Though the dish was regarded as a symbol of the blatant excess and overindulgence of the ruling elite, it has since been reintroduced to the public by enterprising chefs seeking to recapture the high-class culinary culture of the past." filling_color = "#BD8939" /obj/item/reagent_containers/food/snacks/fatshouterslice @@ -4832,7 +4832,7 @@ desc = "A medium rare fillet of Fatshouter meat covered in an earthenroot pate and wrapped in a flaky crust." icon_state = "fatshouterfillet_slice" filling_color = "#FF7575" - desc_fluff = "for a time was considered the benchmark by which to rate the abilities of a chef. The production of this exquisite dish is no easy task, the preparation process begins with the aging of a high-grade tenderloin steak acquired from a Fatshouter fed exclusively on dirtberries. The high starch content of the dirtberries ensures that the creature has a high fat percentage and imparts a unique flavour to the meat and traditionally Noble families would keep a raise small herds of Fatshouters specifically for the production of this dish. After 28 days of dry aging, the tenderloin is ready for use. One day prior to serving the dish, a pâté is made by sauteéing thinly sliced pieces of earthenroot soaked in a generous amount of Messa’s Mead and then thickened with lard before being ground into a fine paste and left to - chill. On the day that the dish is to be served a flaky pastry dough is made. Next the aged 7 tenderloin is trimmed of accumulated mold and rind and coated in a dryrub after which the chilled pâté is spread across the surface of the meat and it is wrapped in the thinly rolled pastry dough. Next the pastry is washed with a small amount of clarified lard to give the crust a nice shine, after which it is placed into a large oven and cooked at a high heat for around 40 minutes. Though the dish was regarded as a symbol of the blatant excess and overindulgence of the ruling elite, it has since been reintroduced to the public by enterprising chefs seeking to recapture the high-class culinary culture of the past." + desc_fluff = "for a time was considered the benchmark by which to rate the abilities of a chef. The production of this exquisite dish is no easy task, the preparation process begins with the aging of a high-grade tenderloin steak acquired from a Fatshouter fed exclusively on dirtberries. The high starch content of the dirtberries ensures that the creature has a high fat percentage and imparts a unique flavour to the meat and traditionally Noble families would keep a raise small herds of Fatshouters specifically for the production of this dish. After 28 days of dry aging, the tenderloin is ready for use. One day prior to serving the dish, a pâté is made by sauteéing thinly sliced pieces of earthenroot soaked in a generous amount of Messa's Mead and then thickened with lard before being ground into a fine paste and left to - chill. On the day that the dish is to be served a flaky pastry dough is made. Next the aged 7 tenderloin is trimmed of accumulated mold and rind and coated in a dryrub after which the chilled pâté is spread across the surface of the meat and it is wrapped in the thinly rolled pastry dough. Next the pastry is washed with a small amount of clarified lard to give the crust a nice shine, after which it is placed into a large oven and cooked at a high heat for around 40 minutes. Though the dish was regarded as a symbol of the blatant excess and overindulgence of the ruling elite, it has since been reintroduced to the public by enterprising chefs seeking to recapture the high-class culinary culture of the past." bitesize = 2 /obj/item/reagent_containers/food/snacks/fatshouterslice/filled @@ -4870,7 +4870,7 @@ bitesize = 2 reagents_to_add = list(/decl/reagent/nutriment = 8) reagent_data = list(/decl/reagent/nutriment = list("creamy" = 3, "sweet" = 3, "cold" = 2)) - desc_fluff = "The traditional dessert of Northern Harr'masir is considered by many as being the mixture of ice, Fatshouters’s milk, sugar, and Nif-Berries’ oil, named Creamice. The popular tales claim it was invented after a famine desolated the land, resulting in the population resorting to eating snow, however, such tale has been classified by most historians as nothing but fiction. Creamice is commonly consumed by the nobility since they are the ones that can afford the luxury of refrigeration." + desc_fluff = "The traditional dessert of Northern Harr'masir is considered by many as being the mixture of ice, Fatshouters's milk, sugar, and Nif-Berries' oil, named Creamice. The popular tales claim it was invented after a famine desolated the land, resulting in the population resorting to eating snow, however, such tale has been classified by most historians as nothing but fiction. Creamice is commonly consumed by the nobility since they are the ones that can afford the luxury of refrigeration." filling_color = "#BD8939" /obj/item/reagent_containers/food/snacks/onionrings