[MIRROR] Spellcheck and touch-up sweep

code/modules/codex/entries/engineering.dm

@@ -8,8 +8,7 @@
 	Optical meson scanners on your eyes, to prevent hallucinations when looking at the supermatter.<br>\
 	Radiation helmet and suit, as the supermatter is radioactive.<br>\
 	<br>\
-	Touching the supermatter will result in *instant death*, with no corpse left behind!  You can drag the supermatter, but anything else will kill you. \
-	It is advised to obtain a genetic backup before trying to drag it."
+	Touching the supermatter will result in *instant death*, with no corpse left behind!  You can drag the supermatter, but anything else will kill you."
 	antag_text = "Exposing the supermatter to oxygen or vacuum will cause it to start rapidly heating up.  Sabotaging the supermatter and making it explode will \
 	cause a period of lag as the explosion is processed by the server, as well as irradiating the entire station and causing hallucinations to happen.  \
 	Wearing radiation equipment will protect you from most of the delamination effects sans explosion."

code/modules/codex/entries/medical.dm

@@ -83,4 +83,4 @@
 	<br>\
 	There are several things to keep in mind when using it. First off, you need Basic Medicine AND Anatomy skills to align it properly, otherwise it'll hurt patient. \
 	It will only provide some circulation, you need to fix blood volume and oxygen supply issues for it to be useful. \
-	It performs worse than manual CPR by a skilled user and will NOT restart the heart. It's advantage is automatic nature.<br>"
+	It performs worse than manual CPR by a skilled user and will NOT restart the heart. Its advantage is in its automatic nature.<br>"

code/modules/codex/entries/misc.dm

@@ -10,7 +10,8 @@
 
 /datum/codex_entry/sneakies
 	associated_paths = list(/obj/item/clothing/shoes/laceup/sneakies)
-	lore_text =  "Originally designed to confuse Terran troops on the swamp moon of Nabier XI, where they were proven somewhat effective. Not bad on a space vessel, either."
+	lore_text =  "Originally designed to confuse patrols along Northern Gaia's many lake shorelines and swamps, where they were proven somewhat effective \
+	in disorienting searches in the opposite direction. Not bad on a space vessel, so long as you have something coating your shoes."
 
 /datum/codex_entry/moneygun
 	associated_paths = list(/obj/item/gun/launcher/money)

code/modules/codex/entries/paperwork.dm

@@ -12,7 +12,7 @@
 \[small\] - \[/small\] : Decreases the size of the text.<br>
 \[large\] - \[/large\] : Increases the size of the text.<br>
 \[sign\] : Inserts a signature of your name in a foolproof way.<br>
-\[field\] : Inserts an invisible field which lets you start type from there. Useful for forms.<br>
+\[field\] : Inserts an invisible field which lets you start typing from there. Useful for forms.<br>
 \[date\] : Inserts today's station date.<br>
 \[time\] : Inserts the current station time.<br>
 \[table\] - \[/table\] : Creates table using \[row\] and \[cell\] tags.<br>

code/modules/codex/entries/tools.dm

@@ -54,7 +54,7 @@
 /datum/codex_entry/geiger_counter
 	associated_paths = list(/obj/item/device/geiger)
 	mechanics_text = "By using this item, you may toggle its scanning mode on and off. Examine it while it's on to check for ambient radiation."
-	lore_text = "For centuries geiger counters have been saving the lives of unsuspecting laborers and technicians. You can never be too careful around radiation."
+	lore_text = "For centuries, geiger counters have been saving the lives of unsuspecting laborers and technicians. You can never be too careful around radiation."
 
 /datum/codex_entry/light_replacer
 	associated_paths = list(/obj/item/device/lightreplacer)

code/modules/culture_descriptor/culture/cultures_human.dm

