/tg/ era language pass (#8962)

* /tg/ era language pass * Another pass, more generally inc. code comments * Even more word tweakies
2026-08-30 00:30:06 +01:00 · 2023-02-24 23:33:52 -08:00
parent b1b13d520e
commit 69ba99b5e6
36 changed files with 139 additions and 160 deletions
@@ -111,7 +111,7 @@
 	corpseidaccess = "Syndicate"

 /obj/effect/landmark/corpse/syndicatecommando
-	name = "Syndicate Commando"
+	name = "Mercenary Commando"
 	corpseuniform = /obj/item/clothing/under/syndicate
 	corpsesuit = /obj/item/clothing/suit/space/void/merc
 	corpseshoes = /obj/item/clothing/shoes/boots/swat
@@ -93,7 +93,7 @@
 	icon = 'icons/obj/clothing/spacesuits.dmi'
 	icon_state = "syndicate"
 	default_worn_icon = 'icons/mob/spacesuit.dmi'
-	desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
+	desc = "A plastic replica of a mercenary combat space suit, you'll look just like a real bloodthirsty mercenary in this! This is a toy, it is not made for use in space!"
 	w_class = ITEMSIZE_NORMAL
 	allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/toy)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
@@ -855,9 +855,6 @@
 					/obj/item/reagent_containers/pill/adminordrazine = 10,
 					/obj/item/tool/crowbar = 1)

-
-////////////////////ancient_vend (Hot Food - Old) (ADDED 04/11/2021)////////////////////////////////////////////////////
-
 /obj/machinery/vending/hotfood
 	name = "\improper Hot Foods!"
 	desc = "An old vending machine promising 'hot foods'. You doubt any of its contents are still edible."
@@ -872,8 +869,6 @@
 					/obj/item/reagent_containers/food/snacks/old/taco = 2
 					)

-////////////////////weeb_vend (Nippon-tan!) (ADDED 04/11/2021)/////////////////////////////////////////////////
-
 /obj/machinery/vending/weeb
 	name = "\improper Nippon-tan!"
 	desc = "A distressingly cutesy vending machine loaded with high sucrose low calorie - for lack of a better word - 'snacks'."
@@ -908,8 +903,6 @@
 					/obj/item/reagent_containers/food/snacks/packaged/mochicake = 10
 					)

-////////////////////sol_vend (Mars Mart) (ADDED 04/11/2021)////////////////////////////////////////////////////
-
 /obj/machinery/vending/sol
 	name = "\improper Sol-Snacks"
 	desc = "A SolCentric vending machine dispensing a number of Sol-themed snacks, along with other foods."
@@ -947,10 +940,6 @@
 					/obj/item/storage/box/admints = 2
 					)

-////////////////////snix_vend (Snix!) (ADDED 04/11/2021)////////////////////////////////////////////
-
-//////a food variant of the boda machine - It carries slavic themed foods.. Mostly beer snacks./////
-
 /obj/machinery/vending/snix
 	name = "\improper Snix"
 	desc = "A snack vending machine, offering a selection of slavic beer snacks."
@@ -990,8 +979,6 @@
 					/obj/item/reagent_containers/food/snacks/hakarl = 8
 					)

-////////////////////snl_vend (Shop-n-Large Snacks!) (ADDED 04/16/2021)//////////////////////////////
-
 /obj/machinery/vending/snlvend
 	name = "\improper Shop-n-Large Snacks!"
 	desc = "A Shop-n-Large brand vending machine! Enjoy all your favorites!"
@@ -1038,21 +1025,19 @@
 					/obj/item/reagent_containers/food/snacks/cookiesnack = 5
 					)

-///////////////////////Soviet Stuff///////////////////////////////////////
-
 /obj/machinery/vending/sovietsoda
 	name = "BODA"
 	desc = "An old sweet water vending machine,how did this end up here?"
 	description_fluff = "Originally the product of a genuine rim-world commune, BODA vendors have been produced by the Gilthari Exports luxury vending division for almost two centuries."
 	icon_state = "sovietsoda"
 	product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
-	products = list(/obj/item/reagent_containers/food/drinks/cans/boda = 30,		//ADDITION 04/03/2021
-					/obj/item/reagent_containers/food/drinks/cans/kompot = 20)	//ADDITION 04/03/2021
-	contraband = list(/obj/item/reagent_containers/food/drinks/cans/kvass = 20) 	//ADDITION 04/03/2021
+	products = list(/obj/item/reagent_containers/food/drinks/cans/boda = 30,
+					/obj/item/reagent_containers/food/drinks/cans/kompot = 20)
+	contraband = list(/obj/item/reagent_containers/food/drinks/cans/kvass = 20)
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
 	vending_sound = "machines/vending/vending_cans.ogg"

