diff --git a/code/datums/outfits/outfit_vr.dm b/code/datums/outfits/outfit_vr.dm
index d8a8a58d21..f900131392 100644
--- a/code/datums/outfits/outfit_vr.dm
+++ b/code/datums/outfits/outfit_vr.dm
@@ -48,8 +48,8 @@
C.registered_name = H.real_name
return C
-/decl/hierarchy/outfit/solgov/representative
- name = "SolGov Representative"
+/decl/hierarchy/outfit/solcom/representative
+ name = "SolCom Representative"
shoes = /obj/item/clothing/shoes/laceup
l_ear = /obj/item/device/radio/headset/centcom
uniform = /obj/item/clothing/under/suit_jacket/navy
@@ -59,13 +59,13 @@
r_hand = /obj/item/device/pda/centcom
l_hand = /obj/item/weapon/clipboard
-/decl/hierarchy/outfit/solgov/representative/equip_id(mob/living/carbon/human/H)
+/decl/hierarchy/outfit/solcom/representative/equip_id(mob/living/carbon/human/H)
var/obj/item/weapon/card/id/C = ..()
- C.name = "[H.real_name]'s SolGov ID Card"
+ C.name = "[H.real_name]'s SolCom ID Card"
C.icon_state = "lifetime"
C.access = get_all_station_access()
C.access += get_all_centcom_access()
- C.assignment = "SolGov Representative"
+ C.assignment = "SolCom Representative"
C.registered_name = H.real_name
return C
diff --git a/code/game/objects/banners.dm b/code/game/objects/banners.dm
index 3bca84896d..4d5a77dc7f 100644
--- a/code/game/objects/banners.dm
+++ b/code/game/objects/banners.dm
@@ -31,8 +31,10 @@
desc = "A banner with the symbol of the Solar Confederate Government."
catalogue_data = list(/datum/category_item/catalogue/information/organization/solgov)
+/* //VOREStation Removal
/obj/item/weapon/banner/virgov
name = "\improper VirGov banner"
icon_state = "banner-virgov"
desc = "A banner with the symbol of the local government, the Vir Governmental Authority, also known as VirGov."
- catalogue_data = list(/datum/category_item/catalogue/information/organization/virgov)
\ No newline at end of file
+ catalogue_data = list(/datum/category_item/catalogue/information/organization/virgov)
+*/
\ No newline at end of file
diff --git a/code/game/objects/banners_vr.dm b/code/game/objects/banners_vr.dm
new file mode 100644
index 0000000000..75b014b1cc
--- /dev/null
+++ b/code/game/objects/banners_vr.dm
@@ -0,0 +1,2 @@
+/obj/item/weapon/banner/solgov
+ name = "\improper SolCom banner"
\ No newline at end of file
diff --git a/code/game/objects/effects/decals/posters/polarisposters_vr.dm b/code/game/objects/effects/decals/posters/polarisposters_vr.dm
new file mode 100644
index 0000000000..5045346289
--- /dev/null
+++ b/code/game/objects/effects/decals/posters/polarisposters_vr.dm
@@ -0,0 +1,5 @@
+/datum/poster/nanotrasen/nt_7
+ name = "SolCom"
+ desc = "This poster showcases an TCG emblem. The outer ring reads,\
+ \"NIL MORTALIBUS ARDUI EST\".\
+ Commonwealth of Sol-Procyon."
diff --git a/code/global.dm b/code/global.dm
index 51f2c9e5f3..9e6b6c555b 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -37,7 +37,7 @@ var/href_logfile = null
// var/const/starsys_name = "Vir"
var/const/game_version = "VOREStation"
var/changelog_hash = ""
-var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
+var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 300) //VOREStation Edit
var/round_progressing = 1
var/master_mode = "extended" // "extended"
diff --git a/code/modules/busy_space_vr/organizations.dm b/code/modules/busy_space/organizations_vr.dm
similarity index 60%
rename from code/modules/busy_space_vr/organizations.dm
rename to code/modules/busy_space/organizations_vr.dm
index 021aef8ff2..439c02567f 100644
--- a/code/modules/busy_space_vr/organizations.dm
+++ b/code/modules/busy_space/organizations_vr.dm
@@ -61,12 +61,12 @@
name = "NanoTrasen Incorporated"
short_name = "NanoTrasen"
acronym = "NT"
- desc = "NanoTrasen is one of the foremost research and development companies in SolGov space. \
+ desc = "NanoTrasen is one of the foremost research and development companies in Commonwealth space. \
Originally focused on consumer products, their swift move into the field of Phoron has lead to \
them being the foremost experts on the substance and its uses. In the modern day, NanoTrasen prides \
itself on being an early adopter to as many new technologies as possible, often offering the newest \
products to their employees. In an effort to combat complaints about being 'guinea pigs', Nanotrasen \
- also offers one of the most comprehensive medical plans in SolGov space, up to and including cloning \
+ also offers one of the most comprehensive medical plans in Commonwealth space, up to and including cloning \
and therapy.\
\
NT's most well known products are its phoron based creations, especially those used in Cryotherapy. \
@@ -113,9 +113,9 @@
"NAB Smythside Central Headquarters in Sol",
"NAS Zeus orbiting Virgo-Prime",
"NIB Posideon in Alpha Centauri",
- "NTB An-Nur on Virgo-Prime",
+ "NTB Anur on Virgo-Prime",
"the colony at Virgo-3B",
- "the NanoTrasen phoron refinery in Vilous",
+ "the phoron refinery in Vilous",
"a dockyard orbiting Virgo-Prime",
"an asteroid orbiting Virgo 3",
)
@@ -137,7 +137,7 @@
desc = "Hephaestus Industries is the largest supplier of arms, ammunition, and small millitary vehicles in Sol space. \
Hephaestus products have a reputation for reliability, and the corporation itself has a noted tendency to stay removed \
from corporate politics. They enforce their neutrality with the help of a fairly large asset-protection contingent which \
- prevents any contracting polities from using their own materiel against them. SolGov itself is one of Hephastus’ largest \
+ prevents any contracting polities from using their own materiel against them. The Terran Commonwealth and the Salthan Fyrds are of Hephastus’ largest \
bulk contractors owing to the above factors."
history = ""
work = "arms manufacturer"
@@ -164,7 +164,7 @@
"Tyr"
)
destination_names = list(
- "a SolGov dockyard on Luna",
+ "a SolCom dockyard on Luna",
"a Fleet outpost in the Almach Rim",
"a Fleet outpost on the Moghes border"
)
@@ -173,13 +173,13 @@
name = "Vey-Medical"
short_name = "Vey-Med"
acronym = "VM"
- desc = "Vey-Med is one of the newer TSCs on the block and is notable for being largely owned and opperated by Skrell. \
- Despite the suspicion and prejudice leveled at them for their alien origin, Vey-Med has obtained market dominance in \
+ desc = "Vey-Med is one of the newer TSCs on the block and is notable for being largely owned and opperated by Skrell and Elysians. \
+ Despite the suspicion and prejudice leveled at them for their origin, Vey-Med has obtained market dominance in \
the sale of medical equipment-- from surgical tools to large medical devices to the Oddyseus trauma response mecha \
and everything in between. Their equipment tends to be top-of-the-line, most obviously shown by their incredibly \
- human-like FBP designs. Vey’s rise to stardom came from their introduction of ressurective cloning, although in \
- recent years they’ve been forced to diversify as their patents expired and NanoTrasen-made medications became \
- essential to modern cloning."
+ human-like FBP designs. Vey’s rise to stardom came from their introduction of ressurective cloning, although in \
+ recent years they’ve been forced to diversify as their patents expired and NanoTrasen-made medications became \
+ essential in bulk cloning."
history = ""
work = "medical equipment supplier"
headquarters = ""
@@ -214,8 +214,8 @@
acronym = "ZH"
desc = "Zeng-Hu is an old TSC, based in the Sol system. Until the discovery of Phoron, Zeng-Hu maintained a stranglehold \
on the market for medications, and many household names are patentted by Zeng-Hu-- Bicaridyne, Dylovene, Tricordrizine, \
- and Dexalin all came from a Zeng-Hu medical laboratory. Zeng-Hu’s fortunes have been in decline as Nanotrasen’s near monopoly \
- on phoron research cuts into their R&D and Vey-Med’s superior medical equipment effectively decimated their own equipment \
+ and Dexalin all came from a Zeng-Hu medical laboratory. Zeng-Hu’s fortunes have been in decline as Nanotrasen’s development of \
+ mass cloning medication cuts into their R&D and Vey-Med’s superior medical equipment effectively decimated their own equipment \
interests. The three-way rivalry between these companies for dominance in the medical field is well-known and a matter of \
constant economic speculation."
history = ""
@@ -233,8 +233,8 @@
desc = "Ward-Takahashi focuses on the sale of small consumer electronics, with its computers, communicators, \
and even mid-class automobiles a fixture of many households. Less famously, Ward-Takahashi also supplies most \
of the AI cores on which vital control systems are mounted, and it is this branch of their industry that has \
- led to their tertiary interest in the development and sale of high-grade AI systems. Ward-Takahashi’s economies \
- of scale frequently steal market share from Nanotrasen’s high-price products, leading to a bitter rivalry in the \
+ led to their tertiary interest in the development and sale of high-grade AI systems. Ward-Takahashi’s economies \
+ of scale frequently steal market share from Nanotrasen’s high-price products, leading to a bitter rivalry in the \
consumer electronics market."
history = ""
work = "electronics manufacturer"
@@ -261,10 +261,10 @@
name = "Bishop Cybernetics"
short_name = "Bishop"
acronym = "BC"
- desc = "Bishop’s focus is on high-class, stylish cybernetics. A favorite among transhumanists (and a bête noire for \
+ desc = "Bishop's focus is on high-class, stylish cybernetics. A favorite among transhumanists (and a byte noire for \
bioconservatives), Bishop manufactures not only prostheses but also brain augmentation, synthetic organ replacements, \
and odds and ends like implanted wrist-watches. Their business model tends towards smaller, boutique operations, giving \
- it a reputation for high price and luxury, with Bishop cyberware often rivalling Vey-Med’s for cost. Bishop’s reputation \
+ it a reputation for high price and luxury, with Bishop cyberware often rivalling Vey-Med’s for cost. Bishop’s reputation \
for catering towards the interests of human augmentation enthusiasts instead of positronics have earned it ire from the \
Positronic Rights Group and puts it in ideological (but not economic) comptetition with Morpheus Cyberkinetics."
history = ""
@@ -389,10 +389,10 @@
/datum/lore/organization/tsc/xion
name = "Xion Manufacturing Group"
short_name = "Xion"
- desc = "Xion, quietly, controls most of the market for industrial equipment. Their portfolio includes mining exosuits, \
+ desc = "Xion, quietly, controls most of the market for industrial equipment on the frontier. Their portfolio includes mining exosuits, \
factory equipment, rugged positronic chassis, and other pieces of equipment vital to the function of the economy. Xion \
keeps its control of the market by leasing, not selling, their equipment, and through infamous and bloody patent protection \
- lawsuits. Xion are noted to be a favorite contractor for SolGov engineers, owing to their low cost and rugged design."
+ lawsuits. Xion are noted to be a favorite contractor for Rim engineers, owing to their low cost and rugged design."
history = ""
work = "industrial equipment manufacturer"
headquarters = ""
@@ -429,29 +429,21 @@
destination_names = list()
/datum/lore/organization/gov/solgov
- name = "Solar Central Government"
- short_name = "SolGov"
- acronym = "SCG"
- desc = "SolGov is a federation of human governmental entities based on Earth, Sol, which defines top-level law for their member systems. \
- Member systems receive various benefits such as defensive pacts, trade agreements, social support and funding, and being able to participate \
- in the Colonial Assembly. The majority, but not all human territories are members of SolGov. As such, SolGov is a major power and \
- generally represents humanity on the galactic stage."
- history = "A Unified Earth Government was formed in the wake of the Sol Interplanetary War and other conflicts of the 2160s. \
- With numerous Earth governments fighting independent battles against factions of both Facist and Communist forces, the UN became \
- involved, eventually using the war to absorb most, if not all Earth governments into itself, forming a global government to combat \
- the terrorists and stabilize the planet and its other world colonies. The UN won the war and the Unified Earth Government was formed, \
- with its' primary defense, scientific and exploratory force being the newly formed USDF. Although the UEG seemed to have complete \
- control over Earth and Sol's colonies, the UN still existed as an organization and a political entity to continue mediating between \
- countries and colonies. In 2291, Tobias Shaw and Wallace Fujikawa invented a device that could transition normal matter into slipspace \
- (bluespace), and FTL travel became possible. As humanity expanded beyond the Solar System, the UEG reorganized its self to become the \
- centralized government of humanity known today; Sol Central. Organizations like the USDF would continue to exist as a peacekeeping \
- force to protect most of humanity's interests across the galaxy."
- work = "governing body of humanity's colonies"
+ name = "Commonwealth of Sol-Procyon"
+ short_name = "SolCom"
+ acronym = "CWS"
+ desc = "The Commonwealth of Sol-Procyon is the evolution of the many nation states of Earth and the outlying colonies \
+ having spread amongst the stars. While not quite the hegemon of all Humanity, a narrow majority of them follow \
+ the flag of the Commonwealth. The constant tug and pull of government versus corporation, democracy and power \
+ troubles this federation of deeply entrenched human colonies much like it did in the 21st century. Some things \
+ never change. However, they are economically and culturally quite dominant, although not everyone likes that fact."
+ history = ""
+ work = "rump state of humanity's colonies"
headquarters = "Paris, Earth"
motto = ""
autogenerate_destination_names = TRUE
- ship_prefixes = list("SCG-T" = "transportation", "SCG-D" = "diplomatic", "SCG-F" = "freight")
+ ship_prefixes = list("CWS-T" = "transportation", "CWS-D" = "diplomatic", "CWS-F" = "freight")
destination_names = list(
"Mercury",
"Venus",
@@ -460,43 +452,10 @@
"Mars",
"Titan",
"Europa",
- "the SolGov embassy in Virgo-Erigone",
- "the SolGov embassy in Vilous"
+ "the SolCom embassy in Virgo-Erigone",
+ "the SolCom embassy in Vilous"
)// autogen will add a lot of other places as well.
-
-/datum/lore/organization/gov/virgov // Overrides Polaris stuff
- name = "Virgo-Erigone Governmental Authority"
- short_name = ""
- desc = "Existing far outside the reach of SolGov space, the only governing body of the Virgo-Erigone system is the Virgo-Prime Governmental \
- Authority, also known as VEGA. It is a Technocracy founded and operated by NanoTrasen, using company appointed experts hired to see \
- to the comfort and well being of Virgo's citizens; most of whom are also NanoTrasen employees. VEGA provides basic social services \
- such as law enforcement, emergency services, medical care, education, and infrastructure. VEGA's operations are based on the world \
- of Virgo-Prime, within the spaceport city of Anur. Although the government is an entity of NanoTrasen, some elements of democracy \
- are still practiced, such as voting on changes to local law, policy, or public works."
- history = "VEGA was founded in 2556, shortly after the Virgo-Erigone system was colonized by a population of 1000. That population has \
- multiplied many times since then as wealth and commerce come and go from this frontier star system."
- work = "governing body of Virgo-Erigone"
- headquarters = "Anur, Virgo-Prime"
- motto = "Reach for the Stars."
- autogenerate_destination_names = FALSE
-
- ship_prefixes = list("VEFD" = "fire rescue", "VEPD" = "patrol", "VEGA" = "administrative", "SAR" = "medivac")
- destination_names = list(
- "the colony at Virgo-3B",
- "the VORE-1 debris field",
- "a mining colony on Virgo-2",
- "the Anur Spaceport",
- "to a local distress beacon",
- "NAS Zeus orbiting Virgo-Prime",
- "NTB An-Nur on Virgo-Prime",
- "the colony at Virgo-3B",
- "a dockyard orbiting Virgo-Prime",
- "an asteroid orbiting Virgo 3",
- "a telecommunications satellite near Virgo-3B",
- "a telecommunications satellite near Virgo-Prime"
- )
-
-/* // Waiting for lore to be updated.
+/* // Waiting for Joan to do their thing.
/datum/lore/organization/gov/federation
name = "United Federation of Planets"
short_name = "Federation"
@@ -516,7 +475,6 @@
work = "governing body"
headquarters = ""
motto = ""
-
//Star Trek ship names!
ship_prefixes = list("SCV" = "military", "STV" = "trading", "SDV" = "diplomatic")
ship_names = list("Kestrel",
@@ -569,28 +527,13 @@
/datum/lore/organization/mil/usdf
name = "United Sol Defense Force"
short_name = "" // This is blank on purpose. Otherwise they call the ships "USDF USDF Name"
- desc = "The USDF is the dedicated military force of SolGov, originally formed by the United Nations. It is the \
- dominant superpower of the Orion Spur, and is able to project its influence well into parts of the Perseus and \
- Sagittarius arms of the galaxy. However, regions beyond that are too far for the USDF to be a major player."
- history = "Earth's clashes with dissident political movements, the most important of which were the \"Red Faction\" and \"Storm Front,\" \
- began the crisis that led to the formation of the USDF. The Storm Front movement was a fascist organization based on the Jovian \
- Moons, a group that received backing from some corporations operating in the Federal Republic of Germany on Earth. Their \
- ideological opponents, the Red Faction, formed a Marxist-Leninist group on Mars centered around the leadership of Vladimir Koslov \
- around the same time. The USDF was commissioned in 2163 as a military force primarily composed of Naval and Marine \
- forces. In July 2164, the USDF partook in its first battle. From this point, the USDF was used by the UN in conflicts, \
- including the Interplanetary War. When the conflicts of Sol ended, a newly powerful Unified Earth Government (later SolGov) \
- and USDF began to expand into the stars. The apex of human expansion would come in 2490, when more than 600 worlds were \
- considered part of SolGov's territory, many developing into full-fledged colonies. By this time, a ring of Outer colonies \
- was providing SolGov with the raw materials that made the macro-economy function; with the political power remaining with \
- the Inner colonies. The massive difference in wealth distribution and political power, which became a hallmark of humanity \
- by this period, led to new threats of secession from the outer ring. In 2492, the colony of Far Isle was razed by nuclear \
- weapons after a massive uprising, creating a new found reason to rebel. SolGov began to wage a bloody struggle against \
- groups of terrorists (or freedom fighters) called the Insurrectionists, who wanted independence. The USDF continues to battle \
- sepratists to this day. The USDF's operations meanwhile focus on curbing piracy operations, as well as providing a deterrent \
- against other major military powers such as the Moghes Hegemony."
+ desc = "The USDF is the dedicated military force of the Commonwealth of Sol-Procyon, originally formed by a council of the Supranations. It is a \
+ considerable tool of military power projection, and is able to effectively police a vast amount of space within the Orion Spur. \
+ However, regions beyond that are too far for the USDF to be a major player."
+ history = ""
work = "peacekeeping and piracy suppression"
headquarters = "Paris, Earth"
- motto = "Per Mare, Per Terras, Per Constellatum." // Stolen from Halo because fuck you that's why. -Ace
+ motto = "pax in terra et astra" // Peace on Earth and Stars
ship_prefixes = list("USDF" = "military", "USDF" = "anti-piracy", "USDF" = "escort", "USDF" = "humanitarian", "USDF" = "peacekeeping", "USDF" = "search-and-rescue", "USDF" = "war game") // It's all USDF but let's mix up what missions they do.
ship_names = list("Aegis Fate",
"Ain't No Sunshine",
@@ -650,7 +593,7 @@
"Two for Flinching")
destination_names = list("San Francisco on Earth",
"Gateway One above Luna",
- "SolGov Headquarters on Earth",
+ "SolCom Headquarters on Earth",
"Olympus City on Mars",
"Hermes Naval Shipyard above Mars",
"Cairo Station above Earth",
@@ -662,48 +605,12 @@
"a settlement on Ceti IV-B",
"a colony ship around Ceti IV-B",
"a naval station above Ceti IV-B",
- "a classified location in SolGov territory",
+ "a classified location in SolCom territory",
"a classified location in uncharted space",
"an emergency nav bouy",
"the USDF Naval Academy on Earth",
"Fort Rain on Tal")
-/datum/lore/organization/mil/oni
- name = "SolGov Office of Naval Intelligence"
- short_name = "" // This is blank on purpose. Otherwise they call the ships "ONI ONI Name"
- desc = "The Office of Naval Intelligence is SolGov's eyes and ears in the galaxy's affairs. Despite its name, and despite its \
- usual association with the USDF, the Office of Naval Intelligence does not fall under the command of the military. From espionage \
- to archeological research, ONI's work provides SolGov with the knowledge and technology it requires to advance both military and \
- civilian interests across the galaxy."
- history = "ONI was originally created by the consolidation of several military intelligence agencies from Sol during the Sol-Hegemony war. \
- The USDF's victory in that war was largely accredited to intelligence and technology advancements provided by ONI during that time, \
- most notably of which was the reverse-engineering of Unathi vessels, allowing the production of countermeasures that played a crucial \
- role during in the late stages of the conflict. After the war, ONI's resources were pooled into numerous top secret projects; much of \
- which remains unknown or outright denied to the public even today. Among their suspected activities include exploration, weapons \
- development, xenoarcheology, xenobiology, corporate espionage, and manipulation of political affairs."
- work = "espionage, piracy suppression, xeno research, and various other black projects"
- headquarters = "Paris, Earth"
- motto = "The truth will set you free."
- ship_prefixes = list("ONI" = "classified", "ONI" = "archeological", "ONI" = "exploration", "ONI" = "logistic") // It's all ONI but let's mix up what missions they do.
- ship_names = list("Bastille",
- "Fantôme",
- "Harpocrates",
- "Hoenir",
- "Mata Hari",
- "Midsummer Night",
- "Mirage",
- "Persephone", // Director Ixchel Kisoda's personal research ship
- "Versailles")
- destination_names = list("parts unknown",
- "none of your business",
- "uncharted space",
- "an undisclosed location",
- "facility 8492",
- "you don't want to know",
- "if told you I'd have to kill you",
- "... wait, why am I even telling you this? Just let me pass",
- "stop asking questions")
-
/datum/lore/organization/gov/kitsuhana
name = "Kitsuhana Heavy Industries"
short_name = "Kitsuhana"
@@ -761,14 +668,14 @@
/datum/lore/organization/gov/ares
name = "Ares Confederation"
short_name = "ArCon"
- desc = "A rebel faction in the Cygnus Arm that renounced the government of both SolGov and their corporate overlords. \
- The Confederation has two fleets; a regular United Fleet Host comprised of professional crewmen and officers, and the Free Host \
- of the Confederation which uses privateers, volunteers and former pirates. The Ares Confederation only holds a few dozen star \
- systems, but they will fiercely defend against any incursion upon their territory, especially by the USDF."
- history = "Originally only a strike of miners on the dusty, arid planet of Ares in the year 2540, the Ares Confederation was quickly \
- established under the leadership of retired USDF Colonel Rodrick Gellaume, who is now Prime Minister."
- work = "rebel fringe government"
- headquarters = "Paraiso a Àstrea"
+ desc = "A loose coalition of socialist and communist movements on the fringes of the human diaspora \
+ the Ares Confederation is a government-in-exile from the original uprisings of Mars to stop \
+ the government of corporations and capitalist interests over Humanity. While they failed twice \
+ they have made their own home far beyond the reach of an effective military response by the \
+ Commonwealth. They have become renowned engineers and terraforming experts, mostly due to necessity."
+ history = ""
+ work = "idealist socialist government"
+ headquarters = "Paraiso a Àstrea"
motto = "Liberty to the Stars!"
ship_prefixes = list("UFHV" = "military", "FFHV" = "shady")
@@ -780,7 +687,25 @@
"Fiery Justice",
"Fist of Ares",
"Freedom",
- "Fuck The Captain",
+ "Marx Was Right",
+ "Endstage Capitalism",
+ "Neoluddism Is The Answer Guys",
+ "Anarchocapitalism Is A Joke",
+ "One Of Ours, Captain!",
+ "Is This Thing On?",
+ "Front Toward Enemy",
+ "Path of Prosperity",
+ "Freedom Cry",
+ "Rebel Yell",
+ "We Will Return To Mars",
+ "According To Our Abilities",
+ "Posadism Gang",
+ "Accelerationism Doesn't Work In A Vaccuum",
+ "Don't Shoot, We're Unarmed I Think",
+ "The Big Stick For Speaking Softly",
+ "Bull Moose",
+ "Engels Needs Some Love Too",
+ "The Icepick",
"Gauntlet",
"Gellaume",
"Hero of the Revolution",
@@ -804,110 +729,111 @@
"Torch")
destination_names = list("Drydocks of the Ares Confederation",
"a classified location",
- "a Homestead on Paraiso a Àstrea",
+ "a Homestead on Paraiso a Àstrea",
"a contested sector of ArCon space",
"one of our free colonies",
- "the Gateway 98-C at Arest",
+ "the Gateway 98-C at Ares",
"Sars Mara on Ares",
"Listening Post Maryland-Sigma",
"an emergency nav bouy",
"New Berlin on Nov-Ferrum",
"a settlement needing our help",
"Forward Base Sigma-Alpha in ArCon space")
+
+/datum/lore/organization/gov/elysian
+ name = "The Elysian Colonies"
+ short_name = "Demi-Monde"
+ acronym = "ECS"
+ desc = "The Elysian Colonies, located spinwards from the Commonwealth, are a disunited bunch of \
+ vanity states, utopia projects and personal autocracies, whose only unifying characteristic is \
+ a general disregard of 'normal' social conventions of Humanity as well as their inherent desire \
+ to keep to their ways, in which cases they do sometimes unite to fight off an outside threat. \
+ The Elysian Colonies are one of the few places where true slavery is not only accepted, but sadly also \
+ rather commonplace if you go to the wrong worlds. Not that they don't internally have at least a dozen would-be liberators."
+ history = ""
+ work = "fracturous vanity colonies"
+ headquarters = ""
+ motto = ""
-/datum/lore/organization/gov/imperial
- name = "Auream Imperium"
- short_name = "Imperial"
- desc = "Also known as the \"Golden Empire\", Auream Imperium is a superpower of elf-like humanoid beings who thrive in the southern \
- galaxy, presumably somewhere in the mid Centaurus Arm. Having existed in the observation shadow of the galactic core, this \
- galactic superpower had remained undiscovered by humanity despite its size until only recently. First contact was made on \
- June 15th 2561, when Imperial Navy cartographers stumbled upon the Virgo-Erigone system, far from the influence of the USDF. \
- Though little is currently known about the Golden Empire, their scholars have been willing to share some information. They \
- are currently ruled by a woman referred to as Empress Gutamir who is allegedly hundreds of years old. Images and portraits \
- of the empress depict a tall woman with an idealized figure of beauty as might have been seen in ancient Roman or Greek \
- works of art. She has white hair, silvery eyes, and a fair complexion. Whether or not these images are an authentic or \
- even an accurate depiction remains unknown. Vessels of the Golden Empire utilize technology unlike anything humans have ever \
- seen. Although they use bluespace for FTL travel, the methods in which they tap into bluespace has yet to be studied in any \
- detail by human scientists. Their kind hails from a binary system of Earth-like worlds called Sanctum and Venio, though the \
- exact location of these worlds is not known due to a culture of secrecy toward outsiders."
- history = "According to Imperial scholars, the Golden Empire is a civilization that has existed for at least 10,000 Earth years. \
- Their home system is said to host not one but two Earth-like worlds, both of which have been home to elves as far as their \
- records go back. How the elves were able to travel between these worlds is currently unknown, but apparently they have been \
- doing so for at least the last 2000 years. However, from what is understood, until only 300 years ago, these accomplishments \
- were only made possible by a very limited number of ships apparently using borrowed technology from an undiscovered \
- civilization they call \"Architectus.\" Curiously, the Golden Empire's primary language is strikingly similar to ancient \
- Latin on Earth, indicating that they may have somehow come into contact with Earth at some point in their history. However, \
- this contradicts what historical records they have been willing to share with us, as it would predate the timeline of space \
- travel they have given us so far."
- work = "rule over the southern galaxy in an uncharted region they call Segmentum Obscurum"
- headquarters = "Sanctum and Venio"
- motto = "Aut inveniam viam aut faciam"
+ ship_prefixes = list("ECS" = "military", "ECS" = "Transport", "ECS" = "Special Transport", "ECS" = "Diplomat") //The Special Transport is SLAAAAVES.
+ ship_names = list("Bring Me Wine!",
+ "I Can't Believe You",
+ "More Wives Your Grace?",
+ "Daddy Bought Me This",
+ "What Do You Mean It's Unethical",
+ "Libertine Ideals",
+ "The True Free",
+ "Unbound",
+ "No Man Shackled",
+ "All Men Shackled",
+ "All Women Shackled",
+ "All Hermaphrodites Shackled",
+ "You Know We Just Shackle Anyone",
+ "Nobody Deserves Shackles",
+ "Debt Slavery Is Ethical",
+ "Fashioned After Tradition",
+ "Sic Vic Pacem",
+ "Cultivate This",
+ "We Demand Self-Governance",
+ "A Thousand Cultures",
+ "There Is a Character Limit?",
+ "Slave Galley I",
+ "The Unconquered CCXXII"
+
+ )
+ destination_names = list("Cygnus",
+ "The Ultra Dome of Brutal Kill Death",
+ "Sanctum",
+ "Infernum",
+ "The Most Esteemed Estates of Fred Fredson, Heir of the Fred Throne and All its illustrious Fredpendencies",
+ "Priory Melana",
+ "The Clone Pits of Meridiem Five",
+ "Forward Base Mara Alpha",
+ "a very tasty looking distress call",
+ "a liberation intervention",
+ "a nav bouy within Cygnus Space",
+ "a Elysian only refuel outpost",
+ "to a killer party the Fredperor is holding right now")
+
+
+/datum/lore/organization/gov/fyrds
+ name = "Unitary Alliance of Salthan Fyrds"
+ short_name = "Fyrds"
+ acronym = "SMS"
+ desc = "Born out of neglect, the Salthan Fyrds are cast-off colonies of the Commonwealth after giving up on \
+ pacifying the wartorn region and fighting off the stray Unathi Raiders after the Hegemony War. \
+ In the end they self-organized into military pacts and have formed a militaristic society, in which \
+ every person, be it organic or robot, is a soldier for the continued cause in serving as aegis against \
+ another Unathi Incursion. They are very no-nonsense."
+ history = ""
+ work = "human stratocracy"
+ headquarters = "The Pact,Myria"
+ motto = ""
- ship_prefixes = list("Bellator" = "naval", "Mercator" = "trade", "Benefactori" = "mercy", "Salvator" = "search-and-rescue", "Rimor" = "exploration", "Legatus" = "diplomatic") // It's all HMS but let's mix up what they do.
- ship_names = list("Ambition",
- "Aurora",
- "Argo",
- "Behemoth",
- "Beholder",
- "Boreas",
- "Bulwark",
- "Calypso",
- "Cerberus",
- "Chimera",
- "Chronos",
- "Civitas",
- "Colossus",
- "Covenant",
- "Cyrus",
- "Destiny",
- "Epimetheus",
- "Eternal",
- "Excalibur",
- "Forerunner",
- "Fortitude",
- "Hellion",
- "Hussar",
- "Hyperion",
- "Illustria",
- "Immortal",
- "Infinitum",
- "Inquisitor",
- "Invictus",
- "Judgment",
- "Juggernaut",
- "Knossos",
- "Legacy",
- "Leviathan",
- "Marathon",
- "Megalith",
- "Mobius",
- "Nemesis",
- "Nightingale",
- "Oblivion",
- "Octavius",
- "Orthrus",
- "Pandora",
- "Phalanx",
- "Revenant",
- "Rhapsody",
- "Scylla",
- "Seraphim",
- "Starfall",
- "Stargazer",
- "Starhammer",
- "Templar",
- "Thundrus",
- "Titan",
- "Triarius",
- "Trident",
- "Tyrannus",
- "Ulysses",
- "Valkyrie",
- "Victoria",
- "Vindicator",
- "Wreath")
- destination_names = list("uncharted space",
- "Cor Galaxia",
- "near Cor Galaxia",
- "Segmentum Obscurum", // Basically their home territory, where our telescopes can't see. They prefer to keep it that way. They call it something else internally.
- )
+ ship_prefixes = list("SMS" = "Military") // The Salthans don't do anything else.
+ ship_names = list("Yi Sun-sin",
+ "Horatio Nelson",
+ "Scipio Africanus",
+ "Hannibal Barca",
+ "Hamilcar Barca",
+ "Caesar",
+ "Belisarius",
+ "Aggripa",
+ "Pericles",
+ "Alexander",
+ "Napoleon Bonaparte",
+ "Charles XI",
+ "Blas de Lezo",
+ "Ivan Sirko",
+ "Frederick the Great",
+ "William of Normandy",
+ "Shaka Zulu",
+ "Patton",
+ "MacArthur",
+ "Rommel")
+ destination_names = list("Base Alpha-Romero",
+ "Base Zeta-Xray",
+ "Base Epsilon-Epsilon",
+ "Base Xray-Beta",
+ "Base Gamma-Delta",
+ "Base Yotta-Epsilon")
diff --git a/code/modules/catalogue/catalogue_data.dm b/code/modules/catalogue/catalogue_data.dm
index 15576d6837..a7b2bf80f7 100644
--- a/code/modules/catalogue/catalogue_data.dm
+++ b/code/modules/catalogue/catalogue_data.dm
@@ -356,10 +356,11 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
name = "Government - Solar Confederate Government"
datum_to_copy = /datum/lore/organization/gov/solgov
+/* //VOREStation Removal
/datum/category_item/catalogue/information/organization/virgov
name = "Government - Vir Governmental Authority"
datum_to_copy = /datum/lore/organization/gov/virgov
-
+*/
/datum/category_item/catalogue/anomalous
diff --git a/code/modules/catalogue/catalogue_data_vr.dm b/code/modules/catalogue/catalogue_data_vr.dm
index 9346a08d2b..d56ae75fb0 100644
--- a/code/modules/catalogue/catalogue_data_vr.dm
+++ b/code/modules/catalogue/catalogue_data_vr.dm
@@ -1,3 +1,6 @@
+/datum/category_item/catalogue/information/organization/solgov
+ name = "Government - Commonwealth of Sol-Procyon"
+
//TODO: VIRGO_LORE_WRITING_WIP - this whole file
/datum/category_item/catalogue/fauna/akula
diff --git a/code/modules/clothing/head/helmet_vr.dm b/code/modules/clothing/head/helmet_vr.dm
index edb2d9482a..00d51f2f47 100644
--- a/code/modules/clothing/head/helmet_vr.dm
+++ b/code/modules/clothing/head/helmet_vr.dm
@@ -1,10 +1,10 @@
/obj/item/clothing/head/helmet/solgov
- name = "\improper Solar Central Government helmet"
+ name = "peacekeeper helmet"
desc = "A helmet painted in Peacekeeper blue. Stands out like a sore thumb."
/obj/item/clothing/head/helmet/solgov/command
- name = "\improper Solar Central commander helmet"
- desc = "A helmet with 'Solar Central Government' printed on the back in gold lettering."
+ name = "peacekeeper commander helmet"
+ desc = "A more sophisticated helmet painted in Peacekeeper blue. Stands out like a sore thumb."
/obj/item/clothing/head/helmet/combat/USDF
name = "marine helmet"
diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm
index b9e9bffaef..4e68655a9b 100644
--- a/code/modules/clothing/head/misc_vr.dm
+++ b/code/modules/clothing/head/misc_vr.dm
@@ -1,3 +1,6 @@
+/obj/item/clothing/head/centhat/customs
+ desc = "A formal hat for SolCom Customs Officers."
+
/obj/item/clothing/head/fish
name = "fish skull"
desc = "You... you're not actually going to wear that, right?"
diff --git a/code/modules/clothing/head/solgov_vr.dm b/code/modules/clothing/head/solgov_vr.dm
index f3da977af1..3861ecebe1 100644
--- a/code/modules/clothing/head/solgov_vr.dm
+++ b/code/modules/clothing/head/solgov_vr.dm
@@ -2,16 +2,16 @@
//Utility
/obj/item/clothing/head/soft/sol
- name = "\improper SolGov cap"
- desc = "It's a blue ballcap in Solar Central Government colors."
+ name = "\improper SolCom cap"
+ desc = "It's a blue ballcap in Terran Commonwealth Government colors."
/obj/item/clothing/head/soft/sol/expedition
- name = "explorer's cap"
- desc = "It's a black ballcap bearing a Society of Universal Cartographers crest."
+ name = "\improper Explorer corps cap"
+ desc = "It's a black ballcap bearing a Terran Commonwealth Explorer Corps crest."
/obj/item/clothing/head/soft/sol/fleet
name = "fleet cap"
- desc = "It's a navy blue ballcap with a USDF Fleet crest."
+ desc = "It's a navy blue ballcap with a TCG Fleet crest."
/obj/item/clothing/head/utility
name = "utility cover"
@@ -19,23 +19,23 @@
/obj/item/clothing/head/utility/fleet
name = "fleet utility cover"
- desc = "A navy blue utility cover bearing the crest of a USDF Fleet."
+ desc = "A navy blue utility cover bearing the crest of a TCG Fleet."
/obj/item/clothing/head/utility/marine
name = "marine utility cover"
- desc = "A grey utility cover bearing the crest of the USDF Marine Corps."
+ desc = "A grey utility cover bearing the crest of the TCG Marine Corps."
/obj/item/clothing/head/utility/marine/tan
name = "tan utility cover"
- desc = "A tan utility cover bearing the crest of the USDF Marine Corps."
+ desc = "A tan utility cover bearing the crest of the TCG Marine Corps."
/obj/item/clothing/head/utility/marine/green
name = "green utility cover"
- desc = "A green utility cover bearing the crest of the USDF Marine Corps."
+ desc = "A green utility cover bearing the crest of the TCG Marine Corps."
/obj/item/clothing/head/utility/marine/green/officer // "And YOU told me you were gonna wear something nice!"
name = "\improper officer's cap"
- desc = "A green utility cover bearing the crest of the USDF Marine Corps. This one has an officer's emblem."
+ desc = "A green utility cover bearing the crest of the TCG Marine Corps. This one has an officer's emblem."
icon_state = "UNSCsoft"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
@@ -48,60 +48,60 @@
/obj/item/clothing/head/service/marine
name = "marine wheel cover"
- desc = "A green service uniform cover with an USDF Marine Corps crest."
+ desc = "A green service uniform cover with an TCG Marine Corps crest."
/obj/item/clothing/head/service/marine/command
name = "marine officer's wheel cover"
- desc = "A green service uniform cover with an USDF Marine Corps crest and gold stripe."
+ desc = "A green service uniform cover with an TCG Marine Corps crest and gold stripe."
/obj/item/clothing/head/service/marine/garrison
name = "marine garrison cap"
- desc = "A green garrison cap belonging to the USDF Marine Corps."
+ desc = "A green garrison cap belonging to the TCG Marine Corps."
/obj/item/clothing/head/service/marine/garrison/command
name = "marine officer's garrison cap"
- desc = "A green garrison cap belonging to the USDF Marine Corps. This one has a gold pin."
+ desc = "A green garrison cap belonging to the TCG Marine Corps. This one has a gold pin."
/obj/item/clothing/head/service/marine/campaign
name = "campaign cover"
- desc = "A green campaign cover with an USDF Marine Corps crest. Only found on the heads of Drill Instructors."
+ desc = "A green campaign cover with an TCG Marine Corps crest. Only found on the heads of Drill Instructors."
icon_state = "greendrill"
//Dress
/obj/item/clothing/head/dress/expedition
name = "explorer's dress cap"
- desc = "A peaked grey dress uniform cap belonging to the Society of Universal Cartographers."
+ desc = "A peaked grey dress uniform cap belonging to the Terran Commonwealth Explorer Corps."
/obj/item/clothing/head/dress/expedition/command
name = "explorer's command dress cap"
- desc = "A peaked grey dress uniform cap belonging to the Society of Universal Cartographers. This one is trimmed in gold."
+ desc = "A peaked grey dress uniform cap belonging to the Terran Commonwealth Explorer Corps. This one is trimmed in gold."
/obj/item/clothing/head/dress/fleet
name = "fleet dress wheel cover"
- desc = "A white dress uniform cover. This one has an USDF Fleet crest."
+ desc = "A white dress uniform cover. This one has an TCG Fleet crest."
/obj/item/clothing/head/dress/fleet/command
name = "fleet command dress wheel cover"
- desc = "A white dress uniform cover. This one has a gold stripe and an USDF Fleet crest."
+ desc = "A white dress uniform cover. This one has a gold stripe and an TCG Fleet crest."
/obj/item/clothing/head/dress/marine
name = "marine dress wheel cover"
- desc = "A white dress uniform cover with an USDF Marine Corps crest."
+ desc = "A white dress uniform cover with an TCG Marine Corps crest."
/obj/item/clothing/head/dress/marine/command
name = "marine officer's dress wheel cover"
- desc = "A white dress uniform cover with an USDF Marine Corps crest and gold stripe."
+ desc = "A white dress uniform cover with an TCG Marine Corps crest and gold stripe."
/obj/item/clothing/head/dress/marine/command/admiral
name = "admiral's dress wheel cover"
- desc = "A white dress uniform cover with an USDF Navy crest and gold stripe."
+ desc = "A white dress uniform cover with an TCG Navy crest and gold stripe."
//Berets
/obj/item/clothing/head/beret/sol
name = "peacekeeper beret"
- desc = "A beret in Solar Central Government colors. For peacekeepers that are more inclined towards style than safety."
+ desc = "A beret in Terran Commonwealth colors. For peacekeepers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/gateway
name = "gateway administration beret"
@@ -125,48 +125,48 @@
/obj/item/clothing/head/beret/sol/expedition
name = "explorer's beret"
- desc = "A black beret belonging to the Society of Universal Cartographers. For personnel that are more inclined towards style than safety."
+ desc = "A black beret belonging to the Terran Commonwealth explorer corps. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/security
name = "explorer's security beret"
- desc = "A Society of Universal Cartographers beret with a security crest. For personnel that are more inclined towards style than safety."
+ desc = "A Terran Commonwealth Explorer Corps beret with a security crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/medical
name = "explorer's medical beret"
- desc = "A Society of Universal Cartographers beret with a medical crest. For personnel that are more inclined towards style than safety."
+ desc = "A Terran Commonwealth Explorer Corps beret with a medical crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/engineering
name = "explorer's engineering beret"
- desc = "A Society of Universal Cartographers beret with an engineering crest. For personnel that are more inclined towards style than safety."
+ desc = "A Terran Commonwealth Explorer Corps beret with an engineering crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/supply
name = "explorer's supply beret"
- desc = "A Society of Universal Cartographers beret with a supply crest. For personnel that are more inclined towards style than safety."
+ desc = "A Terran Commonwealth Explorer Corps beret with a supply crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/command
name = "explorer's command beret"
- desc = "A Society of Universal Cartographers beret with a command crest. For personnel that are more inclined towards style than safety."
+ desc = "A Terran Commonwealth Explorer Corps beret with a command crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet
name = "fleet beret"
- desc = "A navy blue beret belonging to the USDF Fleet. For personnel that are more inclined towards style than safety."
+ desc = "A navy blue beret belonging to the TCG Fleet. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/security
name = "fleet security beret"
- desc = "An USDF Fleet beret with a security crest. For personnel that are more inclined towards style than safety."
+ desc = "An TCG Fleet beret with a security crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/medical
name = "fleet medical beret"
- desc = "An USDF Fleet beret with a medical crest. For personnel that are more inclined towards style than safety."
+ desc = "An TCG Fleet beret with a medical crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/engineering
name = "fleet engineering beret"
- desc = "An USDF Fleet with an engineering crest. For personnel that are more inclined towards style than safety."
+ desc = "An TCG Fleet with an engineering crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/supply
name = "fleet supply beret"
- desc = "An USDF Fleet beret with a supply crest. For personnel that are more inclined towards style than safety."
+ desc = "An TCG Fleet beret with a supply crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/command
name = "fleet command beret"
- desc = "An USDF Fleet beret with a command crest. For personnel that are more inclined towards style than safety."
\ No newline at end of file
+ desc = "An TCG Fleet beret with a command crest. For personnel that are more inclined towards style than safety."
\ No newline at end of file
diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm
index 76d55dcc82..dd5517ac5a 100644
--- a/code/modules/clothing/suits/armor_vr.dm
+++ b/code/modules/clothing/suits/armor_vr.dm
@@ -42,20 +42,20 @@
// Override Polaris's "confederate" naming convention. I hate it.
/obj/item/clothing/suit/storage/vest/solgov
- name = "\improper Solar Central Government armored vest"
- desc = "A synthetic armor vest. This one is marked with the crest of the Solar Central Government."
+ name = "peacekeeper armored vest"
+ desc = "A synthetic armor vest. This one is marked with the crest of the Terran Commonwealth Government."
/obj/item/clothing/suit/storage/vest/solgov/heavy
- name = "\improper Solar Central Government heavy armored vest"
- desc = "A synthetic armor vest with SECURITY printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates." // USDF does peacekeeping, not these guys.
+ name = "peacekeeper heavy armored vest"
+ desc = "A synthetic armor vest with PEACEKEEPER printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates."
/obj/item/clothing/suit/storage/vest/solgov/security
name = "master at arms heavy armored vest"
desc = "A synthetic armor vest with MASTER AT ARMS printed in silver lettering on the chest. This one has added webbing and ballistic plates."
/obj/item/clothing/suit/storage/vest/solgov/command
- name = "command heavy armored vest"
- desc = "A synthetic armor vest with Solar Central Government printed in detailed gold lettering on the chest. This one has added webbing and ballistic plates."
+ name = "commander heavy armored vest"
+ desc = "A synthetic armor vest with COMMANDER printed in detailed gold lettering on the chest. This one has added webbing and ballistic plates."
/obj/item/clothing/suit/armor/combat/USDF
name = "marine body armor"
diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm
index 8caf5a8e39..097407f0e8 100644
--- a/code/modules/clothing/suits/miscellaneous_vr.dm
+++ b/code/modules/clothing/suits/miscellaneous_vr.dm
@@ -1,3 +1,6 @@
+/obj/item/clothing/suit/customs
+ desc = "A standard SolCom Customs formal jacket."
+
//HERE BE TAUR RELATED CLOTHES
/*
diff --git a/code/modules/clothing/suits/solgov_vr.dm b/code/modules/clothing/suits/solgov_vr.dm
index a4568489df..21c6851acf 100644
--- a/code/modules/clothing/suits/solgov_vr.dm
+++ b/code/modules/clothing/suits/solgov_vr.dm
@@ -2,99 +2,99 @@
//Service
/obj/item/clothing/suit/storage/service/sifguard
- name = "explorer's jacket"
- desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons."
+ name = "\improper SolCom jacket"
+ desc = "A uniform service jacket belonging to the Terran Commonwealth Explorer Corps. It has silver buttons."
/obj/item/clothing/suit/storage/service/sifguard/medical
- name = "explorer's medical jacket"
- desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and blue trim."
+ name = "\improper SolCom medical jacket"
+ desc = "A uniform service jacket belonging to the Terran Commonwealth Explorer Corps. It has silver buttons and blue trim."
/obj/item/clothing/suit/storage/service/sifguard/medical/command
- name = "explorer's medical command jacket"
- desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and blue trim."
+ name = "\improper SolCom medical command jacket"
+ desc = "A uniform service jacket belonging to the Terran Commonwealth Explorer Corps. It has gold buttons and blue trim."
/obj/item/clothing/suit/storage/service/sifguard/engineering
- name = "explorer's engineering jacket"
- desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and orange trim."
+ name = "\improper SolCom engineering jacket"
+ desc = "A uniform service jacket belonging to the Terran Commonwealth Explorer Corps. It has silver buttons and orange trim."
/obj/item/clothing/suit/storage/service/sifguard/engineering/command
- name = "explorer's engineering command jacket"
- desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and orange trim."
+ name = "\improper SolCom engineering command jacket"
+ desc = "A uniform service jacket belonging to the Terran Commonwealth Explorer Corps. It has gold buttons and orange trim."
/obj/item/clothing/suit/storage/service/sifguard/supply
- name = "explorer's supply jacket"
- desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and brown trim."
+ name = "\improper SolCom supply jacket"
+ desc = "A uniform service jacket belonging to the Terran Commonwealth Explorer Corps. It has silver buttons and brown trim."
/obj/item/clothing/suit/storage/service/sifguard/security
- name = "explorer's security jacket"
- desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and red trim."
+ name = "\improper SolCom security jacket"
+ desc = "A uniform service jacket belonging to the Terran Commonwealth Explorer Corps. It has silver buttons and red trim."
/obj/item/clothing/suit/storage/service/sifguard/security/command
- name = "explorer's security command jacket"
- desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and red trim."
+ name = "\improper SolCom security command jacket"
+ desc = "A uniform service jacket belonging to the Terran Commonwealth Explorer Corps. It has gold buttons and red trim."
/obj/item/clothing/suit/storage/service/sifguard/command
- name = "explorer's command jacket"
- desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and gold trim."
+ name = "\improper SolCom command jacket"
+ desc = "A uniform service jacket belonging to the Terran Commonwealth Explorer Corps. It has gold buttons and gold trim."
/obj/item/clothing/suit/storage/service/marine
name = "marine coat"
- desc = "An USDF Marine Corps service coat. Green and undecorated."
+ desc = "An TCG Marine Corps service coat. Green and undecorated."
/obj/item/clothing/suit/storage/service/marine/medical
name = "marine medical jacket"
- desc = "An USDF Marine Corps service coat. This one has blue markings."
+ desc = "An TCG Marine Corps service coat. This one has blue markings."
/obj/item/clothing/suit/storage/service/marine/medical/command
name = "marine medical command jacket"
- desc = "An USDF Marine Corps service coat. This one has blue and gold markings."
+ desc = "An TCG Marine Corps service coat. This one has blue and gold markings."
/obj/item/clothing/suit/storage/service/marine/engineering
name = "marine engineering jacket"
- desc = "An USDF Marine Corps service coat. This one has orange markings."
+ desc = "An TCG Marine Corps service coat. This one has orange markings."
/obj/item/clothing/suit/storage/service/marine/engineering/command
name = "marine engineering command jacket"
- desc = "An USDF Marine Corps service coat. This one has orange and gold markings."
+ desc = "An TCG Marine Corps service coat. This one has orange and gold markings."
/obj/item/clothing/suit/storage/service/marine/supply
name = "marine supply jacket"
- desc = "An USDF Marine Corps service coat. This one has brown markings."
+ desc = "An TCG Marine Corps service coat. This one has brown markings."
/obj/item/clothing/suit/storage/service/marine/security
name = "marine security jacket"
- desc = "An USDF Marine Corps service coat. This one has red markings."
+ desc = "An TCG Marine Corps service coat. This one has red markings."
/obj/item/clothing/suit/storage/service/marine/security/command
name = "marine security command jacket"
- desc = "An USDF Marine Corps service coat. This one has red and gold markings."
+ desc = "An TCG Marine Corps service coat. This one has red and gold markings."
/obj/item/clothing/suit/storage/service/marine/command
name = "marine command jacket"
- desc = "An USDF Marine Corps service coat. This one has gold markings."
+ desc = "An TCG Marine Corps service coat. This one has gold markings."
//Dress
/obj/item/clothing/suit/dress/expedition
- name = "explorer's dress jacket"
- desc = "A silver and grey dress jacket belonging to the Society of Universal Cartographers. Fashionable, for the 25th century at least."
+ name = "SolCom dress jacket"
+ desc = "A silver and grey dress jacket belonging to the Terran Commonwealth Explorer Corps. Fashionable, for the 24th century at least."
/obj/item/clothing/suit/dress/expedition/command
name = "explorer's command dress jacket"
- desc = "A gold and grey dress jacket belonging to the Society of Universal Cartographers. The height of fashion."
+ desc = "A gold and grey dress jacket belonging to the Terran Commonwealth Explorer Corps. The height of fashion."
/obj/item/clothing/suit/storage/toggle/dress/fleet
name = "fleet dress jacket"
- desc = "A crisp white USDF Fleet dress jacket with blue and gold accents. Don't get near pasta sauce or vox."
+ desc = "A crisp white TCG Fleet dress jacket with blue and gold accents. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/storage/toggle/dress/fleet/command
name = "fleet command dress jacket"
- desc = "A crisp white USDF Fleet dress jacket dripping with gold accents. So bright it's blinding."
+ desc = "A crisp white TCG Fleet dress jacket dripping with gold accents. So bright it's blinding."
/obj/item/clothing/suit/dress/marine
name = "marine dress jacket"
- desc = "A tailored black USDF Marine Corps dress jacket with red trim. So sexy it hurts."
+ desc = "A tailored black TCG Marine Corps dress jacket with red trim. So sexy it hurts."
/obj/item/clothing/suit/dress/marine/command
name = "marine command dress jacket"
- desc = "A tailored black USDF Marine Corps dress jacket with gold trim. Smells like ceremony."
\ No newline at end of file
+ desc = "A tailored black TCG Marine Corps dress jacket with gold trim. Smells like ceremony."
\ No newline at end of file
diff --git a/code/modules/clothing/under/accessories/permits_vr.dm b/code/modules/clothing/under/accessories/permits_vr.dm
index 6b73b13bcd..8913040278 100644
--- a/code/modules/clothing/under/accessories/permits_vr.dm
+++ b/code/modules/clothing/under/accessories/permits_vr.dm
@@ -1,3 +1,6 @@
+/obj/item/clothing/accessory/permit/drone
+ desc = "A card issued by the EIO, indicating that the owner is a Drone Intelligence. Drones are mandated to carry this card within SolCom space, by law."
+
/obj/item/clothing/accessory/permit/gun/planetside
name = "explorer gun permit"
desc = "A card indicating that the owner is allowed to carry a firearm during active exploration missions."
diff --git a/code/modules/clothing/under/accessories/torch_vr.dm b/code/modules/clothing/under/accessories/torch_vr.dm
index 71ce5fb45d..caba931c6f 100644
--- a/code/modules/clothing/under/accessories/torch_vr.dm
+++ b/code/modules/clothing/under/accessories/torch_vr.dm
@@ -1,23 +1,194 @@
-/obj/item/clothing/accessory/solgov/department/command
- desc = "Insignia denoting assignment to the command department. These fit Society of Universal Cartographers uniforms."
+/*****
+medals
+*****/
+/obj/item/clothing/accessory/medal/solgov/iron/star
+ name = "iron star medal"
+ desc = "An iron star awarded to members of the TCG for meritorious achievement or service in a combat zone."
-/obj/item/clothing/accessory/solgov/department/engineering
- desc = "Insignia denoting assignment to the engineering department. These fit Society of Universal Cartographers uniforms."
+/obj/item/clothing/accessory/medal/solgov/iron/sol
+ name = "\improper Terran expeditionary medal"
+ desc = "An iron medal awarded to members of the TCG for service outside of the borders of the Terran Commonwealth Government."
-/obj/item/clothing/accessory/solgov/department/security
- desc = "Insignia denoting assignment to the security department. These fit Society of Universal Cartographers uniforms."
+/obj/item/clothing/accessory/medal/solgov/bronze/heart
+ name = "bronze heart medal"
+ desc = "A bronze heart awarded to members of the TCG for injury or death in the line of duty."
-/obj/item/clothing/accessory/solgov/department/medical
- desc = "Insignia denoting assignment to the medical department. These fit Society of Universal Cartographers uniforms."
+/obj/item/clothing/accessory/medal/solgov/bronze/sol
+ name = "\improper Terran defensive operations medal"
+ desc = "A bronze medal awarded for members of the TCG for service defending the border regions."
-/obj/item/clothing/accessory/solgov/department/supply
- desc = "Insignia denoting assignment to the supply department. These fit Society of Universal Cartographers uniforms."
+/obj/item/clothing/accessory/medal/solgov/silver/sword
+ name = "combat action medal"
+ desc = "A silver medal awarded to members of the TCG for honorable service while under enemy fire."
-/obj/item/clothing/accessory/solgov/department/exploration
- desc = "Insignia denoting assignment to the exploration department. These fit Society of Universal Cartographers uniforms."
+/obj/item/clothing/accessory/medal/solgov/silver/sol
+ name = "\improper Terran valor medal"
+ desc = "A silver medal awarded for members of the TCG for acts of exceptional valor."
-/obj/item/clothing/accessory/solgov/department/research
- desc = "Insignia denoting assignment to the research department. These fit Society of Universal Cartographers uniforms."
+/obj/item/clothing/accessory/medal/solgov/gold/star
+ name = "gold star medal"
+ desc = "A gold star awarded to members of the TCG for acts of heroism in a combat zone."
-/obj/item/clothing/accessory/solgov/department/service
- desc = "Insignia denoting assignment to the service department. These fit Society of Universal Cartographers uniforms."
\ No newline at end of file
+/obj/item/clothing/accessory/medal/solgov/gold/sun
+ name = "solar service medal"
+ desc = "A gold medal awarded to members of the TCG by the Secretary General for significant contributions to the Sol Central Government."
+
+/obj/item/clothing/accessory/medal/solgov/gold/crest
+ name = "solar honor medal"
+ desc = "A gold medal awarded to members of the Defense Forces by the Secretary General for personal acts of valor and heroism above and beyond the call of duty."
+
+/obj/item/clothing/accessory/medal/solgov/gold/sol
+ name = "\improper Terran sapientarian medal"
+ desc = "A gold medal awarded for members of the TCG for significant contributions to sapient rights."
+
+/obj/item/clothing/accessory/medal/solgov/heart
+ name = "medical medal"
+ desc = "A white heart emblazoned with a red cross awarded to members of the SCG for service as a medical professional in a combat zone."
+
+/obj/item/clothing/accessory/solgov/torch_patch
+ name = "\improper Torch mission patch"
+ desc = "A fire resistant shoulder patch, worn by the personnel involved in the Torch Project."
+
+/obj/item/clothing/accessory/solgov/ec_patch
+ name = "\improper Observatory patch"
+ desc = "A laminated shoulder patch, carrying the symbol of the Terran Commonwealth Expeditionary Corps Observatory, or TCGEO for short, the eyes and ears of the Expeditionary Corps' missions."
+
+/obj/item/clothing/accessory/solgov/ec_patch/fieldops
+ name = "\improper Field Operations patch"
+ desc = "A radiation-shielded shoulder patch, carrying the symbol of the Terran Commonwealth Expeditionary Corps Field Operations, or TCGECFO for short, the hands-on workers of every Expeditionary Corps mission."
+
+/obj/item/clothing/accessory/solgov/cultex_patch
+ name = "\improper Cultural Exchange patch"
+ desc = "A radiation-shielded shoulder patch, denoting service in the the Terran Commonwealth Expeditionary Corps Cultural Exchange program."
+
+/obj/item/clothing/accessory/solgov/fleet_patch
+ name = "\improper First Fleet patch"
+ desc = "A fancy shoulder patch carrying insignia of First Fleet, the Sol Guard, stationed in Sol."
+
+/obj/item/clothing/accessory/solgov/fleet_patch/second
+ name = "\improper Second Fleet patch"
+ desc = "A well-worn shoulder patch carrying insignia of Second Fleet, the Home Guard, tasked with defense of Terran territories."
+
+/obj/item/clothing/accessory/solgov/fleet_patch/third
+ name = "\improper Third Fleet patch"
+ desc = "A scuffed shoulder patch carrying insignia of Third Fleet, the Border Guard, guarding borders of Terran territory against Vox and pirates."
+
+/obj/item/clothing/accessory/solgov/fleet_patch/fourth
+ name = "\improper Fourth Fleet patch"
+ desc = "A pristine shoulder patch carrying insignia of Fourth Fleet, stationed on Skrell border."
+
+/obj/item/clothing/accessory/solgov/fleet_patch/fifth
+ name = "\improper Fifth Fleet patch"
+ desc = "A tactical shoulder patch carrying insignia of Fifth Fleet, the Quick Reaction Force, recently formed and outfited with last tech."
+
+/******
+ribbons
+******/
+/obj/item/clothing/accessory/ribbon/solgov/marksman
+ name = "marksmanship ribbon"
+ desc = "A military decoration awarded to members of the TCG for good marksmanship scores in training. Common in the days of energy weapons."
+
+/obj/item/clothing/accessory/ribbon/solgov/peace
+ name = "peacekeeping ribbon"
+ desc = "A military decoration awarded to members of the TCG for service during a peacekeeping operation."
+
+/obj/item/clothing/accessory/ribbon/solgov/frontier
+ name = "frontier ribbon"
+ desc = "A military decoration awarded to members of the TCG for service along the frontier."
+
+/obj/item/clothing/accessory/ribbon/solgov/instructor
+ name = "instructor ribbon"
+ desc = "A military decoration awarded to members of the TCG for service as an instructor."
+
+/*************
+specialty pins
+*************/
+/obj/item/clothing/accessory/solgov/specialty/janitor
+ name = "custodial blazes"
+ desc = "Purple blazes denoting a custodial technician."
+
+/obj/item/clothing/accessory/solgov/specialty/brig
+ name = "brig blazes"
+ desc = "Red blazes denoting a brig officer."
+
+/obj/item/clothing/accessory/solgov/specialty/forensic
+ name = "forensics blazes"
+ desc = "Steel blazes denoting a forensic technician."
+
+/obj/item/clothing/accessory/solgov/specialty/atmos
+ name = "atmospherics blazes"
+ desc = "Turquoise blazes denoting an atmospheric technician."
+
+/obj/item/clothing/accessory/solgov/specialty/counselor
+ name = "counselor blazes"
+ desc = "Blue blazes denoting a counselor."
+
+/obj/item/clothing/accessory/solgov/specialty/chemist
+ name = "chemistry blazes"
+ desc = "Orange blazes denoting a chemist."
+
+/obj/item/clothing/accessory/solgov/specialty/enlisted
+ name = "enlisted qualification pin"
+ desc = "An iron pin denoting some special qualification."
+
+/obj/item/clothing/accessory/solgov/specialty/officer
+ name = "officer's qualification pin"
+ desc = "A golden pin denoting some special qualification."
+
+/obj/item/clothing/accessory/solgov/specialty/pilot
+ name = "pilot's qualification pin"
+ desc = "An iron pin denoting the qualification to fly TCG spacecraft."
+
+/*****
+badges
+*****/
+/obj/item/clothing/accessory/badge/solgov/representative
+ name = "representative's badge"
+ desc = "A leather-backed plastic badge with a variety of information printed on it. Belongs to a representative of the Terran Commonwealth."
+ badge_string = "Terran Commonwealth"
+
+/*******
+armbands
+*******/
+/obj/item/clothing/accessory/armband/solgov/mp
+ name = "military police brassard"
+ desc = "An armlet, worn by the crew to display which department they're assigned to. This one is black with 'MP' in white."
+
+/obj/item/clothing/accessory/armband/solgov/ma
+ name = "master at arms brassard"
+ desc = "An armlet, worn by the crew to display which department they're assigned to. This one is white with 'MA' in navy blue."
+
+/*****************
+armour attachments
+*****************/
+/obj/item/clothing/accessory/armor/tag/solgov
+ name = "\improper TCG Flag"
+ desc = "An emblem depicting the Terran Commonwealth's flag."
+
+/obj/item/clothing/accessory/armor/tag/solgov/ec
+ name = "\improper Expeditionary Corps crest"
+ desc = "An emblem depicting the crest of the TCG Expeditionary Corps."
+
+/obj/item/clothing/accessory/armor/tag/solgov/sec
+ name = "\improper POLICE tag"
+ desc = "An armor tag with the word POLICE printed in silver lettering on it."
+
+/obj/item/clothing/accessory/armor/tag/solgov/medic
+ name = "\improper MEDIC tag"
+ desc = "An armor tag with the word MEDIC printed in red lettering on it."
+
+/obj/item/clothing/accessory/armor/tag/solgov/agent
+ name = "\improper OCIE AGENT tag"
+ desc = "An armor tag with the word OCIE AGENT printed in gold lettering on it."
+
+/obj/item/clothing/accessory/armor/tag/solgov/com
+ name = "\improper TCG tag"
+ desc = "An armor tag with the words COMMONWEALTH OF SOL-PROCYON printed in gold lettering on it."
+
+/obj/item/clothing/accessory/armor/tag/solgov/com/sec
+ name = "\improper POLICE tag"
+ desc = "An armor tag with the words POLICE printed in gold lettering on it."
+
+/obj/item/clothing/accessory/armor/helmcover/blue/sol
+ name = "peacekeeper helmet cover"
+ desc = "A fabric cover for armored helmets. This one is in TCG peacekeeper colors."
diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm
index aa84df42fc..fb96aaff12 100644
--- a/code/modules/clothing/under/miscellaneous_vr.dm
+++ b/code/modules/clothing/under/miscellaneous_vr.dm
@@ -1,3 +1,6 @@
+/obj/item/clothing/under/customs
+ desc = "A standard SolCom customs uniform. Complete with epaulettes."
+
/obj/item/clothing/var/hides_bulges = FALSE // OwO wats this?
/obj/item/clothing/under/permit
diff --git a/code/modules/clothing/under/solgov_vr.dm b/code/modules/clothing/under/solgov_vr.dm
index eb6e793685..e663db1344 100644
--- a/code/modules/clothing/under/solgov_vr.dm
+++ b/code/modules/clothing/under/solgov_vr.dm
@@ -2,8 +2,8 @@
//PT
/obj/item/clothing/under/solgov/pt/sifguard
- name = "explorer's pt uniform"
- desc = "A baggy shirt bearing the seal of the Society of Universal Cartographers and some dorky looking blue shorts."
+ name = "\improper SolCom pt uniform"
+ desc = "A baggy shirt bearing the seal of the Terran Commonwealth Explorer Corps and some dorky looking blue shorts."
/obj/item/clothing/under/solgov/pt/fleet
name = "fleet pt uniform"
@@ -21,33 +21,33 @@
desc = "A comfortable turtleneck and black utility trousers."
/obj/item/clothing/under/solgov/utility/sifguard
- name = "explorer's uniform"
- desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim."
+ name = "\improper SolCom uniform"
+ desc = "The utility uniform of the Terran Commonwealth Explorer Corps, made from biohazard resistant material. This one has silver trim."
/obj/item/clothing/under/solgov/utility/sifguard/officer
- name = "explorer's officer uniform"
- desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has gold trim."
+ name = "\improper SolCom officer uniform"
+ desc = "The utility uniform of the Terran Commonwealth Explorer Corps, made from biohazard resistant material. This one has gold trim."
/obj/item/clothing/under/solgov/utility/fleet
name = "fleet coveralls"
- desc = "The utility uniform of the USDF Fleet, made from an insulated material."
+ desc = "The utility uniform of the TCG Fleet, made from an insulated material."
/obj/item/clothing/under/solgov/utility/marine
name = "marine fatigues"
- desc = "The utility uniform of the USDF Marine Corps, made from durable material."
+ desc = "The utility uniform of the TCG Marine Corps, made from durable material."
/obj/item/clothing/under/solgov/utility/marine/green
name = "green fatigues"
- desc = "A green version of the USDF marine utility uniform, made from durable material."
+ desc = "A green version of the TCG marine utility uniform, made from durable material."
/obj/item/clothing/under/solgov/utility/marine/tan
name = "tan fatigues"
- desc = "A tan version of the USDF marine utility uniform, made from durable material."
+ desc = "A tan version of the TCG marine utility uniform, made from durable material."
/obj/item/clothing/under/solgov/utility/marine/olive
name = "olive fatigues"
- desc = "An olive version of the USDF marine utility uniform, made from durable material."
+ desc = "An olive version of the TCG marine utility uniform, made from durable material."
icon = 'icons/obj/clothing/uniforms_vr.dmi'
icon_override = 'icons/mob/uniform_vr.dmi'
icon_state = "bdu_olive"
@@ -55,7 +55,7 @@
/obj/item/clothing/under/solgov/utility/marine/desert
name = "desert fatigues"
- desc = "A desert version of the USDF marine utility uniform, made from durable material."
+ desc = "A desert version of the TCG marine utility uniform, made from durable material."
icon = 'icons/obj/clothing/uniforms_vr.dmi'
icon_override = 'icons/mob/uniform_vr.dmi'
icon_state = "bdu_olive"
@@ -65,29 +65,29 @@
/obj/item/clothing/under/solgov/service/fleet
name = "fleet service uniform"
- desc = "The service uniform of the USDF Fleet, made from immaculate white fabric."
+ desc = "The service uniform of the TCG Fleet, made from immaculate white fabric."
/obj/item/clothing/under/solgov/service/marine
name = "marine service uniform"
- desc = "The service uniform of the USDF Marine Corps. Slimming."
+ desc = "The service uniform of the TCG Marine Corps. Slimming."
worn_state = "greenservice"
/obj/item/clothing/under/solgov/service/marine/command
name = "marine command service uniform"
- desc = "The service uniform of the USDF Marine Corps. Slimming and stylish."
+ desc = "The service uniform of the TCG Marine Corps. Slimming and stylish."
/obj/item/clothing/under/solgov/mildress/expeditionary
- name = "explorer's dress uniform"
- desc = "The dress uniform of the Society of Universal Cartographers in silver trim."
+ name = "\improper SolCom dress uniform"
+ desc = "The dress uniform of the Terran Commonwealth Explorer Corps in silver trim."
/obj/item/clothing/under/solgov/mildress/expeditionary/command
- name = "explorer's command dress uniform"
- desc = "The dress uniform of the Society of Universal Cartographers in gold trim."
+ name = "\improper SolCom command dress uniform"
+ desc = "The dress uniform of the Terran Commonwealth Explorer Corps in gold trim."
/obj/item/clothing/under/solgov/mildress/marine
name = "marine dress uniform"
- desc = "The dress uniform of the USDF Marine Corps, class given form."
+ desc = "The dress uniform of the TCG Marine Corps, class given form."
/obj/item/clothing/under/solgov/mildress/marine/command
name = "marine command dress uniform"
- desc = "The dress uniform of the USDF Marine Corps, even classier in gold."
\ No newline at end of file
+ desc = "The dress uniform of the TCG Marine Corps, even classier in gold."
\ No newline at end of file
diff --git a/code/modules/games/spaceball_cards.dm b/code/modules/games/spaceball_cards.dm
index 146317a720..d9c932908c 100644
--- a/code/modules/games/spaceball_cards.dm
+++ b/code/modules/games/spaceball_cards.dm
@@ -8,7 +8,7 @@
..()
var/datum/playingcard/P
var/i
- var/year = 554 + text2num(time2text(world.timeofday, "YYYY"))
+ var/year = 300 + text2num(time2text(world.timeofday, "YYYY")) //VOREStation Edit
for(i=0;i<5;i++)
P = new()
if(prob(1))
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index 39d4a36d50..a8e3f6f283 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -1856,7 +1856,7 @@ Departamental Swimsuits, for general use
//Burrito Justice: Jayda Wilson
/obj/item/clothing/under/solgov/utility/sifguard/medical/fluff
- desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This is an older issuing of the uniform, with integrated department markings."
+ desc = "The utility uniform of the Terran Commonwealth Explorer Corps, made from biohazard resistant material. This is an older issuing of the uniform, with integrated department markings."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_override = 'icons/vore/custom_clothes_vr.dmi'
diff --git a/vorestation.dme b/vorestation.dme
index 662c43c1aa..0d09208698 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -406,6 +406,7 @@
#include "code\datums\supplypacks\robotics.dm"
#include "code\datums\supplypacks\robotics_vr.dm"
#include "code\datums\supplypacks\science.dm"
+#include "code\datums\supplypacks\science_vr.dm"
#include "code\datums\supplypacks\security.dm"
#include "code\datums\supplypacks\security_vr.dm"
#include "code\datums\supplypacks\supply.dm"
@@ -1028,6 +1029,8 @@
#include "code\game\objects\effects\decals\Cleanable\tracks.dm"
#include "code\game\objects\effects\decals\posters\bs12.dm"
#include "code\game\objects\effects\decals\posters\polarisposters.dm"
+#include "code\game\objects\effects\decals\posters\polarisposters_vr.dm"
+#include "code\game\objects\effects\decals\posters\tgposters.dm"
#include "code\game\objects\effects\decals\posters\voreposters_vr.dm"
#include "code\game\objects\effects\map_effects\beam_point.dm"
#include "code\game\objects\effects\map_effects\effect_emitter.dm"
@@ -1690,7 +1693,7 @@
#include "code\modules\blob2\overmind\types\volatile_alluvium.dm"
#include "code\modules\busy_space\air_traffic.dm"
#include "code\modules\busy_space\loremaster.dm"
-#include "code\modules\busy_space_vr\organizations.dm"
+#include "code\modules\busy_space\organizations_vr.dm"
#include "code\modules\catalogue\atoms.dm"
#include "code\modules\catalogue\catalogue_data.dm"
#include "code\modules\catalogue\catalogue_data_vr.dm"