@@ -56,7 +56,7 @@
 	name = CULTURE_HUMAN_VENUSIAN
 	description = "You are from one of the many zones of Venus. Floating high above the ground of the planet on massive platforms, you are one of the many who live on one of the most decadent locations in the \
 	SCG. As a Venusian, you know luxury, wealth and entertainment. Primarily a tourist destination, many of the permanent residents work in the tourism industry and are notably middle-income. \
-	Those above are exceptionally wealthy, being hotel, casino, resort owners, politicians, bankers or rich retirees."
+	Those above are exceptionally wealthy: being hotel, casino, resort owners, politicians, bankers or rich retirees."
 	economic_power = 1.4
 
 /singleton/cultural_info/culture/human/venusian_surfacer
@@ -147,16 +147,16 @@
 
 /singleton/cultural_info/culture/human/foster
 	name = CULTURE_HUMAN_FOSTER
-	description = "Foster's World was once considered too cold and desolate for habitation, but decades of inhabitence by the Fostermen has turned it into a productive and popular destination. \
+	description = "Foster's World was once considered too cold and desolate for habitation, but decades of inhabitance by the Fostermen has turned it into a productive and popular destination. \
 	Fostermen are traditionally noted for their resourcefulness and motivation, as well as a preference for being in colder environments. \
-	Snow is second nature to people from Foster's World, and they've made a name for themselves exploring and fishing it's thermal oceans. "
+	Snow is second nature to people from Foster's World, and they've made a name for themselves exploring and fishing its thermal oceans. "
 	economic_power = 1.1
 
 /singleton/cultural_info/culture/human/tadmor
 	name = CULTURE_HUMAN_TADMOR
-	description = "Tadmor is one of the SCG's more successful colonial projects, and it's culture is rich and dignified as a result. \
+	description = "Tadmor is one of the SCG's more successful colonial projects, and its culture is rich and dignified as a result. \
 	Mostly living in the fissures of the desert world, Tadmorians are most famous for their cultural Pacifism, with their aversion to participation in \
-	the Gaia Conflict being seen by all residents as either a proud moment or a stain in the planets rich, Mars-Rooted history. "
+	the Gaia Conflict being seen by all residents as either a proud moment or a stain in the planets rich, Mars-rooted history. "
 	economic_power = 1.2
 
 /singleton/cultural_info/culture/human/iolaus
@@ -201,6 +201,27 @@
 	dominates the green planet, and the myriad of exotic life found in its freshwater system."
 	economic_power = 0.7
 
+<<<<<<< ours
+=======
+/singleton/cultural_info/culture/human/theia
+	name = CULTURE_HUMAN_THEIA
+	description = "Theia is an inhabited system on the borders of the Sol Central Government known primarily for being the headquarters of the Third Fleet. \
+	Located strategically at the gateway closest to several key frontier systems, Theia became known early on as a strategic chokepoint worth defending. \
+	Today, military and civilian personnel alike call the Theia system home and work tirelessly to maintain it as the Fortress of Sol. "
+	economic_power = 1.1
+
+/singleton/cultural_info/culture/human/offworld
+	name = CULTURE_HUMAN_OFFWORLD
+	description =  "You are from one of many far flung and outlying settlements that aren't notable enough to be on standard Solar maps. Raised out of touch and out of connection with the galaxy at large, \
+	those who live so far from anything only look to their close family and friends rather than any larger group. Whether it's a fueling station, an agriculutral dome, or a planet that is far removed from \
+	the luxuries of the gateway network, such people are raised in small, confined environments with few others, and tend to be most familiar with older, reliable but outdated \
+	technology. An independent sort, Offworlders are more likely to be isolationist and self-driven."
+	economic_power = 0.9
+	language = LANGUAGE_SPACER
+
+// NON SCG BELOW
+
+>>>>>>> theirs
 /singleton/cultural_info/culture/human/magnitka
 	name = CULTURE_HUMAN_MAGNITKA
 	description = "Magnitka often gives birth to rough-hewn, sturdy citizens with its austere political and environmental climate, and many are often well-sought for the \
@@ -218,6 +239,7 @@
 	economic_power = 1
 	language = LANGUAGE_SPACER
 