-/obj/machinery/vending/sovietvend //ADDITION 04/20/2021
+/obj/machinery/vending/sovietvend
 	name = "Ration Station"
 	desc = "A corporate ration vendor unit. Extremely functional."
 	description_fluff = "Designed for use on remote, utilitarian corporate facilities. Perfect for extracting a little extra back from indentured miners. Often modified to accept only company scrip."
@@ -1065,8 +1050,6 @@
 	contraband = list(/obj/item/reagent_containers/food/snacks/packaged/sweetration = 2,
 					/obj/item/reagent_containers/food/snacks/canned/ntbeans = 2)

-///////////////////////Radical Renard///////////////////////////////////////
-
 /obj/machinery/vending/radren
 	name = "Radical Renard Sodas"
 	desc = "A softdrink vendor owned by a frontier based soda company that's been contracted by NanoTrasen."
@@ -1095,9 +1078,6 @@
 					/obj/item/reagent_containers/food/drinks/cans/gingerale = 1)
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
 	vending_sound = "machines/vending/vending_cans.ogg"
-
-///////////////////////Donk-Soft!///////////////////////////////////////
-
 /obj/machinery/vending/donksoft
 	name = "Donk-Soft!"
 	desc = "A toy vendor owned by Donk-Soft, a NanoTrasen sub-company."
@@ -198,7 +198,7 @@
 /obj/item/reagent_containers/food/drinks/cans/kvass
 	name = "\improper Kvass"
 	desc = "A true Slavic soda."
-	description_fluff = "A classic slavic beverage which many Space Russians still enjoy to this day. Fun fact, it is actually considered a weak beer by non-russians."
+	description_fluff = "A classic slavic beverage which many space-faring slavs still enjoy to this day. Fun fact, it is actually considered a weak beer by non-russians."
 	icon_state = "kvass"
 	center_of_mass = list("x"=16, "y"=10)

@@ -6497,7 +6497,7 @@
 	name = "\improper Suhariki"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "croutons"
-	desc = "Fried bread cubes. Popular in Terran territories."
+	desc = "Fried bread cubes. Popular in some Solar territories."
 	trash = /obj/item/trash/croutons
 	filling_color = "#c6b17f"
 	center_of_mass = list ("x"=15, "y"=9)
@@ -6671,7 +6671,7 @@
 	.=..()
 	reagents.add_reagent("capsaicin", 5)

-/obj/item/reagent_containers/food/snacks/sun_snax //ADDITION 04/14/2021
+/obj/item/reagent_containers/food/snacks/sun_snax
 	name = "\improper Sun Snax!"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "sun_snax"
@@ -6771,7 +6771,7 @@
 	.=..()
 	reagents.add_reagent("capsaicin",1)

-/obj/item/reagent_containers/food/snacks/wasabi_peas //ADDITION 04/14/2021
+/obj/item/reagent_containers/food/snacks/wasabi_peas
 	name = "\improper Hadokikku Peas"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "wasabi_peas"
@@ -6983,7 +6983,7 @@
 /obj/item/reagent_containers/food/snacks/canned/maps
 	name = "\improper MAPS"
 	icon_state = "maps"
-	desc = "A re-branding of a classic Terran snack! Contains mostly edible ingredients."
+	desc = "A re-branding of a classic Earth snack! Contains mostly edible ingredients."
 	trash = /obj/item/trash/maps
 	filling_color = "#330066"
 	center_of_mass = list("x"=15, "y"=9)
@@ -7815,4 +7815,4 @@
 	icon_state = "kirani_jellypuff"
 	nutriment_amt = 8
 	bitesize = 2
-	nutriment_desc = list("puffed minty qa'zal bread" = 1, "super-sweet kirani jelly" = 1)
+	nutriment_desc = list("puffed minty qa'zal bread" = 1, "super-sweet kirani jelly" = 1)
@@ -82,7 +82,7 @@
 /datum/lore/codex/page/multinational_movement/add_content()
 	name = "Multinational Movement"
 	keywords += list("Multinational")
