diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index 68226189c8..7675643970 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -283,8 +283,8 @@ name = "Sif Governmental Authority" short_name = "SifGov" desc = "SifGov is the sole governing administration for the Vir system, based in New Reykjavik, Sif. It is a representative \ - democratic government, and a fully recognized member of the Solar Confederate Government. Anyone operating inside of Vir must \ - comply with SifGov's legislation and regulations." + democratic government, and a fully recognized member of the Solar Central Government. Anyone operating inside of Vir must \ + comply with SifGov's legislation and regulations." // Vorestation Edit. Confederate -> Central history = "" // Todo like the rest of them work = "governing body of Sif" headquarters = "New Reykjavik, Sif" diff --git a/code/modules/busy_space/organizations_vr.dm b/code/modules/busy_space/organizations_vr.dm index 4a89d62165..88a1020126 100644 --- a/code/modules/busy_space/organizations_vr.dm +++ b/code/modules/busy_space/organizations_vr.dm @@ -1,6 +1,38 @@ //Datums for different companies that can be used by busy_space, VR edition ////////////////////////////////////////////////////////////////////////////////// +/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 UNSC. 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 UNSC 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" + headquarters = "Paris, Earth" + motto = "" // Latin, because latin. Says 'Nothing is too steep for mortals'. + autogenerate_destination_names = TRUE + + ship_prefixes = list("SCG-T" = "transportation", "SCG-D" = "diplomatic", "SCG-F" = "freight") + destination_names = list( + "Venus", + "Earth", + "Luna", + "Mars", + "Titan" + )// autogen will add a lot of other places as well. + /datum/lore/organization/gov/federation name = "United Federation of Planets" short_name = "Federation" @@ -69,49 +101,102 @@ "Mari Industrial Complex on Furlou Prime", "Runni Crystal Mines of Keid V") -/datum/lore/organization/mil/unsc +/datum/lore/organization/mil/unsc // change to sif_guard in future to overwrite Polaris stuff name = "United Nations Space Command" short_name = "Navy" //Otherwise they call the ships UNSC UNSC Name - desc = "The dedicated military force of SolGov, formed from the remnants of the United Nations, is the might of SolGov. \ - While it is greater in military strength than most alien polities, it is not by much." - history = "" - work = "" + desc = "The dedicated military force of SolGov, originally formed by the United Nations, is the might of SolGov. 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 UNSC to be a major player." + history = "UN clashes with dissident political movements, the most important of which were the \"Koslovics\" and the \"Frieden,\" \ + began the crisis that led to the formation of the UNSC. The Frieden 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 Koslovics, formed a Marxist-Leninist group centered around the leadership of Vladimir Koslov \ + around the same time. The UNSC was commissioned in 2163 as a military force primarily composed of Naval and Marine \ + forces. In July 2164, the UNSC partook in its first battle. From this point, the UNSC 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 UNSC began to expand into the stars. The apex of human expansion would come in 2490, when more than 800 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 UNSCDF, the military \ + branch of the UNSC, continues to battle Insurrectionists to this day. The UNSC's operations meanwhile focus on curbing \ + piracy operations, as well as providing a deterrent against the Confederacy of Independent Systems and the " + work = "peacekeeping and piracy suppression" headquarters = "Earth" motto = "" - //Halo ship names! ship_prefixes = list("UNSC" = "military") - ship_names = list("Colorado", - "Anjou", - "Shanxi", - "Hammerhead", - "Piranha", - "Barracuda", - "DeGaulle", - "Leonidas", - "Tokugawa", - "Halcyon", - "Bastion", - "Adjudicator", - "Devestator", - "Corsair", - "Herakles", - "Ain't No Sunshine", - "Dust of Snow", - "Finite Hearts") + ship_names = list("Aegis Fate", + "Ain't No Sunshine", + "All Under Heaven", + "Allegiance", + "Andraste", + "Anjou", + "Barracuda", + "Bastion", + "Buenos Aires", + "Bum Rush", + "Callisto", + "Charon", + "Colorado", + "Commonwealth", + "Corsair", + "DeGaulle", + "Devestator", + "Dust of Snow", + "Euphrates", + "Fair Weather", + "Finite Hearts", + "Forward Unto Dawn", + "Gettysburg", + "Glamorgan", + "Grafton", + "Hammerhead", + "Herakles", + "Hoenir", + "In Amber Clad", + "Iwo Jima", + "Jörmungandr", + "Leonidas", + "Meriwether Lewis", + "Midsummer Night", + "Mona Lisa", + "Olympus", + "Paris", + "Pony Express", + "Providence", + "Purpose", + "Ready or Not", + "Redoubtable", + "Saratoga", + "Savannah", + "Shanxi", + "Song of the East", + "Stalwart Dawn", + "Strident", + "Tannenberg", + "Tokugawa", + "Totem Lake", + "Tripping Light", + "Two for Flinching") destination_names = list("San Francisco on Earth", "SolGov Fleet Academy on Earth", "Gateway One above Luna", - "SolGov Command on Luna", + "SolGov Headquarters on Earth", "Olympus City on Mars", "Hermes Naval Shipyard above Mars", + "Cairo Station above Earth", "a settlement on Titan", "a settlement on Europa", "Aleph Grande on Ganymede", "a new colony in Proxima II", "a new settlement on Ceti IV-B", "a colony ship around Ceti IV-B", - "a classified location in SolGov territory") + "a naval station above Ceti IV-B", + "a classified location in SolGov territory", + "a classified location in uncharted space") /datum/lore/organization/gov/kitsuhana name = "Kitsuhana Heavy Industries" @@ -119,14 +204,14 @@ desc = "A large post-scarcity amalgamation of races, Kitsuhana is no longer a company but rather a loose association of 'members' \ who only share the KHI name and their ideals in common. Kitsuhana accepts interviews to join their ranks, and though they have no \ formal structure with regards to government or law, the concept of 'consent' drives most of the large decision making. Kitsuhanans \ - pride themselves on their ability to avoid consequence, essentially preferring to live care-free lives. Their post-scarcity allows them to rebuild, \ - regrow, and replenish almost any lost asset or resource nearly instantly. It leads to many of the Kitsuhana 'members' treating everything with frivolity, \ - and lends them a care-free demeanor." + pride themselves on their ability to avoid consequence, essentially preferring to live care-free lives. Their post-scarcity allows \ + them to rebuild, regrow, and replenish almost any lost asset or resource nearly instantly. It leads to many of the Kitsuhana \ + 'members' treating everything with frivolity and lends them a care-free demeanor." history = "Originally a heavy industrial equipment and space mining company. During a forced evacuation of their homeworld, \ - they were they only organization with enough ship capacity to relocate any significant portion of the population, starting with their own employees. \ - After the resulting slowship travel to nearby starsystems, most of the population decided to keep the moniker of the \ - company name. Over the years, Kitsuhana developed into a post-scarcity anarchy where virtually nothing has consequences \ - and Kitsuhana 'members' can live their lives as they see fit, often in isolation." + they were they only organization with enough ship capacity to relocate any significant portion of the population, starting with \ + their own employees. After the resulting slowship travel to nearby starsystems, most of the population decided to keep the moniker \ + of the company name. Over the years, Kitsuhana developed into a post-scarcity anarchy where virtually nothing has consequences and \ + Kitsuhana 'members' can live their lives as they see fit, often in isolation." work = "utopian anarchy" headquarters = "Kitsuhana Prime" motto = "Do what you want. We know we will." @@ -170,13 +255,12 @@ /datum/lore/organization/gov/ares name = "Ares Confederation" short_name = "ArCon" - desc = "A rebel faction on the fringes of human space 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 are privateers, volunteers and former pirates. The Ares Confederation only holds a \ - dozen planets, but are fiercely defending any incursion on their territory." - 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 UNSC Colonel Rodrick Gellaume, who is now Prime Minister." + 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 UNSC." + 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 UNSC Colonel Rodrick Gellaume, who is now Prime Minister." work = "rebel fringe government" headquarters = "Paraiso a Àstrea" motto = "Liberty to the Stars!" @@ -224,3 +308,94 @@ "a settlement needing our help", "Forward Base Sigma-Alpha in ArCon space") +/* + +WIP, ADD SOME SHIT FOR THE SPACE ELVES + - 2-5 inner planets, 1-2 habitable, 1 Jovian style gas giant, 3-4 other gas giants. + - Equivalent to the UNSC in power. + - Living somewhere in a big galactic blind spot https://en.wikipedia.org/wiki/Orion_Arm + +/datum/lore/organization/gov/imperial + name = "Imperium Auream" + short_name = "Imperial" + desc = "" + history = "" + work = "" + headquarters = "" + motto = "" + + ship_prefixes = list("HMS" = "military") + ship_names = list("Ambition", + "Ark", + "Aurora", + "Behemoth", + "Beholder", + "Boreas", + "Bulwark", + "Calypso", + "Cerberus", + "Chimera", + "Chronos", + "Civitas", + "Claymore", + "Colossus", + "Destiny", + "Endeavor", + "Epimetheus", + "Eternal", + "Excalibur", + "Forerunner", + "Fortitude", + "Frontier", + "Glory", + "Hassar", + "Hellion", + "Horizon", + "Hyperion", + "Illustria", + "Immortal", + "Infinitum", + "Infinity", + "Inquisitor", + "Invictus", + "Ironborn", + "Judgment", + "Juggernaut", + "Knossos", + "Lancaster", + "Legacy", + "Leviathon", + "Marathon", + "Megalith", + "Mobius", + "Nemesis", + "Nightingale", + "Oblivion", + "Orthrus", + "Paladin", + "Pandora", + "Phalanx", + "Providence", + "Prydwen", + "Revenant", + "Rhapsody", + "Scylla", + "Seraphim", + "Speedwell", + "Star Fury", + "Starfall", + "Stargazer", + "Starhammer", + "Templar", + "Thundrus", + "Titan", + "Trident", + "Triumph", + "Valiant", + "Valkyrie", + "Valor", + "Victoria", + "Vindicator", + "Void's Echo", + "Wreath") + destination_names = list("")*/ \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 16beab3c06..b42add9abe 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -121,7 +121,7 @@ display_name = "cap, bill" path = /obj/item/clothing/head/soft/mbill -/datum/gear/head/cap/sol +/*/datum/gear/head/cap/sol display_name = "cap, sol" path = /obj/item/clothing/head/soft/sol @@ -131,7 +131,7 @@ /datum/gear/head/cap/fleet display_name = "cap, fleet" - path = /obj/item/clothing/head/soft/sol/fleet + path = /obj/item/clothing/head/soft/sol/fleet*/ // Vorestation removal /datum/gear/head/cowboy display_name = "cowboy, rodeo" @@ -338,7 +338,7 @@ path = /obj/item/clothing/head/welding/engie allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist") -/datum/gear/head/beret/sol +/*/datum/gear/head/beret/sol display_name = "beret sol, selection" path = /obj/item/clothing/head/beret/sol @@ -348,7 +348,7 @@ for(var/sol_style in typesof(/obj/item/clothing/head/beret/sol)) var/obj/item/clothing/head/beret/sol/sol = sol_style sols[initial(sol.name)] = sol - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols)) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))*/ // Vorestation removal. /datum/gear/head/surgical/black display_name = "surgical cap, black" diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm new file mode 100644 index 0000000000..e1a01568e2 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -0,0 +1,3 @@ +/*/datum/gear/head/cap/sol + display_name = "cap, sol" + path = /obj/item/clothing/head/soft/sol*/ \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index f3df4442e5..78e490f34a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -2,6 +2,11 @@ display_name = "nudity permit" path = /obj/item/clothing/under/permit +//Polaris overrides +/datum/gear/uniform/pt/expeditionary + display_name = "pt uniform, planetside sec" + path = /obj/item/clothing/under/pt/expeditionary + //KHI Uniforms /datum/gear/uniform/job_khi/cmd display_name = "khi uniform, cmd" diff --git a/code/modules/clothing/head/helmet_vr.dm b/code/modules/clothing/head/helmet_vr.dm new file mode 100644 index 0000000000..9bb1d280cf --- /dev/null +++ b/code/modules/clothing/head/helmet_vr.dm @@ -0,0 +1,15 @@ +/obj/item/clothing/head/helmet/solgov + name = "\improper Solar Central Government 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." + +/obj/item/clothing/head/helmet/combat/unsc + name = "\improper CH252 helmet" + desc = "If you wanna to keep your brain inside your head, you'd best put this on!" + icon_state = "unsc_helm" + item_state = "swat_hel" + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' \ No newline at end of file diff --git a/code/modules/clothing/head/solgov_vr.dm b/code/modules/clothing/head/solgov_vr.dm new file mode 100644 index 0000000000..7444b03abf --- /dev/null +++ b/code/modules/clothing/head/solgov_vr.dm @@ -0,0 +1,168 @@ +//SolGov uniform hats + +//Utility +/obj/item/clothing/head/soft/sol + name = "\improper SolGov cap" + desc = "It's a blue ballcap in Solar Central 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." + +/obj/item/clothing/head/soft/sol/fleet + name = "fleet cap" + desc = "It's a navy blue ballcap with a UNSC Fleet crest." + +/obj/item/clothing/head/utility + name = "utility cover" + desc = "An eight-point utility cover." + +/obj/item/clothing/head/utility/fleet + name = "fleet utility cover" + desc = "A navy blue utility cover bearing the crest of a UNSC Fleet." + +/obj/item/clothing/head/utility/marine + name = "marine utility cover" + desc = "A grey utility cover bearing the crest of the UNSC Marine Corps." + +/obj/item/clothing/head/utility/marine/tan + name = "tan utility cover" + desc = "A tan utility cover bearing the crest of the UNSC Marine Corps." + +/obj/item/clothing/head/utility/marine/green + name = "green utility cover" + desc = "A green utility cover bearing the crest of the UNSC 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 UNSC 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' + +//Service + +/obj/item/clothing/head/service + name = "service cover" + desc = "A service uniform cover." + +/obj/item/clothing/head/service/marine + name = "marine wheel cover" + desc = "A green service uniform cover with an UNSC Marine Corps crest." + +/obj/item/clothing/head/service/marine/command + name = "marine officer's wheel cover" + desc = "A green service uniform cover with an UNSC 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 UNSC Marine Corps." + +/obj/item/clothing/head/service/marine/garrison/command + name = "marine officer's garrison cap" + desc = "A green garrison cap belonging to the UNSC 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 UNSC 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." + +/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." + +/obj/item/clothing/head/dress/fleet + name = "fleet dress wheel cover" + desc = "A white dress uniform cover. This one has an UNSC 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 UNSC Fleet crest." + +/obj/item/clothing/head/dress/marine + name = "marine dress wheel cover" + desc = "A white dress uniform cover with an UNSC 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 UNSC Marine Corps 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." + +/obj/item/clothing/head/beret/sol/gateway + name = "gateway administration beret" + desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety." + +/obj/item/clothing/head/beret/sol/customs + name = "customs and trade beret" + desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety." + +/obj/item/clothing/head/beret/sol/orbital + name = "orbital assault beret" + desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety." + +/obj/item/clothing/head/beret/sol/research + name = "government research beret" + desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety." + +/obj/item/clothing/head/beret/sol/health + name = "health service beret" + desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety." + +/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." + +/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." + +/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." + +/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." + +/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." + +/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." + +/obj/item/clothing/head/beret/sol/fleet + name = "fleet beret" + desc = "A navy blue beret belonging to the UNSC 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 UNSC 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 UNSC 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 UNSC 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 UNSC 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 UNSC 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/spacesuits/void/military_vr.dm b/code/modules/clothing/spacesuits/void/military_vr.dm new file mode 100644 index 0000000000..77a646b968 --- /dev/null +++ b/code/modules/clothing/spacesuits/void/military_vr.dm @@ -0,0 +1,34 @@ +/obj/item/clothing/head/helmet/space/void/merc/odst + name = "\improper ODST Helmet" + desc = "\"... we are glad to plunge feet first into hell in the knowledge that we will rise.\"" + icon_state = "rig0-odst" + item_state = "swat_hel" //Placeholder + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' + light_overlay = "helmet_light_dual" + +/*/obj/item/clothing/head/helmet/space/void/merc/odst/attack_self(mob/user) + if(camera) + ..(user) + else + camera = new /obj/machinery/camera(src) + camera.network = list("SS13") + cameranet.removeCamera(camera) + camera.c_tag = "TacCam ODST - [user.name]" + user << "\blue User scanned as [camera.c_tag]. Camera activated."*/ + +/*/obj/item/clothing/head/helmet/space/void/merc/odst/jertheace // Given to Acacius during an event. Save this for use in events. + name = "\improper Ace's ODST Helmet" + icon = 'icons/obj/custom_items.dmi' + icon_state = "rig0-odst_ace" + desc = "Etched under the inner visor is the phrase \"Don’t let your past define you; let it mold you into the person you want to be.\"" + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi'*/ + +/obj/item/clothing/suit/space/void/merc/odst + name = "ODST Armor" + desc = "\"... we are glad to plunge feet first into hell in the knowledge that we will rise.\"" + icon_state = "odst" + item_state = "swat_suit" + icon = 'icons/obj/clothing/suits_vr.dmi' + icon_override = 'icons/mob/suit_vr.dmi' \ 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 9d44f78a49..3df98acb4a 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -12,7 +12,6 @@ siemens_coefficient = 0 - /obj/item/clothing/suit/armor/vest/wolftaur name = "wolf-taur armor vest" desc = "An armored vest that protects against some damage. It appears to be created for a wolf-taur." @@ -33,7 +32,7 @@ H << "You need to have a wolf-taur half to wear this." return 0 - +// HoS armor improved by Vorestation to be slightly better than normal security stuff. /obj/item/clothing/suit/storage/vest/hoscoat armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0) @@ -44,4 +43,29 @@ name = "armored trenchcoat" desc = "A trenchcoat augmented with a special alloy for some protection and style." icon_state = "hostrench" - flags_inv = HIDEHOLSTER \ No newline at end of file + flags_inv = HIDEHOLSTER + +// 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." + +/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." // UNSC does peacekeeping, not these guys. + +/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." + +/obj/item/clothing/suit/armor/combat/unsc + name = "\improper M52B Body Armor" + desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon–and we had to share the rock!" + icon_state = "unsc_armor" + icon = 'icons/obj/clothing/suits_vr.dmi' + icon_override = 'icons/mob/suit_vr.dmi' + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS \ No newline at end of file diff --git a/code/modules/clothing/suits/solgov_vr.dm b/code/modules/clothing/suits/solgov_vr.dm new file mode 100644 index 0000000000..e68c4791c1 --- /dev/null +++ b/code/modules/clothing/suits/solgov_vr.dm @@ -0,0 +1,100 @@ +//SolGov Uniform Suits + +//Service +/obj/item/clothing/suit/storage/service/expeditionary + name = "explorer's jacket" + desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons." + +/obj/item/clothing/suit/storage/service/expeditionary/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." + +/obj/item/clothing/suit/storage/service/expeditionary/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." + +/obj/item/clothing/suit/storage/service/expeditionary/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." + +/obj/item/clothing/suit/storage/service/expeditionary/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." + +/obj/item/clothing/suit/storage/service/expeditionary/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." + +/obj/item/clothing/suit/storage/service/expeditionary/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." + +/obj/item/clothing/suit/storage/service/expeditionary/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." + +/obj/item/clothing/suit/storage/service/expeditionary/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." + +/obj/item/clothing/suit/storage/service/marine + name = "marine coat" + desc = "An UNSC Marine Corps service coat. Green and undecorated." + +/obj/item/clothing/suit/storage/service/marine/medical + name = "marine medical jacket" + desc = "An UNSC 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 UNSC 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 UNSC 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 UNSC 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 UNSC Marine Corps service coat. This one has brown markings." + +/obj/item/clothing/suit/storage/service/marine/security + name = "marine security jacket" + desc = "An UNSC 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 UNSC 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 UNSC 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." + +/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." + +/obj/item/clothing/suit/storage/toggle/dress/fleet + name = "fleet dress jacket" + desc = "A crisp white UNSC 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 UNSC 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 UNSC 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 UNSC Marine Corps dress jacket with gold trim. Smells like ceremony." \ No newline at end of file diff --git a/code/modules/clothing/under/solgov_vr.dm b/code/modules/clothing/under/solgov_vr.dm new file mode 100644 index 0000000000..2311907399 --- /dev/null +++ b/code/modules/clothing/under/solgov_vr.dm @@ -0,0 +1,204 @@ +//SolGov Uniforms + +//PT +/obj/item/clothing/under/pt/expeditionary + name = "explorer's pt uniform" + desc = "A baggy shirt bearing the seal of the Society of Universal Cartographers and some dorky looking blue shorts." + +/obj/item/clothing/under/pt/fleet + name = "fleet pt uniform" + desc = "A pair of black shorts and two tank tops, seems impractical. Looks good though." + +/obj/item/clothing/under/pt/marine + name = "marine pt uniform" + desc = "Does NOT leave much to the imagination." + + +//Utility + +/obj/item/clothing/under/utility + name = "utility uniform" + desc = "A comfortable turtleneck and black utility trousers." + +/obj/item/clothing/under/utility/expeditionary + name = "explorer's uniform" + desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim." + +/obj/item/clothing/under/utility/expeditionary/medical + name = "explorer's medical uniform" + desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim and blue blazes." + +/obj/item/clothing/under/utility/expeditionary/medical/command + name = "explorer's medical command uniform" + desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has gold trim and blue blazes." + +/obj/item/clothing/under/utility/expeditionary/engineering + name = "explorer's engineering uniform" + desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim and organge blazes." + +/obj/item/clothing/under/utility/expeditionary/engineering/command + name = "explorer's engineering command uniform" + desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has gold trim and organge blazes." + +/obj/item/clothing/under/utility/expeditionary/supply + name = "explorer's supply uniform" + desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim and brown blazes." + +/obj/item/clothing/under/utility/expeditionary/security + name = "explorer's security uniform" + desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim and red blazes." + +/obj/item/clothing/under/utility/expeditionary/security/command + name = "explorer's security command uniform" + desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has gold trim and red blazes." + +/obj/item/clothing/under/utility/expeditionary/command + name = "explorer's command uniform" + desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has gold trim and gold blazes." + + +/obj/item/clothing/under/utility/fleet + name = "fleet coveralls" + desc = "The utility uniform of the UNSC Fleet, made from an insulated material." + +/obj/item/clothing/under/utility/fleet/medical + name = "fleet medical coveralls" + desc = "The utility uniform of the UNSC Fleet, made from an insulated material. This one has blue cuffs." + +/obj/item/clothing/under/utility/fleet/engineering + name = "fleet engineering coveralls" + desc = "The utility uniform of the UNSC Fleet, made from an insulated material. This one has orange cuffs." + +/obj/item/clothing/under/utility/fleet/supply + name = "fleet supply coveralls" + desc = "The utility uniform of the UNSC Fleet, made from an insulated material. This one has brown cuffs." + +/obj/item/clothing/under/utility/fleet/security + name = "fleet security coveralls" + desc = "The utility uniform of the UNSC Fleet, made from an insulated material. This one has red cuffs." + +/obj/item/clothing/under/utility/fleet/command + name = "fleet command coveralls" + desc = "The utility uniform of the UNSC Fleet, made from an insulated material. This one has gold cuffs." + + +/obj/item/clothing/under/utility/marine + name = "marine fatigues" + desc = "The utility uniform of the UNSC Marine Corps, made from durable material." + +/obj/item/clothing/under/utility/marine/green + name = "green fatigues" + desc = "A green version of the UNSC marine utility uniform, made from durable material." + +/obj/item/clothing/under/utility/marine/tan + name = "tan fatigues" + desc = "A tan version of the UNSC marine utility uniform, made from durable material." + +/obj/item/clothing/under/utility/marine/olive + name = "olive fatigues" + desc = "An olive version of the UNSC 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" + verb/toggle_sleeves() + set name = "Roll sleeves" + set category = "Object" + set src in usr + + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + switch(icon_state) + if("bdu_olive_rolled") + src.icon_state = "bdu_olive" + usr << "You roll down your sleeves." + if("bdu_olive") + src.icon_state = "bdu_olive_rolled" + usr << "You roll up your sleeves." + if("bdu_d_camo_rolled") + src.icon_state = "bdu_d_camo" + usr << "You roll down your sleeves." + if("bdu_d_camo") + src.icon_state = "bdu_d_camo_rolled" + usr << "You roll up your sleeves." + usr.update_inv_w_uniform() // So our uniform updates on our character. + +/obj/item/clothing/under/utility/marine/desert + name = "desert fatigues" + desc = "A desert version of the UNSC 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" + verb/toggle_sleeves() + set name = "Roll sleeves" + set category = "Object" + set src in usr + + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + switch(icon_state) + if("bdu_olive_rolled") + src.icon_state = "bdu_olive" + usr << "You roll down your sleeves." + if("bdu_olive") + src.icon_state = "bdu_olive_rolled" + usr << "You roll up your sleeves." + if("bdu_d_camo_rolled") + src.icon_state = "bdu_d_camo" + usr << "You roll down your sleeves." + if("bdu_d_camo") + src.icon_state = "bdu_d_camo_rolled" + usr << "You roll up your sleeves." + usr.update_inv_w_uniform() // So our uniform updates on our character. + +/obj/item/clothing/under/utility/marine/medical + name = "marine medical fatigues" + desc = "The utility uniform of the UNSC Marine Corps, made from durable material. This one has blue markings." + +/obj/item/clothing/under/utility/marine/engineering + name = "marine engineering fatigues" + desc = "The utility uniform of the UNSC Marine Corps, made from durable material. This one has orange markings." + +/obj/item/clothing/under/utility/marine/supply + name = "marine supply fatigues" + desc = "The utility uniform of the UNSC Marine Corps, made from durable material. This one has brown markings." + +/obj/item/clothing/under/utility/marine/security + name = "marine security fatigues" + desc = "The utility uniform of the UNSC Marine Corps, made from durable material. This one has red markings." + +/obj/item/clothing/under/utility/marine/command + name = "marine command coveralls" + desc = "The utility uniform of the UNSC Marine Corps, made from durable material. This one has gold markings." + +//Service + +/obj/item/clothing/under/service/fleet + name = "fleet service uniform" + desc = "The service uniform of the UNSC Fleet, made from immaculate white fabric." + +/obj/item/clothing/under/service/marine + name = "marine service uniform" + desc = "The service uniform of the UNSC Marine Corps. Slimming." + worn_state = "greenservice" + +/obj/item/clothing/under/service/marine/command + name = "marine command service uniform" + desc = "The service uniform of the UNSC Marine Corps. Slimming and stylish." + +/obj/item/clothing/under/mildress/expeditionary + name = "explorer's dress uniform" + desc = "The dress uniform of the Society of Universal Cartographers in silver trim." + +/obj/item/clothing/under/mildress/expeditionary/command + name = "explorer's command dress uniform" + desc = "The dress uniform of the Society of Universal Cartographers in gold trim." + +/obj/item/clothing/under/mildress/marine + name = "marine dress uniform" + desc = "The dress uniform of the UNSC Marine Corps, class given form." + +/obj/item/clothing/under/mildress/marine/command + name = "marine command dress uniform" + desc = "The dress uniform of the UNSC Marine Corps, even classier in gold." \ No newline at end of file diff --git a/icons/mob/head_vr.dmi b/icons/mob/head_vr.dmi new file mode 100644 index 0000000000..ac1f68b77c Binary files /dev/null and b/icons/mob/head_vr.dmi differ diff --git a/icons/mob/suit_vr.dmi b/icons/mob/suit_vr.dmi new file mode 100644 index 0000000000..a1b93a7100 Binary files /dev/null and b/icons/mob/suit_vr.dmi differ diff --git a/icons/mob/uniform_vr.dmi b/icons/mob/uniform_vr.dmi new file mode 100644 index 0000000000..a34d6cfa99 Binary files /dev/null and b/icons/mob/uniform_vr.dmi differ diff --git a/icons/obj/clothing/hats_vr.dmi b/icons/obj/clothing/hats_vr.dmi new file mode 100644 index 0000000000..e1e37dfd47 Binary files /dev/null and b/icons/obj/clothing/hats_vr.dmi differ diff --git a/icons/obj/clothing/suits_vr.dmi b/icons/obj/clothing/suits_vr.dmi new file mode 100644 index 0000000000..e8ef3dbfde Binary files /dev/null and b/icons/obj/clothing/suits_vr.dmi differ diff --git a/icons/obj/clothing/uniforms_vr.dmi b/icons/obj/clothing/uniforms_vr.dmi new file mode 100644 index 0000000000..db0a948267 Binary files /dev/null and b/icons/obj/clothing/uniforms_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index e9b9e99e4c..5deacb4646 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1306,6 +1306,7 @@ #include "code\modules\client\preference_setup\loadout\loadout_gloves.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_head.dm" +#include "code\modules\client\preference_setup\loadout\loadout_head_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_mask.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "code\modules\client\preference_setup\loadout\loadout_smoking.dm" @@ -1345,11 +1346,13 @@ #include "code\modules\clothing\head\flowercrowns.dm" #include "code\modules\clothing\head\hardhat.dm" #include "code\modules\clothing\head\helmet.dm" +#include "code\modules\clothing\head\helmet_vr.dm" #include "code\modules\clothing\head\jobs.dm" #include "code\modules\clothing\head\misc.dm" #include "code\modules\clothing\head\misc_special.dm" #include "code\modules\clothing\head\soft_caps.dm" #include "code\modules\clothing\head\solgov.dm" +#include "code\modules\clothing\head\solgov_vr.dm" #include "code\modules\clothing\masks\boxing.dm" #include "code\modules\clothing\masks\breath.dm" #include "code\modules\clothing\masks\gasmask.dm" @@ -1387,6 +1390,7 @@ #include "code\modules\clothing\spacesuits\rig\suits\station.dm" #include "code\modules\clothing\spacesuits\rig\suits\station_vr.dm" #include "code\modules\clothing\spacesuits\void\merc.dm" +#include "code\modules\clothing\spacesuits\void\military_vr.dm" #include "code\modules\clothing\spacesuits\void\station.dm" #include "code\modules\clothing\spacesuits\void\void.dm" #include "code\modules\clothing\spacesuits\void\void_vr.dm" @@ -1399,6 +1403,7 @@ #include "code\modules\clothing\suits\labcoat.dm" #include "code\modules\clothing\suits\miscellaneous.dm" #include "code\modules\clothing\suits\solgov.dm" +#include "code\modules\clothing\suits\solgov_vr.dm" #include "code\modules\clothing\suits\storage.dm" #include "code\modules\clothing\suits\toggles.dm" #include "code\modules\clothing\suits\utility.dm" @@ -1410,6 +1415,7 @@ #include "code\modules\clothing\under\pants.dm" #include "code\modules\clothing\under\shorts.dm" #include "code\modules\clothing\under\solgov.dm" +#include "code\modules\clothing\under\solgov_vr.dm" #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\accessories\accessory.dm" #include "code\modules\clothing\under\accessories\accessory_vr.dm"