+<<<<<<< ours
 /singleton/cultural_info/culture/human/offworld
 	name = CULTURE_HUMAN_OFFWORLD
 	description =  "You are from one of many far flung and outlying settlements that aren't notable enough to be on standard Solar maps. Raised out of touch and out of connection with the galaxyat large, \
@@ -241,6 +263,82 @@
 	description = "You are from the outskirts of the Gilgamesh Colonial Confederation. Terran Colonists have a mixed view of their nation state, raging from strong nationalism to resentment for the state, but \
 	they all have the legacy of resource extraction and mandatory conscription in common. Being from a nation of conscripts means that Terran Colonists are often resourceful and experienced, \
 	having grown to cope with the horrors of dysfunctional economics and mandatory military service. Terrans today are generally poor, bitter and a somewhat broken people angry and \
+=======
+/singleton/cultural_info/culture/human/confederate_terra
+	name = CULTURE_HUMAN_CONFED_TERRA
+	description = "You are from the core of the Gilgamesh Colonial Confederation. Being from the Confederation's capital, your people embody what it means to be a part of the GCC. \
+	Unfortunately, the years since the war have not been easy on Terra, and the long period of economic recovery has not made life easy. The people of Terra are typically employed \
+	in the military, industrial, government or service sectors, with an emphasis being placed on mandatory military service. Terrans today are generally poor, bitter and a somewhat broken people angry and \
+	resentful about their loss in the Gaia Conflict. An upbringing from Terra emphasises an odd mix of service to the state, liberalism and militarism."
+	language = LANGUAGE_HUMAN_RUSSIAN
+	economic_power = 1.1
+
+/singleton/cultural_info/culture/human/confederate_zemlya
+	name = CULTURE_HUMAN_CONFED_ZEMLYA
+	description = "You are from the core of the Gilgamesh Colonial Confederation. Being from Gilgamesh's Industrial Capital, your people embody what it means to be a part of the working class GCC. \
+	Unfortunately, the years since the war have not been easy on Zemlya and the long period of economic recovery has not made life easy. The people of Zemlya are typically employed \
+	in the vast industrial sector. Less patriotic then those from Terra itself, Zemlyans are still an extremely proud people who have pride in their industrial and working class origins."
+	language = LANGUAGE_HUMAN_RUSSIAN
+	economic_power = 1.0
+
+/singleton/cultural_info/culture/human/confederate_sestris
+	name = CULTURE_HUMAN_CONFED_SESTRIS
+	description = " You are from the Union of Sestris and Bratis - second only to Gilgamesh in terms of political and economic power within the GCC, \
+	citizens of Sestris enjoy a generally high standard of living and many can be found within the ranks of the ICCG Defense Forces. Those from Amelie, \
+	within Sestris itself are immensely proud of their Franco heratige, with many holding on to some of their cultural roots. "
+	language = LANGUAGE_HUMAN_RUSSIAN
+	secondary_langs = list(LANGUAGE_HUMAN_EURO)
+	economic_power = 1.3
+
+/singleton/cultural_info/culture/human/confederate_putkari
+	name = CULTURE_HUMAN_CONFED_PUTKARI
+	description = "You are from Putkari in the Baroda system. Settled in the wake of the Terran Commonwealth's exploration Boom, Putkari was abandoned by \
+	the SCG following its founding and left to die. Embracing the newly founded GCC, Putkari has been a loyal and devoted member of the Confederation \
+	ever since. Extremely hostile to the SCG ever since its abandonment, Putkarians are some of the most vocal within the Confederation in terms of \
+	resentment of the loss in the Gaia Conflict, many beat the war drums and fan the fires of jingoism in hopes of one day enacting a form of vengance. "
+	language = LANGUAGE_HUMAN_INDIAN
+	economic_power = 0.7
+
+/singleton/cultural_info/culture/human/confederate_altair
+	name = CULTURE_HUMAN_CONFED_ALTAIR
+	description = "You are from Altair. Once a free economic zone, the breaking of the moon of Qabil brought sweeping and more authoritarian change to Altair. \
+	One of the more materially wealthy members of the Confederation outside of the Founders, Altarians are not overly interested in the Confederation as a whole, \
+	with most choosing to be public workers such as paramedics or infastructure maintainers for the duration of their mandatory state service."
+	language = LANGUAGE_HUMAN_ARABIC
+	economic_power = 1.0
+
+/singleton/cultural_info/culture/human/confederate_penglai
+	name = CULTURE_HUMAN_CONFED_PENGLAI
+	description = "You are from Penglai, a traditionalist world within the Gilgamesh Colonial Confederation. A small world with a marginal atmosphere  \
+	breathable by its inhabitants, its main economic contribution to the confederation is in its abundant rare earth element deposits. Another \
+	colony that was in need of support following the founding of the SCG, Pengali is a content member of the Confederation while keeping their own traditions alive. "
+	language = LANGUAGE_HUMAN_CHINESE
+	economic_power = 0.8
+
+/singleton/cultural_info/culture/human/confederate_providence
+	name = CULTURE_HUMAN_CONFED_PROVIDENCE
+	description = "You are from Providence, settled originally by private ventures. Providence's planet of Atlanticus developed a booming space station industry, \
+	resulting in the construction of three mega-space-complexes within the system. Bolstered by a flood of working class immigrants and research funding following \
+	their entry to the Confederation, those from Providence are typically quite pleased with their position within the Confederation, though many still choose to \
+	emigrate elsewhere in hopes of finding work outside of the industrial or scientific sectors. "
+	language = LANGUAGE_HUMAN_RUSSIAN
+	economic_power = 1.0
+
+/singleton/cultural_info/culture/human/confederate_valy
+	name = CULTURE_HUMAN_CONFED_VALY
+	description = "You are from Valy, the 'black sheep' of the Confederation. Brought into the Confederation when Valy's civil war was ended by the GCN's intervention \
+	Valy has possessed a resistance to the Confederation ever since. The emergence of the Frontier Alliance has emboldened these resistance actions, with \
+	public desires to join the Alliance only being held back by the Confederation's continued presence. Those from Valy are typically quite bitter about their present \
+	situation, with many who choose to emigrate continuing to support efforts to bring about the Alliance's agenda in 'freeing Valy from its shackles'. "
+	language = LANGUAGE_HUMAN_RUSSIAN
+	economic_power = 0.6
+
+/singleton/cultural_info/culture/human/confederate_colony
+	name = CULTURE_HUMAN_CONFEDO
+	description = "You are from the outskirts of the Gilgamesh Colonial Confederation. Confederates have a mixed view of their nation state, raging from strong nationalism to resentment for the state, but \
+	they all have the legacy of resource extraction and mandatory conscription in common. Being from a nation of conscripts means that Confederates are often resourceful and experienced, \
+	having grown to cope with the horrors of dysfunctional economics and mandatory military service. Confederates today are generally poor, bitter and somewhat broken people, angry and \
+>>>>>>> theirs
 	resentful about their loss in the Gaia Conflict. Colonial Confederation education emphasizes service to the state, liberalism and militarism."
 	language = LANGUAGE_HUMAN_RUSSIAN
 	economic_power = 0.7