-	data = "The barely-unified voice of [quick_link("SolGov", "SolGov's")] various independence movements, encompassing Terran governments wishing for a lighter touch \
+	data = "The barely-unified voice of [quick_link("SolGov", "SolGov's")] various independence movements, encompassing Earth governments wishing for a lighter touch \
 	from SolGov, fringe colonies who balk at the call of distant masters, anarchist movements who want the freedom to live without government oversight, and the rare \
 	Trans-Stellar who no longer see a benefit in working with SolGov. Full colonial independence is still a political impossibility so long as the \
 	[quick_link("Icarus Front")] holds any sway, and so the Movement is focused primarily on securing more autonomy in governance, although a growing revolutionary sub-group \
@@ -96,4 +96,4 @@
 	measures to reduce the amount of power held by the TSCs. In many ways a holdover from the days before the [quick_link("Shadow Coalition")], where corporate malfeasance took \
 	the place of technological development as the primary issue of debate, the FTU has found itself adopting technological positions similar to the SEO as a matter \
 	of pragmatism, although the views of individual members vary. The FTU is known for their intense lobbying of SolGov to add tax rebates to the purchases of \
-	personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success."
+	personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success."
@@ -471,7 +471,7 @@
 	<br><br>\
 	I don't see this whole affair as a chance to spread the galactic anti-corporate revolution the way President Fisher does, of course. I make no secret of my stance on Trans-Stellars, but I also know that we're better off with Sol than without. The 'Silent Collapse' was two hundred years ago, but we still bear the scars from it. When the Scandinavian Union pulled out support for the Sivian colonization project, SolGov saved us. I do mean saved us, sure as if they'd fished us out of a life pod. There were no factories, no steel, no concrete on Sif until the Engineering Corps built Radiance and New Reykjavik. Corporations and regional governments cowered from the Karan pirates, until the Marines chased them out. Whether Sivian or Karan, you owe the roof over your head to the Sol Confederate Government. With that great debt in mind, how dare we turn our backs on the Bowl, or Abel's Rest, or Nyx, when they need us! How dare we let oligarchs prey on the weak! How dare we choose not to act when we have, by virtue of our votes in the Assembly and our voice within the halls of public debate, the means to share our peace and prosperity with the rest of our people!\
 	<br><br>\
-	This is what I mean by SolGov being the only true republic, the only state founded for the common good. The 'human spirit' West croons on about isn't our industriousness, or our skill at arms. If humanity-- if this Terran culture is commendable for anything, it is that we assist our fellows. We take in Casteless Skrell, Unbound Unathi, republican Tajaran. We pass around the hat when someone's house burns down. We help our friends, our neighbors, and even strangers. The fact that Martei and Harper are perverting this impulse, padding their juntas with the air of legitimacy to inspire honest people to ride to their defense, is the reason their state is unconscionable, the reason it was was born flawed, the reason we cannot suffer it to continue, much less help it on its way.\
+	This is what I mean by SolGov being the only true republic, the only state founded for the common good. The 'human spirit' West croons on about isn't our industriousness, or our skill at arms. If humanity-- if this Solar culture is commendable for anything, it is that we assist our fellows. We take in Casteless Skrell, Unbound Unathi, republican Tajaran. We pass around the hat when someone's house burns down. We help our friends, our neighbors, and even strangers. The fact that Martei and Harper are perverting this impulse, padding their juntas with the air of legitimacy to inspire honest people to ride to their defense, is the reason their state is unconscionable, the reason it was was born flawed, the reason we cannot suffer it to continue, much less help it on its way.\
 	<br><br>\
 	Now, I'm sure you've noticed by now, that I haven't said much more than three words about technoprogressivism, or transtech, or whatever the word du jour is. Frankly, that's on purpose. 'Transtech' has never once been about technology. The Icarus Front-- the old one, that united us and took us to the stars, not the new one we spend forty hours a week arguing with about healthcare-- The Icarus Front was a popular revolution, you know. Hel, they were Marxists. It was a world where the kind of lack of accountability, the entrenched oligarchy and geographical class divide that we're dealing with now was spiraling out of control. In the old United States, the rich and powerful got the technology to grow loyal subjects in tubes, to make drone intelligences smarter in some ways than a human could ever be, to-- well, to do what Angessa Martei's done, only with no SolGov to stop her. Meanwhile, the 'little people' in the Middle East, Southeast Asia, and other 'forgotten' parts of the world were left behind, hopelessly. I don't mean to downplay the importance of the Gray Tide, but if you look at historical accounts from that era, the thing that really united the Front was the knowledge that, if they didn't act immediately, they'd be seen as 'externalities' by immortal superintelligent businesspeople and politicians. The take-away from the Gray Tide should never have been that 'nanotechnology is dangerous'-- it should have been 'nobody should be able to destroy an entire city without facing consequences.'\
 	<br><br>\
@@ -716,7 +716,7 @@ var/global/list/mining_overlay_cache = list()

 /turf/simulated/mineral/proc/artifact_debris(var/severity = 0)
 	//cael's patented random limited drop componentized loot system!