code/modules/culture_descriptor/culture/cultures_skrell.dm

@@ -1,7 +1,7 @@
 /singleton/cultural_info/culture/skrell
 	name = CULTURE_SKRELL_QERR
 	description = "Considered as the leaders of Skrellkind, the Qerr-Katish are the face and soul of skrellian society. \
-		Managers, diplomats, lawyers, they are notably the only caste allowed to fulfil the role of Qerr-Skria,\
+		Managers, diplomats, lawyers, they are notably the only caste allowed to fulfill the role of Qerr-Skria,\
 		and the only one forbidden from being appointed to the Xaq Moglar. As the representatives of the Skrell, \
 		the Qerr-Katish are highly social beings, sophisticated, cultured and very organised. As defenders of their society's \
 		values, they tend to be rather conservative, although progressive ideas regularly grow within the caste, as a stagnant \
@@ -46,26 +46,26 @@
 /singleton/cultural_info/culture/skrell/caste_talum
 	name = CULTURE_SKRELL_TALUM
 	description = " Considering the Skrells' emphasis on functionality and practicality, one would be mistaken to think they do not consider arts much. \
-		This very important sector of skrellian society is handled by the Talum-Katish, artists, aesthetes, entertainers, chefs, actors, writers, singers. \
+		This very important sector of skrellian society is handled by the Talum-Katish as artists, aesthetes, entertainers, chefs, actors, writers, and singers. \
 		They somewhat compete with the Qerr-Katish's role as representatives of skrellkind, although in a different way. As such, they are often mistaken for \
 		Qerr-Katish themselves, which might explain why this caste is generally seen as rarer and less celebrated than the others, while they are in fact \
-		frequently on the public scene. The Talum-Katish are the most individualistic members of skrellkind, although once again, they share the Qerr-Katish's \
+		frequently on the public scene. The Talum-Katish are the most individualistic members of skrellkind, although they share the Qerr-Katish's \
 		taste for a busy social life. Highly cultured, they are the free-thinkers of skrellian society, often at odds with more traditionalist and conservative castes. \
 		A heterogeneous lot, it is hard to estimate their global financial capacities, they however tend to reproduce a lot, multiplying their encounters \
 		with various partners, which might put a strain on their savings. Their clothing is often an odd mix of Qerr-Katish and Kanin-Katish, as they often wear \
-		clothing that is colourful , adorned with embroidery and their headtails sparkling with various brilliant metals. Their skin is generally purple, blue, pink, orange, red or white."
+		clothing that is colourful — adorned with embroidery and their headtails sparkling with various brilliant metals. Their skin is generally purple, blue, pink, orange, red or white."
 	economic_power = 1.3
 
 /singleton/cultural_info/culture/skrell/caste_raskinta
 	name = CULTURE_SKRELL_RASKINTA
-	description = "Rarely seen outside the skrellian society, the Raskinta-Katish are however recognised and respected by their entire species, for \
-		they are the ones who ensure the safety and stability of skrellian civilisation, both against internal and external threats. \
-		The military caste of the Skrell, most end up working for the various city-states, either in the police or as a career soldier,\
+	description = "Rarely seen outside the skrellian society, the Raskinta-Katish are recognised and respected by their entire species, for \
+		they are the ones who ensure the safety and stability of skrellian civilisation against both internal and external threats. \
+		The military caste of the Skrell, most end up working for the various city-states as either police or as career soldiers,\
 		although some of them end up working for private security or as entertainment fighters. They are very conservative, almost reactionary, \
 		and deeply committed to their community, caring very little for self-development and personal satisfaction. Their martial training \
 		leaves very little time for most intellectual pursuits, although they are trained to be expert tacticians and are only beaten by the \
 		Qerr-Katish in terms of organisational skills. While they are wealthier than the Kanin-Katish overall, they are still among the poorer \
 		castes of skrellkind and their large families of three or four bondings put a heavy strain on their earnings, only compensated by their \
-		strong social cohesion. These are often the hardest to spot among a crowd because they intentionally wear clothing other castes are known \
+		strong social cohesion. Raskinta-Katish skrell are often the hardest to spot among a crowd because they intentionally wear clothing other castes are known \
 		for while not working, however they tend to stick to clothing that is easy to move in and are often dark blue. Their skin is generally green, blue, black, brown or yellow."
 	economic_power = 1.2