-	//sky's patented not-fucking-retarded overhaul!
+	//sky's patented non-mischievious overhaul!

 	//Give a random amount of loot from 1 to 3 or 5, varying on severity.
 	for(var/j in 1 to rand(1, 3 + max(min(severity, 1), 0) * 2))
@@ -113,7 +113,7 @@
 	corpseidaccess = "Syndicate"

 /obj/effect/landmark/mobcorpse/syndicatecommando
-	name = "Syndicate Commando"
+	name = "Mercenary Commando"
 	corpseuniform = /obj/item/clothing/under/syndicate
 	corpsesuit = /obj/item/clothing/suit/space/void/merc
 	corpseshoes = /obj/item/clothing/shoes/boots/swat
@@ -17,7 +17,7 @@
 	var/toxloss = 0.0	//Toxic damage caused by being poisoned or radiated
 	var/fireloss = 0.0	//Burn damage caused by being way too hot, too cold or burnt.
 	var/cloneloss = 0	//Damage caused by being cloned or ejected from the cloner early. slimes also deal cloneloss damage to victims
-	var/brainloss = 0	//'Retardation' damage caused by someone hitting you in the head with a bible or being infected with brainrot.
+	var/brainloss = 0	//Thought-scrambly damage caused by someone hitting you in the head with a bible or being infected with brainrot.
 	var/halloss = 0		//Hallucination damage. 'Fake' damage obtained through hallucinating or the holodeck. Sleeping should cause it to wear off.

 	var/nutrition = 400
@@ -82,4 +82,4 @@

 	var/inventory_panel_type = /datum/inventory_panel
 	var/datum/inventory_panel/inventory_panel
-	var/last_resist_time = 0 // world.time of the most recent resist that wasn't on cooldown.
+	var/last_resist_time = 0 // world.time of the most recent resist that wasn't on cooldown.
@@ -435,6 +435,6 @@
 	icon_state = "weldtank"
 	amount_per_transfer_from_this = 10

-/obj/structure/reagent_dispenser/he3/Initialize()
-	..()
+/obj/structure/reagent_dispensers/he3/Initialize()
+	. = ..()
 	reagents.add_reagent("helium3",1000)
@@ -4440,8 +4440,6 @@
 	nutriment_factor = 40 //very filling
 	color = "#d169b2"

-//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021
-
 /datum/reagent/drink/soda/kompot
 	name = "Kompot"
 	id = "kompot"
@@ -4519,4 +4517,4 @@
 	id = "gauli_juice"
 	description = "Juice from a ga'uli pod, used in skrellian and teshari cooking."
 	color = "#6f83a6"
-	taste_description = "mintyness"
+	taste_description = "mintyness"
@@ -136,7 +136,7 @@

 /mob/living/carbon/proc/spread_disease_to(var/mob/living/carbon/victim, var/vector = "Airborne")
 	if (src == victim)
-		return "retardation"
+		return "Neurodegeneration"

 //	log_debug("Spreading [vector] diseases from [src] to [victim]")
 	if (virus2.len > 0)
@@ -420,10 +420,10 @@
 	if(full_heat_capacity + s_full_heat_capacity)
 		temp_avg = (temperature * full_heat_capacity + other.temperature * s_full_heat_capacity) / (full_heat_capacity + s_full_heat_capacity)

-	//WOOT WOOT TOUCH THIS AND YOU ARE A RETARD.
+	//WOOT WOOT TOUCH THIS AND YOU ARE A MISCHIEVIOUS LITTLE ELF
 	if(sharing_lookup_table.len >= connecting_tiles) //6 or more interconnecting tiles will max at 42% of air moved per tick.
 		ratio = sharing_lookup_table[connecting_tiles]
-	//WOOT WOOT TOUCH THIS AND YOU ARE A RETARD
+	//WOOT WOOT TOUCH THIS AND YOU ARE A MISCHIEVIOUS LITTLE ELF

 	for(var/g in avg_gas)
 		gas[g] = max(0, (gas[g] - avg_gas[g]) * (1 - ratio) + avg_gas[g])