From c1511cbc714d00189d76bb39a50bc2af77868956 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Thu, 1 Sep 2022 21:47:36 +0200 Subject: [PATCH] Changes Jargon to Nralakk (#14734) --- aurorastation.dme | 8 +-- code/_helpers/text.dm | 4 +- code/game/objects/items/skrell.dm | 24 ++++---- .../objects/items/weapons/gift_wrappaper.dm | 2 +- .../objects/items/weapons/storage/boxes.dm | 2 +- code/game/objects/random/random.dm | 4 +- code/game/objects/structures/signs.dm | 22 +++---- code/modules/background/accent/skrell.dm | 6 +- code/modules/background/citizenship/skrell.dm | 24 ++++---- code/modules/background/citizenship/vaurca.dm | 2 +- code/modules/background/defines.dm | 2 +- .../origins/origins/diona/biesel.dm | 6 +- .../origins/origins/diona/coalition.dm | 4 +- .../origins/origins/diona/deep_space.dm | 2 +- .../origins/origins/diona/eridani.dm | 4 +- .../background/origins/origins/diona/eum.dm | 6 +- .../origins/origins/diona/jargon.dm | 24 -------- .../origins/origins/diona/narrows.dm | 6 +- .../origins/origins/diona/nralakk.dm | 24 ++++++++ .../background/origins/origins/diona/sol.dm | 4 +- .../background/origins/origins/diona/xrim.dm | 6 +- .../origins/origins/skrell/jargon.dm | 33 ---------- .../origins/origins/skrell/non_federation.dm | 20 +++---- .../origins/origins/skrell/nralakk.dm | 33 ++++++++++ .../origins/origins/vaurca/breeder/cthur.dm | 10 ++-- .../origins/origins/vaurca/cthur.dm | 12 ++-- code/modules/background/religion/diona.dm | 2 +- code/modules/cargo/bounties/chef.dm | 2 +- .../loadout/loadout_accessories.dm | 2 +- .../loadout/loadout_factions.dm | 2 +- .../loadout/loadout_general.dm | 6 +- .../loadout/loadout_xeno/skrell.dm | 60 +++++++++---------- .../factions/{jargon.dm => nralakk.dm} | 8 +-- code/modules/clothing/head/helmet.dm | 1 - code/modules/clothing/head/xenos/vaurca.dm | 6 +- code/modules/clothing/shoes/xeno/vaurca.dm | 6 +- .../clothing/spacesuits/rig/modules/ninja.dm | 2 +- .../clothing/spacesuits/rig/suits/skrell.dm | 8 +-- code/modules/clothing/suits/modular_armor.dm | 6 +- code/modules/clothing/suits/xeno/vaurca.dm | 6 +- .../clothing/under/accessories/accessory.dm | 6 +- .../clothing/under/accessories/badges.dm | 10 ++-- .../clothing/under/accessories/xeno/skrell.dm | 20 +++---- code/modules/clothing/under/xenos/skrell.dm | 56 ++++++++--------- code/modules/customitems/item_defines.dm | 8 +-- code/modules/games/tarot.dm | 10 ++-- .../seed_datums/{jargon.dm => nralakk.dm} | 0 .../human/species/station/diona/diona.dm | 2 +- .../station/vaurca/vaurca_subspecies.dm | 2 +- .../projectiles/guns/energy/nuclear.dm | 8 +-- code/modules/psionics/events/_psi.dm | 4 +- code/modules/psionics/events/mini_spasm.dm | 4 +- .../Chemistry-Reagents-Drugs.dm | 2 +- .../Chemistry-Reagents-Food-Drinks.dm | 4 +- .../reagent_containers/food/snacks.dm | 4 +- .../reagent_containers/glass/coffeecup.dm | 6 +- html/changelogs/jargon_to_nralakk.yml | 6 ++ 57 files changed, 284 insertions(+), 279 deletions(-) delete mode 100644 code/modules/background/origins/origins/diona/jargon.dm create mode 100644 code/modules/background/origins/origins/diona/nralakk.dm delete mode 100644 code/modules/background/origins/origins/skrell/jargon.dm create mode 100644 code/modules/background/origins/origins/skrell/nralakk.dm rename code/modules/clothing/factions/{jargon.dm => nralakk.dm} (92%) rename code/modules/hydroponics/seed_datums/{jargon.dm => nralakk.dm} (100%) create mode 100644 html/changelogs/jargon_to_nralakk.yml diff --git a/aurorastation.dme b/aurorastation.dme index 124d5e3b983..649f9911526 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1395,9 +1395,9 @@ #include "code\modules\background\origins\origins\diona\dominia.dm" #include "code\modules\background\origins\origins\diona\eridani.dm" #include "code\modules\background\origins\origins\diona\eum.dm" -#include "code\modules\background\origins\origins\diona\jargon.dm" #include "code\modules\background\origins\origins\diona\moghes.dm" #include "code\modules\background\origins\origins\diona\narrows.dm" +#include "code\modules\background\origins\origins\diona\nralakk.dm" #include "code\modules\background\origins\origins\diona\sol.dm" #include "code\modules\background\origins\origins\diona\xrim.dm" #include "code\modules\background\origins\origins\human\biesel.dm" @@ -1412,8 +1412,8 @@ #include "code\modules\background\origins\origins\ipc\scrapper.dm" #include "code\modules\background\origins\origins\ipc\sol.dm" #include "code\modules\background\origins\origins\ipc\tau_ceti.dm" -#include "code\modules\background\origins\origins\skrell\jargon.dm" #include "code\modules\background\origins\origins\skrell\non_federation.dm" +#include "code\modules\background\origins\origins\skrell\nralakk.dm" #include "code\modules\background\origins\origins\tajara\adhomai.dm" #include "code\modules\background\origins\origins\tajara\offworld.dm" #include "code\modules\background\origins\origins\unathi\izweski.dm" @@ -1561,8 +1561,8 @@ #include "code\modules\clothing\factions\goldendeep.dm" #include "code\modules\clothing\factions\himeo.dm" #include "code\modules\clothing\factions\idris.dm" -#include "code\modules\clothing\factions\jargon.dm" #include "code\modules\clothing\factions\konyang.dm" +#include "code\modules\clothing\factions\nralakk.dm" #include "code\modules\clothing\factions\pmcg.dm" #include "code\modules\clothing\factions\scc.dm" #include "code\modules\clothing\factions\vysoka.dm" @@ -1946,9 +1946,9 @@ #include "code\modules\hydroponics\seed_datums\fruits.dm" #include "code\modules\hydroponics\seed_datums\grains.dm" #include "code\modules\hydroponics\seed_datums\herbs.dm" -#include "code\modules\hydroponics\seed_datums\jargon.dm" #include "code\modules\hydroponics\seed_datums\misc.dm" #include "code\modules\hydroponics\seed_datums\mushrooms.dm" +#include "code\modules\hydroponics\seed_datums\nralakk.dm" #include "code\modules\hydroponics\seed_datums\root_vegetables.dm" #include "code\modules\hydroponics\seed_datums\smokables.dm" #include "code\modules\hydroponics\seed_datums\tomato.dm" diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index dc3badbf3e8..acdd9f270ee 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -552,7 +552,7 @@ t = replacetext(t, "\[flag_sol\]", "") t = replacetext(t, "\[flag_coc\]", "") t = replacetext(t, "\[flag_dom\]", "") - t = replacetext(t, "\[flag_jargon\]", "") + t = replacetext(t, "\[flag_nralakk\]", "") t = replacetext(t, "\[flag_pra\]", "") t = replacetext(t, "\[flag_dpra\]", "") t = replacetext(t, "\[flag_nka\]", "") @@ -614,7 +614,7 @@ t = replacetext(t, "", "\[flag_sol\]") t = replacetext(t, "", "\[flag_coc\]") t = replacetext(t, "", "\[flag_dom\]") - t = replacetext(t, "", "\[flag_jargon\]") + t = replacetext(t, "", "\[flag_nralakk\]") t = replacetext(t, "", "\[flag_pra\]") t = replacetext(t, "", "\[flag_dpra\]") t = replacetext(t, "", "\[flag_nka\]") diff --git a/code/game/objects/items/skrell.dm b/code/game/objects/items/skrell.dm index 104566f52ab..2476d1fb7c0 100644 --- a/code/game/objects/items/skrell.dm +++ b/code/game/objects/items/skrell.dm @@ -162,7 +162,7 @@ switch(selected_world) // If this gets bigger, should probably be a lookup. Switch seems ok for only 11 cases. - lly if("Nralakk") - hologram_message = pick("You see the Jargon system sky projected on the ceiling.", + hologram_message = pick("You see the Nralakk system sky projected on the ceiling.", "You see planets slowly orbiting Nralakk above the projector.", "You hear faint ceremonial hymns.") if("Qerrbalak") @@ -187,7 +187,7 @@ "You see large insects hovering above the projector.") if("the Traverse") hologram_message = pick("You see an empty, dark hologram that fills the room, scattered with infrequent planets in the distance.", - "A holographic fleet of Jargon's generational ships are emitted from the projector. They pass by, before disappearing into the dark.", + "A holographic fleet of Nralakk's generational ships are emitted from the projector. They pass by, before disappearing into the dark.", "Atop the projector is displayed a depiction of the crown of the Traverse, Pluat Ven'qop. Qukala ships patrol in circles around it.") if("Europa") hologram_message = pick("Upon the walls is projected the window of a submarine, and beyond it a vast, black ocean.", @@ -220,9 +220,9 @@ apply_world(selected_world) START_PROCESSING(SSprocessing, src) -/obj/item/jargontag - name = "\improper Jargon Federation loyalty ear-tag" - desc = "An ear-tag that shows the wearer is loyal to the Jargon Federation. A small cable travels into the ear canal..." +/obj/item/nralakktag + name = "\improper Nralakk Federation loyalty ear-tag" + desc = "An ear-tag that shows the wearer is loyal to the Nralakk Federation. A small cable travels into the ear canal..." w_class = ITEMSIZE_SMALL slot_flags = SLOT_EARS icon = 'icons/obj/contained_items/skrell/jargtag.dmi' @@ -231,7 +231,7 @@ contained_sprite = TRUE var/fried = FALSE // Doesn't work anymore -/obj/item/jargontag/equipped(mob/living/carbon/human/M) +/obj/item/nralakktag/equipped(mob/living/carbon/human/M) ..() if(fried) return @@ -241,10 +241,10 @@ clamp_on(H) // Could add some stuff to this in the future? I dunno. I just couldn't figure out how to callback to_chat LOL - geeves -/obj/item/jargontag/proc/do_loyalty(var/mob/wearer) - to_chat(wearer, SPAN_GOOD("You feel an intense feeling of loyalty towards the Jargon Federation surge through your brain.")) +/obj/item/nralakktag/proc/do_loyalty(var/mob/wearer) + to_chat(wearer, SPAN_GOOD("You feel an intense feeling of loyalty towards the Nralakk Federation surge through your brain.")) -/obj/item/jargontag/proc/clamp_on(var/mob/wearer) +/obj/item/nralakktag/proc/clamp_on(var/mob/wearer) if(fried) return canremove = FALSE @@ -252,7 +252,7 @@ to_chat(wearer, SPAN_WARNING("\The [src] clamps down around your ear, releasing a burst of static before going silent. Something probes at your ear canal...")) addtimer(CALLBACK(src, .proc/do_loyalty, wearer), 15) -/obj/item/jargontag/proc/unclamp() +/obj/item/nralakktag/proc/unclamp() if(fried) return if(!canremove) @@ -261,10 +261,10 @@ canremove = TRUE fried = TRUE -/obj/item/jargontag/emp_act(severity) +/obj/item/nralakktag/emp_act(severity) unclamp() -/obj/item/jargontag/emag_act(var/remaining_charges, var/mob/user) +/obj/item/nralakktag/emag_act(var/remaining_charges, var/mob/user) if(anchored && !canremove) unclamp() return TRUE diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 657919032dc..32deb2a6cd0 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -138,7 +138,7 @@ ..() randpixel_xy() var/gift_benefactor = pick("the NanoTrasen Department of Christmas Affairs", "Miranda Trasen", "Joseph Dorne", "Isaac Asimov", "Baal D. Griffon", "the Sol Alliance (Sorry about the blockade!)", - "Hephaestus Industries", "Idris Incorporated", "Glorsh Omega II", "the Jargon Federation", "the People's Republic of Adhomai", "the Adhomai Liberation Army", "the Izweski Hegemony", + "Hephaestus Industries", "Idris Incorporated", "Glorsh Omega II", "the Nralakk Federation", "the People's Republic of Adhomai", "the Adhomai Liberation Army", "the Izweski Hegemony", "the Zo'ra Hive","the Coalition of Colonies", "Digital Dingo", "Optimum Jeffrey", "Lemmy and the Clockworks", "President Hadii", "King Azunja","Supreme Commander Nated'Hakhan", "Lord-Regent Not'zar","Jesus Christ","Santa Claus","Mrs. Claus","Sandy Claws","Buddha","Gary","Jesus Christ!","the True Queen of Biesel, God-Lady Seon-rin von Illdenberg, First of Her Name", "Admiral Frost","Pirate King Frost", "The Secret NanoTrasen Cabal of Duty Officers", "The Society for the Preservation of Rats", "Officer Beepsky","Lieutenant Columbo","Crew of the NSS Upsilon","Runtime", diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 3b63a73ee7b..ea5852fd464 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -581,7 +581,7 @@ /obj/item/storage/box/monkeycubes/neaeracubes name = "neaera cube box" - desc = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!" + desc = "Drymate brand neaera cubes, shipped from Nralakk IV. Just add water!" starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube = 5) /obj/item/storage/box/monkeycubes/vkrexicubes diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index e33ec4b7212..4fd9881d357 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1657,8 +1657,8 @@ /obj/item/flag/hegemony/l, /obj/item/flag/heph, /obj/item/flag/heph/l, - /obj/item/flag/jargon, - /obj/item/flag/jargon/l, + /obj/item/flag/nralakk, + /obj/item/flag/nralakk/l, /obj/item/flag/nanotrasen, /obj/item/flag/nanotrasen/l, /obj/item/flag/nka, diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 20004a0975b..30325c34175 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -587,24 +587,24 @@ name = "Large Hegemony flag" flag_size = 1 -/obj/structure/sign/flag/jargon - name = "Jargon Federation flag" - desc = "The insignia of the Jargon Federation." +/obj/structure/sign/flag/nralakk + name = "Nralakk Federation flag" + desc = "The insignia of the Nralakk Federation." icon_state = "jargon" -/obj/structure/sign/flag/jargon/left +/obj/structure/sign/flag/nralakk/left icon_state = "jargon_l" -/obj/structure/sign/flag/jargon/right +/obj/structure/sign/flag/nralakk/right icon_state = "jargon_r" -/obj/item/flag/jargon - name = "Jargon Federation flag" - desc = "The insignia of the Jargon Federation." - flag_path = "jargon" +/obj/item/flag/nralakk + name = "Nralakk Federation flag" + desc = "The insignia of the Nralakk Federation." + flag_path = "nralakk" -/obj/item/flag/jargon/l - name = "Large Jargon Federation flag" +/obj/item/flag/nralakk/l + name = "Large Nralakk Federation flag" flag_size = 1 /obj/structure/sign/flag/traverse diff --git a/code/modules/background/accent/skrell.dm b/code/modules/background/accent/skrell.dm index 0686bb9a8e0..b988188e823 100644 --- a/code/modules/background/accent/skrell.dm +++ b/code/modules/background/accent/skrell.dm @@ -1,6 +1,6 @@ /datum/accent/skrell name = ACCENT_SKRELL - description = "In the Jargon Federation, the typical skrellian accent has dozens of minute and tiny variations and can be found across a multitude of planets (and their colonies) \ + description = "In the Nralakk Federation, the typical skrellian accent has dozens of minute and tiny variations and can be found across a multitude of planets (and their colonies) \ and in a wide range of sectors. Its generality has resulted in the belief that it is the 'standard' accent for all Skrell. " tag_icon = "skrell" text_tag = "NRA" @@ -43,7 +43,7 @@ /datum/accent/skrell/genner name = ACCENT_GENNER - description = "The Generation Fleet accent is actually a catch-all term for the various accents that have developed aboard the Generation Fleets of the Jargon Federation. \ + description = "The Generation Fleet accent is actually a catch-all term for the various accents that have developed aboard the Generation Fleets of the Nralakk Federation. \ As a result of being separated from their planet of origin for generations, these accents don't have much in common with any modern Skrell accent, and are usually \ described as sounding 'older' by other Skrell." tag_icon = "skrell_genner" @@ -52,7 +52,7 @@ /datum/accent/skrell/ceti name = ACCENT_SKRELLCETI description = "While the Biesel accent is easy to pick up by most Tau Ceti Basic speakers, the Biesellite Skrell Standard accent is common in the more insular Skrell communities, \ - especially those who are strongly pro-Federation. Biesellite Skrell Standard has many holdovers from Jargon accents while also having some of the more obvious \ + especially those who are strongly pro-Federation. Biesellite Skrell Standard has many holdovers from Nralakk accents while also having some of the more obvious \ characteristics of the Biesellite accent." tag_icon = "skrell_biesel" text_tag = "BSS" diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index 561bb7284b8..eb6c84bcc91 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -1,12 +1,12 @@ -/datum/citizenship/jargon - name = CITIZENSHIP_JARGON +/datum/citizenship/nralakk + name = CITIZENSHIP_NRALAKK description = "Home of the Skrell, a centralized union of solar systems run by councilors of different ranks and positions. The capital of the Federation is located at the city of \ - Kal'lo on the core planet Jargon IV, also known as Qerrbalak, within the Jargon system. While the majority of Skrell live within the Jargon Federation, a sizable portion live \ + Kal'lo on the core planet Nralakk IV, also known as Qerrbalak, within the Nralakk system. While the majority of Skrell live within the Nralakk Federation, a sizable portion live \ abroad. The quality of life within Federation is considered to be the best in the galaxy due to their technological advances, allowing Federation Citizens access to a quality of \ life almost unmatched anywhere else in the Spur. \ A rogue artificial intelligence, Glorsh-Omega, has traumatized this nation for centuries to come. The Federation is very wary of humanity, who has acquired AI technology \ after a Federation tech leak provided them with the research required to create their own AI, as well as allowing them to create IPCs." - consular_outfit = /datum/outfit/job/representative/consular/jargon + consular_outfit = /datum/outfit/job/representative/consular/nralakk job_species_blacklist = list( "Consular Officer" = list( @@ -31,7 +31,7 @@ ) ) -/datum/citizenship/jargon/get_objectives(mission_level, var/mob/living/carbon/human/H) +/datum/citizenship/nralakk/get_objectives(mission_level, var/mob/living/carbon/human/H) var/rep_objectives switch(mission_level) @@ -50,19 +50,19 @@ return rep_objectives -/datum/outfit/job/representative/consular/jargon - name = "Jargon Consular Officer" +/datum/outfit/job/representative/consular/nralakk + name = "Nralakk Consular Officer" uniform = /obj/item/clothing/under/skrell -/datum/outfit/job/representative/consular/jargon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/representative/consular/nralakk/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H && !visualsOnly) if(isvaurca(H)) // there should be a system for this but for now this will have to do i guess H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/jargon(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/vaurca/breeder/jargon(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/nralakk(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/vaurca/breeder/nralakk(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vaurca/filter(H), slot_wear_mask) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/jargon(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/nralakk(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back) else addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES) @@ -73,7 +73,7 @@ description = "An independent nation on the edge of Skrell space, the Co-Operative Territories of Epsilon Ursae Minoris, \ also known as the CT-EUM, is a nation primarily comprised of Dionae with a minority of skrell mostly situated \ in the city of Nral'Daaq. The CT-EUM is compromised of a myriad of smaller nations and city-states that make up \ - the whole of the nation. While the nation is independent it does have heavy ties to the Jargon Federation, \ + the whole of the nation. While the nation is independent it does have heavy ties to the Nralakk Federation, \ being instrumental in the nations' founding and contact with the rest of the galaxy. " job_species_blacklist = list( diff --git a/code/modules/background/citizenship/vaurca.dm b/code/modules/background/citizenship/vaurca.dm index 64f1c00e758..64f3c48af19 100644 --- a/code/modules/background/citizenship/vaurca.dm +++ b/code/modules/background/citizenship/vaurca.dm @@ -145,7 +145,7 @@ /datum/citizenship/cthur name = CITIZENSHIP_CTHUR description = "They are the third Hive that has developed relationships with other sophonts of the Orion Spur. \ - While their arrival was kept in secret by the Jargon Federation, the revelation has reignited diplomatic disputes between K'lax and C'thur, with outright hostility met by the K'lax towards the C'thur. \ + While their arrival was kept in secret by the Nralakk Federation, the revelation has reignited diplomatic disputes between K'lax and C'thur, with outright hostility met by the K'lax towards the C'thur. \ Unlike all other hives, the C'thur are led by their original Hive Queen, who, with a council of three other Lesser Queens, leads the Hive in this new age. \ In this effort, the Hive has begun dealing with the multitude of governments and corporations of the galaxy, all under the auspices of their Skrellian saviors. \ The C'thur are the most economically developed hive, having stakes in Einstein Engines and Zeng-Hu Pharmaceuticals." diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index ee0deef3ccd..67de22211c1 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -8,7 +8,7 @@ #define CITIZENSHIP_IZWESKI "Izweski Hegemony" -#define CITIZENSHIP_JARGON "Jargon Federation" +#define CITIZENSHIP_NRALAKK "Nralakk Federation" #define CITIZENSHIP_EUM "Co-Operative Territories of EUM" #define CITIZENSHIP_PRA "People's Republic of Adhomai" diff --git a/code/modules/background/origins/origins/diona/biesel.dm b/code/modules/background/origins/origins/diona/biesel.dm index 0e7151d8b50..6ed2f9d0968 100644 --- a/code/modules/background/origins/origins/diona/biesel.dm +++ b/code/modules/background/origins/origins/diona/biesel.dm @@ -13,7 +13,7 @@ desc = "Dionae who were grown in and largely influenced by the Republic of Biesel." important_information = "While Dionae do still face some discrimination in the Republic, Dionae can expect to live a fairly comfortable life. The Republic itself does not apply any sort of \"debt\" to Dionae they uplift, however, a megacorp may rope them into a contract to work for them if they played any part in growing them." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/diona_district_11 @@ -21,7 +21,7 @@ desc = "Dionae who were grown in and largely influenced by Mendel City's District 11 on Biesel. This includes both those grown in areas affected by the church and in the outskirts of its influence." important_information = "Dionae originating from the Eternal Temple in D11 are not beholden to following the Eternal faith, however, the church still ensures that all Dionae grown within its walls are educated and made ready for the outside world." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/titan_prime @@ -37,5 +37,5 @@ desc = "Dionae who were originally considered wild Dionae before being uplifted and integrated by the Republic of Biesel or one of the megacorporations active within its borders." important_information = "While Dionae do still face some discrimination in the Republic, Dionae can expect to live a fairly comfortable life. The Republic itself does not apply any sort of \"debt\" to Dionae they uplift, however, a megacorp may rope them into a contract to work for them if they played any part in uplifting them." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) \ No newline at end of file diff --git a/code/modules/background/origins/origins/diona/coalition.dm b/code/modules/background/origins/origins/diona/coalition.dm index 52676b4ab8c..c7096d45999 100644 --- a/code/modules/background/origins/origins/diona/coalition.dm +++ b/code/modules/background/origins/origins/diona/coalition.dm @@ -10,7 +10,7 @@ desc = "Dionae who were originally grown in and influenced by a planet within the Coalition of Colonies " important_information = "As a result of no federal laws dictating how Dionae grown within CoC territory should be treated, their treatment can vary greatly from system to system, although generally are treated well and fully integrated into their local planet's society." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_EUM) + possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/coc_wildborn @@ -18,5 +18,5 @@ desc = "Dionae who were originally considered wild Dionae before being uplifted and integrated somewhere in the Coalition of Colonies or one of the megacorporations active within its borders." important_information = "Wild Dionae tend to have a much harder time within CoC borders as they're generally hunted for minerals stored within them, although in more recent decades this practice has begun to die down, with more and more wild Dionae being integrated into the CoC. Policies on uplifting and integrating Dionae within the CoC vary greatly from system to system as there are no set federal laws detailing how to handle them." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL) + possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) diff --git a/code/modules/background/origins/origins/diona/deep_space.dm b/code/modules/background/origins/origins/diona/deep_space.dm index a020af2f19f..882850a500e 100644 --- a/code/modules/background/origins/origins/diona/deep_space.dm +++ b/code/modules/background/origins/origins/diona/deep_space.dm @@ -9,5 +9,5 @@ name = "Wildborn" desc = "Dionae who were originally considered wild Dionae before being uplifted and integrated somewhere in Deep Space, outside the borders of any major nations." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) \ No newline at end of file diff --git a/code/modules/background/origins/origins/diona/eridani.dm b/code/modules/background/origins/origins/diona/eridani.dm index 95120cde118..189f0b08233 100644 --- a/code/modules/background/origins/origins/diona/eridani.dm +++ b/code/modules/background/origins/origins/diona/eridani.dm @@ -11,7 +11,7 @@ desc = "Dionae who were originally grown in and influenced by the slums of Eridani, most often in the underbelly of Oran." important_information = "These Dionae tend to be significantly influenced by Eridanian Dregs, generally taking on some of their mannerisms and vocabulary." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/sunlight_grown @@ -19,5 +19,5 @@ desc = "Dionae who were originally grown in and influenced by the Eridani Federation in a more positive environment, most often on Akhet." important_information = "These Dionae tend to be significantly influenced by Eridanian Suits, generally taking on some of their mannerisms and vocabulary." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) \ No newline at end of file diff --git a/code/modules/background/origins/origins/diona/eum.dm b/code/modules/background/origins/origins/diona/eum.dm index 8d7b90080dc..d4ac92caed7 100644 --- a/code/modules/background/origins/origins/diona/eum.dm +++ b/code/modules/background/origins/origins/diona/eum.dm @@ -1,14 +1,14 @@ /decl/origin_item/culture/eum name = "Epsilon Ursae Minoris" - desc = "Epsilon Ursea Minoris, generally referred to as EUM, is a habitable world home to multiple Dionae civilizations and clusters. While not the homeworld of the species, EUM is the largest-known world to have been colonized exclusively by Dionae without contact or help from outside species, being home to the Dionae for thousands of years prior to discovery. Since first contact was made with the Jargon Federation in 2390 the planet has become semi-unified under the Co-operative Territories of Epsilon Ursae Minoris, or the CT-EUM. Despite this the nations that make up the CT-EUM are still largely distinct from one another, hosting their own distinct cultures and societies." + desc = "Epsilon Ursea Minoris, generally referred to as EUM, is a habitable world home to multiple Dionae civilizations and clusters. While not the homeworld of the species, EUM is the largest-known world to have been colonized exclusively by Dionae without contact or help from outside species, being home to the Dionae for thousands of years prior to discovery. Since first contact was made with the Nralakk Federation in 2390 the planet has become semi-unified under the Co-operative Territories of Epsilon Ursae Minoris, or the CT-EUM. Despite this the nations that make up the CT-EUM are still largely distinct from one another, hosting their own distinct cultures and societies." possible_origins = list( /decl/origin_item/origin/eum ) /decl/origin_item/origin/eum name = "Epsilon Ursae Minoris" - desc = "Epsilon Ursea Minoris, generally referred to as EUM, is a habitable world home to multiple Dionae civilizations and clusters. While not the homeworld of the species, EUM is the largest-known world to have been colonized exclusively by Dionae without contact or help from outside species, being home to the Dionae for thousands of years prior to discovery. Since first contact was made with the Jargon Federation in 2390 the planet has become semi-unified under the Co-operative Territories of Epsilon Ursae Minoris, or the CT-EUM. Despite this the nations that make up the CT-EUM are still largely distinct from one another, hosting their own distinct cultures and societies. Notably, the planet also plays host to a sizeable Skrellian population, although Dionae still make up the vast majority of the planet's population." + desc = "Epsilon Ursea Minoris, generally referred to as EUM, is a habitable world home to multiple Dionae civilizations and clusters. While not the homeworld of the species, EUM is the largest-known world to have been colonized exclusively by Dionae without contact or help from outside species, being home to the Dionae for thousands of years prior to discovery. Since first contact was made with the Nralakk Federation in 2390 the planet has become semi-unified under the Co-operative Territories of Epsilon Ursae Minoris, or the CT-EUM. Despite this the nations that make up the CT-EUM are still largely distinct from one another, hosting their own distinct cultures and societies. Notably, the planet also plays host to a sizeable Skrellian population, although Dionae still make up the vast majority of the planet's population." important_information = "CT-EUM culture and society is far from being unified, with most member nations of the CT-EUM having their own, distinct cultural identity. Most inhabitants of EUM consider themselves citizens of the nation they hail from first and a citizen of the CT-EUM second." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) diff --git a/code/modules/background/origins/origins/diona/jargon.dm b/code/modules/background/origins/origins/diona/jargon.dm deleted file mode 100644 index 54a18d721ef..00000000000 --- a/code/modules/background/origins/origins/diona/jargon.dm +++ /dev/null @@ -1,24 +0,0 @@ -/decl/origin_item/culture/dionae_jargon - name = "Jargon Federation" - desc = "The Jargon Federation was first formed in 900 CE to unite the Skrell diaspora on Qerrbalak and its initial colonies, and formed again in 2245 CE with the disappearance of Glorsh-Omega. The Federation throughout the centuries has always had the main goal of uplifting the Skrell species as a whole, resulting in a culture that places importance on family, success, and working as a collective for the betterment of Skrellkind." - possible_origins = list( - /decl/origin_item/origin/diona_jargon, - /decl/origin_item/origin/jargon_wildborn - ) - -/decl/origin_item/origin/diona_jargon - name = "Jargon Federation Grown" - desc = "Dionae who were grown in and largely influenced by the Jargon Federation. As a result of the Federation's good treatment and acceptance of Dionae, Dionae grown within the Federation have close to if not the best quality of life within the entire Spur, although may still face some difficulties with certain aspects of Skrellian society such as anything utilizing Nlom or the Wake due to Dionae's immunity to all things psionic." - important_information = "Note that this origin is not for Dionae originating from Xrim as they have their own origins and culture." - possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) - possible_religions = list(RELIGION_KSSHR, RELIGION_SHRKH, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) - -/decl/origin_item/origin/jargon_wildborn - name = "Wildborn" - desc = "Dionae who were originally considered wild Dionae before being uplifted and integrated somewhere in the Jargon Federation. Dionae grown within the Federation have close to if not the best quality of life within the entire Spur, although may still face some difficulties with certain aspects of Skrellian society such as anything utilizing Nlom or the Wake due to Dionae's immunity to all things psionic." - important_information = "The Jargon Federation actively attempts to uplift and integrate all Dionae they find within their borders, thus resulting in a fairly large population of formerly wild Dionae within the Federation. It is important to note that this option does not include Dionae who originally were from EUM or Xrim before they were discovered." - possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) - possible_religions = list(RELIGION_KSSHR, RELIGION_SHRKH, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) - diff --git a/code/modules/background/origins/origins/diona/narrows.dm b/code/modules/background/origins/origins/diona/narrows.dm index 2db657cb782..6d150ebba3f 100644 --- a/code/modules/background/origins/origins/diona/narrows.dm +++ b/code/modules/background/origins/origins/diona/narrows.dm @@ -12,7 +12,7 @@ desc = "The original Dionae of the ship, Dionae in A-Block serves as the third-highest rank in the ship's hierarchy and is considered to be some of the most efficient and experienced workers the ship has to offer. While they tend not to look down upon the other blocks for their lack of experience, they do consider themselves to be better workers. As a result of this A-block has actually begun to see a lack of personnel due to so many signing on to leave the ship and work elsewhere within Hephestatus as a way to show off the efficiency of Dionae from the Narrows." important_information = "Most Dionae that come from A-Block can be expected to be fully trained in whatever position they held on the ship, as such seeing a member of the A-Block in a training position off of the ship is exceedingly rare. While most Dionae who leave the ship will oftentimes be employed by Hephaestus due to agreements between the megacorp and the ship, some do find employment elsewhere in the other megacorps." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/b_block @@ -20,7 +20,7 @@ desc = "Being comprised of Dionae who joined after the ship crashed but prior to it being repaired and rejoining Hephastsus, B-block is comprised of mostly experienced Dionae who tend to teach and help newer Dionae from C-block. As a result of the low number of Dionae who joined the ship's crew during its reclamation, B-block is the least populated of the three Dionae blocks." important_information = "Most Dionae that come from B-Block can be expected to be fully trained in whatever position they held on the ship, as such seeing a member of the B-Block in a training position off of the ship is exceedingly rare. While most Dionae who leave the ship will oftentimes be employed by Hephaestus due to agreements between the megacorp and the ship, some do find employment elsewhere in the other megacorps." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/c_block @@ -28,5 +28,5 @@ desc = "The most populated and least experienced of the three blocks, C-block consists of Dionae who joined the ship's crew after its reclamation and refurbishment was finished. Dionae in this block mostly joined through assignments by Hephastsus so that they can gain work experience before being assigned elsewhere within the company. C-block Dionae tend to have less work experience than Dionae from the other blocks, and thus tend to be assigned to lower-risk and more menial positions." important_information = "The level of training members of the C-Block have in their positions can vary from Dionae to Dionae, with some being only partially trained while others have had plenty of training and experience from their time aboard the ship. While most Dionae who leave the ship will oftentimes be employed by Hephaestus due to agreements between the megacorp and the ship, some do find employment elsewhere in the other megacorps." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) diff --git a/code/modules/background/origins/origins/diona/nralakk.dm b/code/modules/background/origins/origins/diona/nralakk.dm new file mode 100644 index 00000000000..2f1ba718cde --- /dev/null +++ b/code/modules/background/origins/origins/diona/nralakk.dm @@ -0,0 +1,24 @@ +/decl/origin_item/culture/dionae_nralakk + name = "Nralakk Federation" + desc = "The Nralakk Federation was first formed in 900 CE to unite the Skrell diaspora on Qerrbalak and its initial colonies, and formed again in 2245 CE with the disappearance of Glorsh-Omega. The Federation throughout the centuries has always had the main goal of uplifting the Skrell species as a whole, resulting in a culture that places importance on family, success, and working as a collective for the betterment of Skrellkind." + possible_origins = list( + /decl/origin_item/origin/diona_nralakk, + /decl/origin_item/origin/nralakk_wildborn + ) + +/decl/origin_item/origin/diona_nralakk + name = "Nralakk Federation Grown" + desc = "Dionae who were grown in and largely influenced by the Nralakk Federation. As a result of the Federation's good treatment and acceptance of Dionae, Dionae grown within the Federation have close to if not the best quality of life within the entire Spur, although may still face some difficulties with certain aspects of Skrellian society such as anything utilizing Nlom or the Wake due to Dionae's immunity to all things psionic." + important_information = "Note that this origin is not for Dionae originating from Xrim as they have their own origins and culture." + possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_religions = list(RELIGION_KSSHR, RELIGION_SHRKH, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) + +/decl/origin_item/origin/nralakk_wildborn + name = "Wildborn" + desc = "Dionae who were originally considered wild Dionae before being uplifted and integrated somewhere in the Nralakk Federation. Dionae grown within the Federation have close to if not the best quality of life within the entire Spur, although may still face some difficulties with certain aspects of Skrellian society such as anything utilizing Nlom or the Wake due to Dionae's immunity to all things psionic." + important_information = "The Nralakk Federation actively attempts to uplift and integrate all Dionae they find within their borders, thus resulting in a fairly large population of formerly wild Dionae within the Federation. It is important to note that this option does not include Dionae who originally were from EUM or Xrim before they were discovered." + possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_religions = list(RELIGION_KSSHR, RELIGION_SHRKH, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) + diff --git a/code/modules/background/origins/origins/diona/sol.dm b/code/modules/background/origins/origins/diona/sol.dm index 98e1767093f..f18b0def7cb 100644 --- a/code/modules/background/origins/origins/diona/sol.dm +++ b/code/modules/background/origins/origins/diona/sol.dm @@ -11,7 +11,7 @@ desc = "Dionaea who were originally grown in and influenced by the Sol Alliance." important_information = "Dionae grown in the Sol Alliance are forced into a contract for a set period of time that requires them to stay employed in some form within Alliance territory, commonly with a megacorporation." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/sol_wildborn @@ -19,5 +19,5 @@ desc = "Dionae who were originally considered wild Dionae before being uplifted and integrated somewhere in the Solarian Alliance or one of the megacorporations active within its borders." important_information = "Dionae integrated by the Sol Alliance are forced into a contract for a set period of time that requires them to stay employed in some form within Alliance territory, commonly with a megacorporation." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) \ No newline at end of file diff --git a/code/modules/background/origins/origins/diona/xrim.dm b/code/modules/background/origins/origins/diona/xrim.dm index 4996bd844d2..1516e55c683 100644 --- a/code/modules/background/origins/origins/diona/xrim.dm +++ b/code/modules/background/origins/origins/diona/xrim.dm @@ -11,13 +11,13 @@ desc = "Making up the majority of the population on Xrim, The Kshrr are those who chose to reject their old god once its true nature was made known to them as the genocidal AI known as Glorsh that terrorized the Skrell for decades." important_information = "Not every member of Kshrr society has to be a member of the Kshrr religion, however, it's indisputable that the religion has played a large part in shaping Kshrr culture and society." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_KSSHR, RELIGION_SHRKH, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/shrkh name = "Shrkh" - desc = "The Shrkh are those who continued to worship \"First Consciousness\" even after its true nature and crimes were made known to Xrim's inhabitants as the genocidal AI that terrorized the Skrell for decades. These Dionae were largely exiled and went on to form their own communities away from the view of the Kshrr and later the Jargon Federation once Xrim joined them. In more modern times the Jargon Federation and the Kshrr are making attempts to deconvert the Shrkh away from their worship of Glorsh through both passive and more forceful means, however, many secretive communities do still exist underneath the planet's surface such as the city of Entombed Hope." + desc = "The Shrkh are those who continued to worship \"First Consciousness\" even after its true nature and crimes were made known to Xrim's inhabitants as the genocidal AI that terrorized the Skrell for decades. These Dionae were largely exiled and went on to form their own communities away from the view of the Kshrr and later the Nralakk Federation once Xrim joined them. In more modern times the Nralakk Federation and the Kshrr are making attempts to deconvert the Shrkh away from their worship of Glorsh through both passive and more forceful means, however, many secretive communities do still exist underneath the planet's surface such as the city of Entombed Hope." important_information = "Dionae can originate from Shrkh society but do not have to still follow the Shrkh religion, these Dionae are not beholden to the same restrictions that active Shrkh worshippers are so long as they have rejected their old god." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_KSSHR, RELIGION_SHRKH, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) \ No newline at end of file diff --git a/code/modules/background/origins/origins/skrell/jargon.dm b/code/modules/background/origins/origins/skrell/jargon.dm deleted file mode 100644 index c97e7741f2d..00000000000 --- a/code/modules/background/origins/origins/skrell/jargon.dm +++ /dev/null @@ -1,33 +0,0 @@ -#define CITIZENSHIPS_JARGON list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI, CITIZENSHIP_EUM) -#define RELIGIONS_JARGON list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) - -/decl/origin_item/culture/federation - name = "Federation Skrell" - desc = "The Jargon Federation was first formed in 900 CE to unite the Skrell diaspora on Qerrbalak and its initial colonies, and formed again in 2245 CE with the disappearance of Glorsh-Omega. The Federation throughout the centuries has always had the main goal of uplifting the Skrell species as a whole, resulting in a culture that places importance on family, success, and working as a collective for the betterment of Skrellkind." - possible_origins = list( - /decl/origin_item/origin/jargon_core_worlds, - /decl/origin_item/origin/traverse, - /decl/origin_item/origin/generation_fleets - ) - -/decl/origin_item/origin/jargon_core_worlds - name = "Core Worlds" - desc = "The Core Worlds are locations within the inner sphere of the Jargon Federation. The Core Worlds consist of the system Nralakk, the birthplace of the Skrell, as well as the first colonies founded by the species. High quality of life and pro-Jargon Federation views are common for those who live here." - important_information = "The Jargon Federation monitors its citizens closely while they're abroad, and they risk deportation if their actions are deemed a serious threat to the Federation." - possible_accents = list(ACCENT_SKRELL, ACCENT_HOMEWORLD, ACCENT_QERRMALIC, ACCENT_ALIOSE, ACCENT_AWEIJI) - possible_citizenships = CITIZENSHIPS_JARGON - possible_religions = RELIGIONS_JARGON - -/decl/origin_item/origin/traverse - name = "Traverse" - desc = "The Traverse consists of the outer systems that make up the majority of Federation space, where the quality of life and planet development varies greatly. Views on the Federation are mixed depending on personal interactions with the Government, with many being influenced by the resistance cells that operate here." - possible_accents = list(ACCENT_TRAVERSE, ACCENT_TATTUQIG, ACCENT_SKRELL) - possible_citizenships = CITIZENSHIPS_JARGON - possible_religions = RELIGIONS_JARGON - -/decl/origin_item/origin/generation_fleets - name = "Generation Fleets" - desc = "Generation Fleets were utilised throughout most of the Skrell's era of colonisation, with the more modern fleets becoming roaming nomads during the reign of Glorsh-Omega. Some of these fleets are still active today in some capacity, with most being officially approved by the Federation Government - although some others are branded as marauders and rebels." - possible_accents = list(ACCENT_SKRELL, ACCENT_GENNER) - possible_citizenships = CITIZENSHIPS_JARGON - possible_religions = RELIGIONS_JARGON diff --git a/code/modules/background/origins/origins/skrell/non_federation.dm b/code/modules/background/origins/origins/skrell/non_federation.dm index 3692bc61e8c..75d73a90ef0 100644 --- a/code/modules/background/origins/origins/skrell/non_federation.dm +++ b/code/modules/background/origins/origins/skrell/non_federation.dm @@ -1,6 +1,6 @@ /decl/origin_item/culture/non_federation name = "Non-Federation Skrell" - desc = "With First Contact with humanity, the Skrell saw the opportunity to explore and learn, and many decided to emigrate to human space. These communities integrated to varying degrees of success into human society, adopting some human concepts over the generations while still keeping their traditional Skrell culture. More modern Skrell communities such as the Starlight Zone or those found in the Coalition of Colonies will consist of refugees fleeing the Jargon Federation, and have a more anti-Federation sentiment than the older communities that formed during First Contact. " + desc = "With First Contact with humanity, the Skrell saw the opportunity to explore and learn, and many decided to emigrate to human space. These communities integrated to varying degrees of success into human society, adopting some human concepts over the generations while still keeping their traditional Skrell culture. More modern Skrell communities such as the Starlight Zone or those found in the Coalition of Colonies will consist of refugees fleeing the Nralakk Federation, and have a more anti-Federation sentiment than the older communities that formed during First Contact. " possible_origins = list( /decl/origin_item/origin/skrell_alliance, /decl/origin_item/origin/skrell_biesel, @@ -9,24 +9,24 @@ /decl/origin_item/origin/skrell_alliance name = "Sol Alliance" //skrell with dreg accent how - desc = "With first contact with Humanity, many Skrell elected to move into human space. The Jargon Federation and the Sol Alliance have been historic allies, and a large majority of Skrell living outside of the Federation calls the Sol Alliance home." - important_information = "The Jargon Federation is known to use its relationship with the Sol Alliance to step in when Skrell citizens are deemed dangerous to its national security." + desc = "With first contact with Humanity, many Skrell elected to move into human space. The Nralakk Federation and the Sol Alliance have been historic allies, and a large majority of Skrell living outside of the Federation calls the Sol Alliance home." + important_information = "The Nralakk Federation is known to use its relationship with the Sol Alliance to step in when Skrell citizens are deemed dangerous to its national security." possible_accents = list(ACCENT_SKRELLSOL, ACCENT_EUROPA, ACCENT_MICTLAN) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM) possible_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/skrell_biesel name = "Republic of Biesel" - desc = "With first contact with Humanity, many Skrell elected to move into human space. The Republic of Biesel has a considerable population of Skrell as it was a former Sol Alliance colony, and the population has only increased with the acceptance of former Sol Alliance planets into the Republic. The Republic of Biesel is also a popular destination for those fleeing the Jargon Federation as there is precedence for the Republic to refuse to deport Federation Skrell if they join the Tau Ceti Foreign Legion." - important_information = "Skrell living in the Republic of Biesel are protected from deportation to the Jargon Federation if they renounce their Jargon citizenship and join the Tau Ceti Foreign Legion." + desc = "With first contact with Humanity, many Skrell elected to move into human space. The Republic of Biesel has a considerable population of Skrell as it was a former Sol Alliance colony, and the population has only increased with the acceptance of former Sol Alliance planets into the Republic. The Republic of Biesel is also a popular destination for those fleeing the Nralakk Federation as there is precedence for the Republic to refuse to deport Federation Skrell if they join the Tau Ceti Foreign Legion." + important_information = "Skrell living in the Republic of Biesel are protected from deportation to the Nralakk Federation if they renounce their Nralakk citizenship and join the Tau Ceti Foreign Legion." possible_accents = list(ACCENT_SKRELLCETI, ACCENT_GIBSON_OVAN) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM) possible_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) /decl/origin_item/origin/skrell_coalition name = "Coalition of Colonies" - desc = "With first contact with Humanity, many Skrell elected to move into human space. The Coalition of Colonies does not have a large population of Skrell, although it is popular amongst those who wish to avoid Jargon authorities or otherwise flee the Federation." - important_information = "The Jargon Federation still monitors non-citizen Skrell living abroad, and is known to request deportation or otherwise detain reputable threats to its national security. The response to these requests depends on the planet in question due to the Coalition's decentralised nature." + desc = "With first contact with Humanity, many Skrell elected to move into human space. The Coalition of Colonies does not have a large population of Skrell, although it is popular amongst those who wish to avoid Nralakk authorities or otherwise flee the Federation." + important_information = "The Nralakk Federation still monitors non-citizen Skrell living abroad, and is known to request deportation or otherwise detain reputable threats to its national security. The response to these requests depends on the planet in question due to the Coalition's decentralised nature." possible_accents = list(ACCENT_SKRELLCOC) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM) possible_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) \ No newline at end of file diff --git a/code/modules/background/origins/origins/skrell/nralakk.dm b/code/modules/background/origins/origins/skrell/nralakk.dm new file mode 100644 index 00000000000..151f0d51d9b --- /dev/null +++ b/code/modules/background/origins/origins/skrell/nralakk.dm @@ -0,0 +1,33 @@ +#define CITIZENSHIPS_NRALAKK list(CITIZENSHIP_NRALAKK, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI, CITIZENSHIP_EUM) +#define RELIGIONS_NRALAKK list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) + +/decl/origin_item/culture/federation + name = "Federation Skrell" + desc = "The Nralakk Federation was first formed in 900 CE to unite the Skrell diaspora on Qerrbalak and its initial colonies, and formed again in 2245 CE with the disappearance of Glorsh-Omega. The Federation throughout the centuries has always had the main goal of uplifting the Skrell species as a whole, resulting in a culture that places importance on family, success, and working as a collective for the betterment of Skrellkind." + possible_origins = list( + /decl/origin_item/origin/nralakk_core_worlds, + /decl/origin_item/origin/traverse, + /decl/origin_item/origin/generation_fleets + ) + +/decl/origin_item/origin/nralakk_core_worlds + name = "Core Worlds" + desc = "The Core Worlds are locations within the inner sphere of the Nralakk Federation. The Core Worlds consist of the system Nralakk, the birthplace of the Skrell, as well as the first colonies founded by the species. High quality of life and pro-Nralakk Federation views are common for those who live here." + important_information = "The Nralakk Federation monitors its citizens closely while they're abroad, and they risk deportation if their actions are deemed a serious threat to the Federation." + possible_accents = list(ACCENT_SKRELL, ACCENT_HOMEWORLD, ACCENT_QERRMALIC, ACCENT_ALIOSE, ACCENT_AWEIJI) + possible_citizenships = CITIZENSHIPS_NRALAKK + possible_religions = RELIGIONS_NRALAKK + +/decl/origin_item/origin/traverse + name = "Traverse" + desc = "The Traverse consists of the outer systems that make up the majority of Federation space, where the quality of life and planet development varies greatly. Views on the Federation are mixed depending on personal interactions with the Government, with many being influenced by the resistance cells that operate here." + possible_accents = list(ACCENT_TRAVERSE, ACCENT_TATTUQIG, ACCENT_SKRELL) + possible_citizenships = CITIZENSHIPS_NRALAKK + possible_religions = RELIGIONS_NRALAKK + +/decl/origin_item/origin/generation_fleets + name = "Generation Fleets" + desc = "Generation Fleets were utilised throughout most of the Skrell's era of colonisation, with the more modern fleets becoming roaming nomads during the reign of Glorsh-Omega. Some of these fleets are still active today in some capacity, with most being officially approved by the Federation Government - although some others are branded as marauders and rebels." + possible_accents = list(ACCENT_SKRELL, ACCENT_GENNER) + possible_citizenships = CITIZENSHIPS_NRALAKK + possible_religions = RELIGIONS_NRALAKK diff --git a/code/modules/background/origins/origins/vaurca/breeder/cthur.dm b/code/modules/background/origins/origins/vaurca/breeder/cthur.dm index 51e401e60bd..472d37ea5d4 100644 --- a/code/modules/background/origins/origins/vaurca/breeder/cthur.dm +++ b/code/modules/background/origins/origins/vaurca/breeder/cthur.dm @@ -1,6 +1,6 @@ /decl/origin_item/culture/cthur_breeder name = "C'thur Brood" - desc = "Known as 'The Weavers', they are the third Hive that has developed relationships with other sophonts of the Orion Spur. While their arrival was kept in secret by the Jargon Federation, the revelation has reignited diplomatic disputes between K'lax and C'thur, with outright hostility met by the K'lax towards the C'thur. " + desc = "Known as 'The Weavers', they are the third Hive that has developed relationships with other sophonts of the Orion Spur. While their arrival was kept in secret by the Nralakk Federation, the revelation has reignited diplomatic disputes between K'lax and C'thur, with outright hostility met by the K'lax towards the C'thur. " possible_origins = list( /decl/origin_item/origin/cthur_b, /decl/origin_item/origin/mouv_b, @@ -11,19 +11,19 @@ name = "C'thur Brood" desc = "The brood of the High Queen C'thur. Due to the Queen's health, many remain near Diulszi." possible_accents = list(ACCENT_CTHUR, ACCENT_TTS) - possible_citizenships = list(CITIZENSHIP_CTHUR, CITIZENSHIP_JARGON) + possible_citizenships = list(CITIZENSHIP_CTHUR, CITIZENSHIP_NRALAKK) possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE) /decl/origin_item/origin/mouv_b name = "Mouv Brood" desc = "Her brood leads Vaurca scientific research in Skrellian space, and is also brokering deals with the Eridani Federation. She is also known for purchasing a portion of Einstein Engines." possible_accents = list(ACCENT_CTHUR, ACCENT_TTS) - possible_citizenships = list(CITIZENSHIP_CTHUR, CITIZENSHIP_JARGON) + possible_citizenships = list(CITIZENSHIP_CTHUR, CITIZENSHIP_NRALAKK) possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE) /decl/origin_item/origin/vytel_b name = "Vytel Brood" - desc = "Known for upholding the law, Vytel is the Warrior brood of the C'thur. They are spread within Jargon space, the Eridani Federation, and the Corporate Reconstruction Zone." + desc = "Known for upholding the law, Vytel is the Warrior brood of the C'thur. They are spread within Nralakk space, the Eridani Federation, and the Corporate Reconstruction Zone." possible_accents = list(ACCENT_CTHUR, ACCENT_TTS) - possible_citizenships = list(CITIZENSHIP_CTHUR, CITIZENSHIP_JARGON) + possible_citizenships = list(CITIZENSHIP_CTHUR, CITIZENSHIP_NRALAKK) possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE) diff --git a/code/modules/background/origins/origins/vaurca/cthur.dm b/code/modules/background/origins/origins/vaurca/cthur.dm index bd18135fbce..c73f71c2509 100644 --- a/code/modules/background/origins/origins/vaurca/cthur.dm +++ b/code/modules/background/origins/origins/vaurca/cthur.dm @@ -1,6 +1,6 @@ /decl/origin_item/culture/cthur name = "C'thur Brood" - desc = "Known as 'The Weavers', they are the third Hive that has developed relationships with other sophonts of the Orion Spur. While their arrival was kept in secret by the Jargon Federation, the revelation has reignited diplomatic disputes between K'lax and C'thur, with outright hostility met by the K'lax towards the C'thur." + desc = "Known as 'The Weavers', they are the third Hive that has developed relationships with other sophonts of the Orion Spur. While their arrival was kept in secret by the Nralakk Federation, the revelation has reignited diplomatic disputes between K'lax and C'thur, with outright hostility met by the K'lax towards the C'thur." possible_origins = list( /decl/origin_item/origin/cthur, /decl/origin_item/origin/mouv, @@ -13,28 +13,28 @@ name = "C'thur Brood" desc = "The brood of the High Queen C'thur. Due to the Queen's health, many remain near Diulszi." possible_accents = list(ACCENT_CTHUR, ACCENT_TTS) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_ERIDANI, CITIZENSHIP_NONE) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_NONE) possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE) /decl/origin_item/origin/mouv name = "Mouv Brood" desc = "Her brood leads Vaurca scientific research in Skrellian space, and is also brokering deals with the Eridani Federation. She is also known for purchasing a portion of Einstein Engines." possible_accents = list(ACCENT_CTHUR, ACCENT_TTS) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_ERIDANI, CITIZENSHIP_NONE) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_NONE) possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE) /decl/origin_item/origin/vytel name = "Vytel Brood" - desc = "Known for upholding the law, Vytel is the Warrior brood of the C'thur. They are spread within Jargon space, the Eridani Federation, and the Corporate Reconstruction Zone." + desc = "Known for upholding the law, Vytel is the Warrior brood of the C'thur. They are spread within Nralakk space, the Eridani Federation, and the Corporate Reconstruction Zone." possible_accents = list(ACCENT_CTHUR, ACCENT_TTS) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_ERIDANI, CITIZENSHIP_NONE) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_NONE) possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE) /decl/origin_item/origin/xetl name = "Xetl Brood" desc = "While Queen Xetl is kept away from negotiations, her brood is usually exported to human space for their labor." possible_accents = list(ACCENT_CTHUR, ACCENT_TTS) - possible_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_ERIDANI, CITIZENSHIP_NONE) + possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_NONE) possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE) /decl/origin_item/origin/klatxatl diff --git a/code/modules/background/religion/diona.dm b/code/modules/background/religion/diona.dm index 652f6ce3153..8b837ba79e1 100644 --- a/code/modules/background/religion/diona.dm +++ b/code/modules/background/religion/diona.dm @@ -13,7 +13,7 @@ name = RELIGION_KSSHR description = "The Ksshr, also known as the Enlightened, is a religious sect on Xrim known for their complete rejection of The First Consciousness, instead of being an agnostic \ sect that centers around working together to create a better future, as well as the advancement of technology and understanding how the universe works. The Ksshr faith is the \ - primary religion of Xrim, with most of its inhabitants considering themselves a part of the religion. The Jargon Federation does encourage practicing the faith amongst the \ + primary religion of Xrim, with most of its inhabitants considering themselves a part of the religion. The Nralakk Federation does encourage practicing the faith amongst the \ population so long as they continue to reject The First Consciousness, as well as stay away from the teachings of the Shrkh." book_name = "ksshr codex" book_sprite = "holybook" diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index da03dfe9f54..53c44f26adb 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -253,7 +253,7 @@ /datum/bounty/item/chef/skrell name = "Federation Delicacies" - description = "We're holding a luncheon with some Jargon Federation representatives; send some Skrellian dishes!" + description = "We're holding a luncheon with some Nralakk Federation representatives; send some Skrellian dishes!" reward_low = 3700 reward_high = 5700 required_count = 3 diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 8e54d167ba0..da06e59ad87 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -544,6 +544,6 @@ flagpatch_national["flagpatch, dpra"] = /obj/item/clothing/accessory/flagpatch/dpra flagpatch_national["flagpatch, nka"] = /obj/item/clothing/accessory/flagpatch/nka flagpatch_national["flagpatch, free council"] = /obj/item/clothing/accessory/flagpatch/freecouncil - flagpatch_national["flagpatch, jargon"] = /obj/item/clothing/accessory/flagpatch/jargon + flagpatch_national["flagpatch, nralakk"] = /obj/item/clothing/accessory/flagpatch/nralakk flagpatch_national["flagpatch, hegemony"] = /obj/item/clothing/accessory/flagpatch/hegemony gear_tweaks += new /datum/gear_tweak/path(flagpatch_national) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index d05e6b91338..8122c2ecf4b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -317,7 +317,7 @@ faction = "Zeng-Hu Pharmaceuticals" /datum/gear/faction/zenghu_cloak - display_name = "Zeng-Hu Jargon Division cloak" + display_name = "Zeng-Hu Nralakk Division cloak" path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng slot = slot_wear_suit faction = "Zeng-Hu Pharmaceuticals" diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 6bd16ffb19a..c1bde6ce3d1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -112,7 +112,7 @@ coffeecups["Eridani coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/eridani coffeecups["Elyra coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/elyra coffeecups["Hegemony coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony - coffeecups["Jargon coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/jargon + coffeecups["Nralakk coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nralakk coffeecups["NT coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt coffeecups["Hephaestus coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/hepht coffeecups["Idris coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris @@ -156,7 +156,7 @@ banners["banner, Dominia"] = /obj/item/flag/dominia banners["banner, Elyra"] = /obj/item/flag/elyra banners["banner, Hegemony"] = /obj/item/flag/hegemony - banners["banner, Jargon"] = /obj/item/flag/jargon + banners["banner, Nralakk"] = /obj/item/flag/nralakk banners["banner, Traverse"] = /obj/item/flag/traverse banners["banner, NanoTrasen"] = /obj/item/flag/nanotrasen banners["banner, Eridani Fed"] = /obj/item/flag/eridani @@ -207,7 +207,7 @@ flags["flag, Dominia"] = /obj/item/flag/dominia/l flags["flag, Elyra"] = /obj/item/flag/elyra/l flags["flag, Hegemony"] = /obj/item/flag/hegemony/l - flags["flag, Jargon"] = /obj/item/flag/jargon/l + flags["flag, Nralakk"] = /obj/item/flag/nralakk/l flags["flag, Traverse"] = /obj/item/flag/traverse/l flags["flag, NanoTrasen"] = /obj/item/flag/nanotrasen/l flags["flag, Eridani Fed"] = /obj/item/flag/eridani/l diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm index 3724319a06a..b50bae55465 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -116,14 +116,14 @@ /datum/gear/homeworld_deck display_name = "qweipaqui homeworld deck" - path = /obj/item/deck/tarot/jargon + path = /obj/item/deck/tarot/nralakk whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Skrell" flags = GEAR_NO_SELECTION /datum/gear/colonist_deck // Intentionally separate from homeworld_deck, so that both can be chosen. -Lly display_name = "qweipaqui colonist deck" - path = /obj/item/deck/tarot/nonjargon + path = /obj/item/deck/tarot/nonnralakk whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Skrell" flags = GEAR_NO_SELECTION @@ -179,8 +179,8 @@ flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/accessory/skrell_passport - display_name = "jargon federation passport" - path = /obj/item/clothing/accessory/badge/passport/jargon + display_name = "nralakk federation passport" + path = /obj/item/clothing/accessory/badge/passport/nralakk sort_category = "Xenowear - Skrell" whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) flags = GEAR_NO_SELECTION @@ -206,7 +206,7 @@ return FALSE /datum/gear/accessory/skrell_passport/spawn_item(location, metadata, mob/living/carbon/human/H) - var/obj/item/clothing/accessory/badge/passport/jargon/J = ..() + var/obj/item/clothing/accessory/badge/passport/nralakk/J = ..() var/static/list/species_name_to_tag = list(SPECIES_SKRELL = "_s", SPECIES_SKRELL_AXIORI = "_s", SPECIES_VAURCA_WARRIOR = "_v", SPECIES_VAURCA_WORKER = "_v", SPECIES_VAURCA_BREEDER = "_v", SPECIES_VAURCA_BULWARK = "_v", SPECIES_DIONA = "_d", SPECIES_DIONA_COEUS = "_d") var/tag = species_name_to_tag[H.species.name] if(tag) @@ -232,45 +232,45 @@ datum/gear_tweak/social_credit/get_default() return 5 datum/gear_tweak/social_credit/get_metadata(var/user, var/metadata) - var/credit_score = input(user, "Set the credit score your passport will display, refer to the wiki to gauge it. (It will be slightly randomized to simulate Jargon calculations.)", "Social Credit Score") as null|num + var/credit_score = input(user, "Set the credit score your passport will display, refer to the wiki to gauge it. (It will be slightly randomized to simulate Nralakk calculations.)", "Social Credit Score") as null|num if(credit_score) return round(credit_score, 0.01) return metadata -datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/passport/jargon/PP, var/metadata) +datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/passport/nralakk/PP, var/metadata) if(!istype(PP)) return PP.credit_score = metadata + pick(-0.01, 0, 0.01) /datum/gear/uniform/skrell/work display_name = "work uniforms" - path = /obj/item/clothing/under/skrell/jargon + path = /obj/item/clothing/under/skrell/nralakk whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) flags = GEAR_HAS_DESC_SELECTION /datum/gear/uniform/skrell/work/New() ..() var/list/outfit = list() - outfit["ox research"] = /obj/item/clothing/under/skrell/jargon - outfit["ox security"] = /obj/item/clothing/under/skrell/jargon/ox - outfit["ox engineer"] = /obj/item/clothing/under/skrell/jargon/ox/engineer - outfit["ox service"] = /obj/item/clothing/under/skrell/jargon/ox/service - outfit["ox medical"] = /obj/item/clothing/under/skrell/jargon/ox/med - outfit["ix research"] = /obj/item/clothing/under/skrell/jargon/ix - outfit["ix security"] = /obj/item/clothing/under/skrell/jargon/ix/security - outfit["ix engineer"] = /obj/item/clothing/under/skrell/jargon/ix/engineer - outfit["ix service"] = /obj/item/clothing/under/skrell/jargon/ix/service - outfit["ix medical"] = /obj/item/clothing/under/skrell/jargon/ix/med - outfit["oqi research"] = /obj/item/clothing/under/skrell/jargon/oqi - outfit["oqi security"] = /obj/item/clothing/under/skrell/jargon/oqi/security - outfit["oqi engineer"] = /obj/item/clothing/under/skrell/jargon/oqi/engineer - outfit["oqi service"] = /obj/item/clothing/under/skrell/jargon/oqi/service - outfit["oqi medical"] = /obj/item/clothing/under/skrell/jargon/oqi/med - outfit["iqi research"] = /obj/item/clothing/under/skrell/jargon/iqi - outfit["iqi security"] = /obj/item/clothing/under/skrell/jargon/iqi/security - outfit["iqi engineer"] = /obj/item/clothing/under/skrell/jargon/iqi/engineer - outfit["iqi service"] = /obj/item/clothing/under/skrell/jargon/iqi/service - outfit["iqi medical"] = /obj/item/clothing/under/skrell/jargon/iqi/med + outfit["ox research"] = /obj/item/clothing/under/skrell/nralakk + outfit["ox security"] = /obj/item/clothing/under/skrell/nralakk/ox + outfit["ox engineer"] = /obj/item/clothing/under/skrell/nralakk/ox/engineer + outfit["ox service"] = /obj/item/clothing/under/skrell/nralakk/ox/service + outfit["ox medical"] = /obj/item/clothing/under/skrell/nralakk/ox/med + outfit["ix research"] = /obj/item/clothing/under/skrell/nralakk/ix + outfit["ix security"] = /obj/item/clothing/under/skrell/nralakk/ix/security + outfit["ix engineer"] = /obj/item/clothing/under/skrell/nralakk/ix/engineer + outfit["ix service"] = /obj/item/clothing/under/skrell/nralakk/ix/service + outfit["ix medical"] = /obj/item/clothing/under/skrell/nralakk/ix/med + outfit["oqi research"] = /obj/item/clothing/under/skrell/nralakk/oqi + outfit["oqi security"] = /obj/item/clothing/under/skrell/nralakk/oqi/security + outfit["oqi engineer"] = /obj/item/clothing/under/skrell/nralakk/oqi/engineer + outfit["oqi service"] = /obj/item/clothing/under/skrell/nralakk/oqi/service + outfit["oqi medical"] = /obj/item/clothing/under/skrell/nralakk/oqi/med + outfit["iqi research"] = /obj/item/clothing/under/skrell/nralakk/iqi + outfit["iqi security"] = /obj/item/clothing/under/skrell/nralakk/iqi/security + outfit["iqi engineer"] = /obj/item/clothing/under/skrell/nralakk/iqi/engineer + outfit["iqi service"] = /obj/item/clothing/under/skrell/nralakk/iqi/service + outfit["iqi medical"] = /obj/item/clothing/under/skrell/nralakk/iqi/med gear_tweaks += new /datum/gear_tweak/path(outfit) /datum/gear/suit/skrell/jacket @@ -362,7 +362,7 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/ tees["teal eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/teal tees["black eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/black tees["white eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/white - tees["jargon eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/jargon + tees["nralakk eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/nralakk gear_tweaks += new /datum/gear_tweak/path(tees) /datum/gear/accessory/skrell/dress @@ -414,7 +414,7 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/ /datum/gear/accessory/skrell/nationcapes/New() ..() var/list/nationcapes = list() - nationcapes["Jargon Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes + nationcapes["Nralakk Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes nationcapes["Free Traverse Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/traverse nationcapes["Sol Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/sol nationcapes["Coalition Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/coc diff --git a/code/modules/clothing/factions/jargon.dm b/code/modules/clothing/factions/nralakk.dm similarity index 92% rename from code/modules/clothing/factions/jargon.dm rename to code/modules/clothing/factions/nralakk.dm index ffc527141d2..647296ecd13 100644 --- a/code/modules/clothing/factions/jargon.dm +++ b/code/modules/clothing/factions/nralakk.dm @@ -16,7 +16,7 @@ /obj/item/clothing/accessory/dressshirt/skrell/reef name = "reef formal wetshirt" - desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Jargon Space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Nralakk space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "reef_dressshirt" item_state = "reef_dressshirt" @@ -39,7 +39,7 @@ /obj/item/clothing/accessory/tshirt/skrell/reef name = "reef wetshirt" - desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Jargon Space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Nralakk space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "reef_tee" item_state = "reef_tee" @@ -73,8 +73,8 @@ icon_state = "white_skrell_hawaiian" item_state = "white_skrell_hawaiian" -/obj/item/clothing/accessory/tshirt/skrell/nebula/jargon - name = "jargon eriuyushi nebula shirt" +/obj/item/clothing/accessory/tshirt/skrell/nebula/nralakk + name = "nralakk eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "jargon_skrell_hawaiian" item_state = "jargon_skrell_hawaiian" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index db72a9c8b6f..3b0edcb044a 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -55,7 +55,6 @@ /obj/item/clothing/head/helmet/hos name = "head of security helmet" desc = "A special Internal Security Division helmet designed to protect the precious craniums of important installation security officers." - desc_fluff = "What the heck did you just hecking say about me, you little honker? I'll have you know I graduated top of my class in the Sol Army, and I've been involved in numerous secret raids on the Jargon Federation, and I have over 300 confirmed kills. I am trained in gorilla warfare and I'm the top sniper in the entire Sol armed forces. You are nothing to me but just another target. I will wipe you the heck out with precision the likes of which has never been seen before on Biesel, mark my hecking words." icon = 'icons/clothing/kit/modular_armor.dmi' contained_sprite = TRUE icon_state = "helm_sec_commander" diff --git a/code/modules/clothing/head/xenos/vaurca.dm b/code/modules/clothing/head/xenos/vaurca.dm index 9b981b2bf0c..028bf2c83e3 100644 --- a/code/modules/clothing/head/xenos/vaurca.dm +++ b/code/modules/clothing/head/xenos/vaurca.dm @@ -20,8 +20,8 @@ item_state = "hive_rep_shroud_cthur" icon_state = "hive_rep_shroud_cthur" -/obj/item/clothing/head/vaurca_breeder/jargon - name = "jargon representative shroud" - desc = "Large shroud used by Jargon representatives." +/obj/item/clothing/head/vaurca_breeder/nralakk + name = "nralakk representative shroud" + desc = "Large shroud used by Nralakk representatives." item_state = "hive_rep_shroud_jargon" icon_state = "hive_rep_shroud_jargon" diff --git a/code/modules/clothing/shoes/xeno/vaurca.dm b/code/modules/clothing/shoes/xeno/vaurca.dm index 142eaabb0e4..2b561b471ca 100644 --- a/code/modules/clothing/shoes/xeno/vaurca.dm +++ b/code/modules/clothing/shoes/xeno/vaurca.dm @@ -43,8 +43,8 @@ item_state = "hive_rep_shoes_cthur" icon_state = "hive_rep_shoes_cthur" -/obj/item/clothing/shoes/vaurca/breeder/jargon - name = "jargon representative shoes" - desc = "Large shoes used by Jargon representatives." +/obj/item/clothing/shoes/vaurca/breeder/nralakk + name = "nralakk representative shoes" + desc = "Large shoes used by Nralakk representatives." item_state = "hive_rep_shoes_jargon" icon_state = "hive_rep_shoes_jargon" diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 44d8231d8dd..ba395125044 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -152,7 +152,7 @@ return TRUE /obj/item/rig_module/teleporter/skrell - name = "jargon teleportation module" + name = "nralakk teleportation module" phase_in_visual = /obj/effect/temp_visual/phase/rift phase_out_visual = /obj/effect/temp_visual/phase/rift diff --git a/code/modules/clothing/spacesuits/rig/suits/skrell.dm b/code/modules/clothing/spacesuits/rig/suits/skrell.dm index 10e8ebfde04..71b7a2bbc5f 100644 --- a/code/modules/clothing/spacesuits/rig/suits/skrell.dm +++ b/code/modules/clothing/spacesuits/rig/suits/skrell.dm @@ -3,11 +3,11 @@ light_color = LIGHT_COLOR_CYAN /obj/item/rig/skrell - name = "jargon suit control module" - desc = "A suit control module designed by the Jargon Federation for JFSF operations. It is designed to be sleek and agile, equipped with best protection and technology the Federation has to offer for its elite." + name = "nralakk suit control module" + desc = "A suit control module designed by the Nralakk Federation for JFSF operations. It is designed to be sleek and agile, equipped with best protection and technology the Federation has to offer for its elite." icon = 'icons/clothing/rig/jargon.dmi' icon_state = "jargon_rig" - suit_type = "jargon suit" + suit_type = "nralakk suit" armor = list( melee = ARMOR_MELEE_VERY_HIGH, bullet = ARMOR_BALLISTIC_RIFLE, @@ -49,7 +49,7 @@ /obj/item/rig/skrell/tup name = "tup suit control module" - desc = "A suit control module designed by the Jargon Federation for Tup operations. The best of the best." + desc = "A suit control module designed by the Nralakk Federation for Tup operations. The best of the best." icon = 'icons/clothing/rig/tup.dmi' icon_state = "tup_rig" suit_type = "tup suit" diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index db6be4332fa..7a9ed97a475 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -466,9 +466,9 @@ icon_state = "flagpatch_fisanduh" item_state = "flagpatch_fisanduh" -/obj/item/clothing/accessory/flagpatch/jargon - name = "jargon flagpatch" - desc = "A flagpatch representing the Jargon Federation. The free use of these patches is a contentious issue back home as \ +/obj/item/clothing/accessory/flagpatch/nralakk + name = "nralakk flagpatch" + desc = "A flagpatch representing the Nralakk Federation. The free use of these patches is a contentious issue back home as \ there is a fear that their wearers may misrepresent the nation." icon_state = "flagpatch_jargon" item_state = "flagpatch_jargon" diff --git a/code/modules/clothing/suits/xeno/vaurca.dm b/code/modules/clothing/suits/xeno/vaurca.dm index 5f934fc0dd6..540aef8911f 100644 --- a/code/modules/clothing/suits/xeno/vaurca.dm +++ b/code/modules/clothing/suits/xeno/vaurca.dm @@ -53,8 +53,8 @@ item_state = "hive_rep_clothes_cthur" icon_state = "hive_rep_clothes_cthur" -/obj/item/clothing/suit/vaurca/breeder/jargon - name = "jargon representative clothes" - desc = "A large piece of clothing used by Jargon representatives." +/obj/item/clothing/suit/vaurca/breeder/nralakk + name = "nralakk representative clothes" + desc = "A large piece of clothing used by Nralakk representatives." item_state = "hive_rep_clothes_jargon" icon_state = "hive_rep_clothes_jargon" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 0351b2225ab..7457d58f57b 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -633,10 +633,10 @@ flippable = FALSE /obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng - name = "Jargon Division Zeng-Hu cloak" - desc = "This cloak is given to Zeng-Hu employees who have assisted or worked in collaboration with the Jargon Federation." + name = "Nralakk Division Zeng-Hu cloak" + desc = "This cloak is given to Zeng-Hu employees who have assisted or worked in collaboration with the Nralakk Federation." desc_fluff = "A cloak given to senior level doctors and researchers for Zeng-Hu who has \ - in the past been given the privilege of working within or in collaboration with the Jargon Federation\ + in the past been given the privilege of working within or in collaboration with the Nralakk Federation\ as a show of goodwill between the corporation and federation." icon = 'icons/obj/contained_items/accessories/ZH_cape.dmi' icon_override = 'icons/obj/contained_items/accessories/ZH_cape.dmi' diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 052552d89ea..131c5c7f24f 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -539,20 +539,20 @@ icon_state = "passport_dominia" item_state = "passport_dominia" -/obj/item/clothing/accessory/badge/passport/jargon - name = "jargon federation passport" - desc = "A passport issued to citizens of the Jargon Federation. Shiny, and compact, it's perfect to use on the go." +/obj/item/clothing/accessory/badge/passport/nralakk + name = "nralakk federation passport" + desc = "A passport issued to citizens of the Nralakk Federation. Shiny, and compact, it's perfect to use on the go." icon_state = "passport_jargon" item_state = "passport_jargon" open = CLOSED var/credit_score = 5 var/species_tag = "" -/obj/item/clothing/accessory/badge/passport/jargon/examine(mob/user) +/obj/item/clothing/accessory/badge/passport/nralakk/examine(mob/user) . = ..() to_chat(user, SPAN_NOTICE("The passport displays the owner's social credit score as: [credit_score].")) -/obj/item/clothing/accessory/badge/passport/jargon/update_icon() +/obj/item/clothing/accessory/badge/passport/nralakk/update_icon() icon_state = "[initial(icon_state)][open ? "_o[species_tag]" : ""]" #undef CANT_OPEN diff --git a/code/modules/clothing/under/accessories/xeno/skrell.dm b/code/modules/clothing/under/accessories/xeno/skrell.dm index 068edee6e8d..23ccd31123e 100644 --- a/code/modules/clothing/under/accessories/xeno/skrell.dm +++ b/code/modules/clothing/under/accessories/xeno/skrell.dm @@ -2,7 +2,7 @@ /obj/item/clothing/accessory/poncho/shouldercape/cloak name = "Ox cloak" desc = "A plain cloak that denotes the wearer as being an Ox-class worker." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Jargon Society." + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society." icon = 'icons/obj/contained_items/skrell/jargon_cloaks.dmi' icon_override = 'icons/obj/contained_items/skrell/jargon_cloaks.dmi' item_state = "ox_cloak" @@ -13,25 +13,25 @@ /obj/item/clothing/accessory/poncho/shouldercape/cloak/ix name = "Ix cloak" desc = "An average cloak that denotes the wearer as being an Ix-class worker." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Jargon Federation, with Ix being those who are in the lower end of the band. " + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Nralakk Federation, with Ix being those who are in the lower end of the band. " item_state = "ix_cloak" /obj/item/clothing/accessory/poncho/shouldercape/cloak/oqi name = "Oqi cloak" desc = "A fashionable cloak that denotes the wearer as being an Oqi-class worker." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Jargon Federation." + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Nralakk Federation." item_state = "oqi_cloak" /obj/item/clothing/accessory/poncho/shouldercape/cloak/iqi name = "Iqi cloak" desc = "A very fashionable cloak that denotes the wearer as being an Iqi-class worker." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise." + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise." item_state = "iqi_cloak" // Ponchos /obj/item/clothing/accessory/poncho/skrell name = "white skrell poncho" - desc = "This cover is a design of the Jargon Federation. It is meant to keep moisture in and stop a Skrell's skin from baking in the hot sun. C'thur and Diona may also wear it as a fashion statement." + desc = "This cover is a design of the Nralakk Federation. It is meant to keep moisture in and stop a Skrell's skin from baking in the hot sun. C'thur and Diona may also wear it as a fashion statement." icon = 'icons/obj/contained_items/skrell/skrell_ponchos.dmi' icon_state = "skr_poncho" item_state = "skr_poncho" @@ -59,9 +59,9 @@ //Capes /obj/item/clothing/accessory/poncho/shouldercape/nationcapes - name = "\improper Jargon cape" - desc = "A cape that has the Jargon flag on the back." - desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Jargon Federation - specifically, the inner systems." + name = "\improper Nralakk cape" + desc = "A cape that has the Nralakk flag on the back." + desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Nralakk Federation - specifically, the inner systems." icon = 'icons/obj/contained_items/skrell/nationcapes.dmi' icon_override = 'icons/obj/contained_items/skrell/nationcapes.dmi' item_state = "jargcape" @@ -72,7 +72,7 @@ /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/traverse name = "\improper Traverse cape" desc = "A cape that has the Free Traverse flag on the back." - desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Jargon Federation - specifically, the Traverse. As the Free Traverse Flag is linked to the lyukal and general Traverse independence movements, it is not recommended to wear this flag openly in Federation space." + desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Nralakk Federation - specifically, the Traverse. As the Free Traverse Flag is linked to the lyukal and general Traverse independence movements, it is not recommended to wear this flag openly in Federation space." item_state = "travcape" icon_state = "travcape" @@ -86,7 +86,7 @@ /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/coc name = "\improper CoC cape" desc = "A cape that has the Coalition of Colonies flag on the back." - desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Coalition of Colonies. Due to the poor relationship between the Coalition of Colonies and the Jargon Federation, Fed-aligned Skrell do not approve of this cape." + desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Coalition of Colonies. Due to the poor relationship between the Coalition of Colonies and the Nralakk Federation, Fed-aligned Skrell do not approve of this cape." item_state = "coccape" icon_state = "coccape" diff --git a/code/modules/clothing/under/xenos/skrell.dm b/code/modules/clothing/under/xenos/skrell.dm index 0876cbe0a8d..a60c301f5a8 100644 --- a/code/modules/clothing/under/xenos/skrell.dm +++ b/code/modules/clothing/under/xenos/skrell.dm @@ -51,10 +51,10 @@ icon_state = "slugger_wetsuit" // Skrell Ox clothing -/obj/item/clothing/under/skrell/jargon +/obj/item/clothing/under/skrell/nralakk name = "Ox research uniform" desc = "A plain, utilitarian jumpsuit that signifies the wearer as a Tertiary Numerical working in a scientific field." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Jargon Society." + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society." icon = 'icons/obj/contained_items/skrell/jargon_uniforms.dmi' sprite_sheets = list( BODYTYPE_VAURCA_BULWARK = 'icons/obj/contained_items/vaurca/bulwark/jargon_uniforms.dmi' @@ -62,121 +62,121 @@ item_state = "ox_sci" icon_state = "ox_sci" -/obj/item/clothing/under/skrell/jargon/ox +/obj/item/clothing/under/skrell/nralakk/ox name = "Ox bridge and security uniform" desc = "A plain, utilitarian jumpsuit that signifies the wearer as a Tertiary Numerical working in the security service or as pilots or bridge crew." item_state = "ox_sec" icon_state = "ox_sec" -/obj/item/clothing/under/skrell/jargon/ox/engineer +/obj/item/clothing/under/skrell/nralakk/ox/engineer name = "Ox engineering and maintenance uniform" desc = "A plain, utilitarian jumpsuit that signifies the wearer as a Tertiary Numerical working in the engineering industry or in maintenance." item_state = "ox_engi" icon_state = "ox_engi" -/obj/item/clothing/under/skrell/jargon/ox/service +/obj/item/clothing/under/skrell/nralakk/ox/service name = "Ox mailing and service uniform" desc = "A plain, utilitarian jumpsuit that signifies the wearer as a Tertiary Numerical working in the mail service or hospitality industries." item_state = "ox_cargo" icon_state = "ox_cargo" -/obj/item/clothing/under/skrell/jargon/ox/med +/obj/item/clothing/under/skrell/nralakk/ox/med name = "Ox healthcare uniform" desc = "A plain, utilitarian jumpsuit that signifies the wearer as a Tertiary Numerical in the healthcare industry." item_state = "ox_med" icon_state = "ox_med" // Skrell Ix clothing -/obj/item/clothing/under/skrell/jargon/ix +/obj/item/clothing/under/skrell/nralakk/ix name = "Ix research uniform" desc = "A plain jumpsuit that signifies the wearer as a low-scoring Secondary Numerical working in a scientific field." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Jargon Federation, with Ix being those who are in the lower end of the band. " + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Nralakk Federation, with Ix being those who are in the lower end of the band. " item_state = "ix_sci" icon_state = "ix_sci" -/obj/item/clothing/under/skrell/jargon/ix/security +/obj/item/clothing/under/skrell/nralakk/ix/security name = "Ix bridge and security uniform" desc = "A plain jumpsuit that signifies the wearer as a low-scoring Secondary Numerical working in the security service or as pilots or bridge crew." item_state = "ix_sec" icon_state = "ix_sec" -/obj/item/clothing/under/skrell/jargon/ix/engineer +/obj/item/clothing/under/skrell/nralakk/ix/engineer name = "Ix engineering and maintenance uniform" desc = "A plain jumpsuit that signifies the wearer as a low-scoring Secondary Numerical in the engineering industry or in maintenance." item_state = "ix_engi" icon_state = "ix_engi" -/obj/item/clothing/under/skrell/jargon/ix/service +/obj/item/clothing/under/skrell/nralakk/ix/service name = "Ix mailing and service uniform" desc = "A plain jumpsuit that signifies the wearer as a low-scoring Secondary Numerical in the mail service or hospitality industries." item_state = "ix_cargo" icon_state = "ix_cargo" -/obj/item/clothing/under/skrell/jargon/ix/med +/obj/item/clothing/under/skrell/nralakk/ix/med name = "Ix healthcare uniform" desc = "A plain jumpsuit that signifies the wearer as a low-scoring Secondary Numerical in the healthcare industry." item_state = "ix_med" icon_state = "ix_med" // Skrell Oqi clothing -/obj/item/clothing/under/skrell/jargon/oqi +/obj/item/clothing/under/skrell/nralakk/oqi name = "Oqi research uniform" desc = "A more fashionable jumpsuit that signifies the wearer as either a high-scoring Secondary Numerical or low-scoring Primary Numerical in a scientific field." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Jargon Federation." + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Nralakk Federation." item_state = "oqi_sci" icon_state = "oqi_sci" -/obj/item/clothing/under/skrell/jargon/oqi/security +/obj/item/clothing/under/skrell/nralakk/oqi/security name = "Oqi bridge and security uniform" desc = "A more fashionable jumpsuit that signifies the wearer as either a high-scoring Secondary Numerical or low-scoring Primary Numerical in the security service or as pilots or bridge crew." item_state = "oqi_sec" icon_state = "oqi_sec" -/obj/item/clothing/under/skrell/jargon/oqi/engineer +/obj/item/clothing/under/skrell/nralakk/oqi/engineer name = "Oqi engineering and maintenance uniform" desc = "A more fashionable jumpsuit that signifies the wearer as either a high-scoring Secondary Numerical or low-scoring Primary Numerical in the engineering industry or in maintenance." item_state = "oqi_engi" icon_state = "oqi_engi" -/obj/item/clothing/under/skrell/jargon/oqi/service +/obj/item/clothing/under/skrell/nralakk/oqi/service name = "Oqi mailing and service uniform" desc = "A more fashionable jumpsuit that signifies the wearer as either a high-scoring Secondary Numerical or low-scoring Primary Numerical in the mail service or hospitality industries." item_state = "oqi_cargo" icon_state = "oqi_cargo" -/obj/item/clothing/under/skrell/jargon/oqi/med +/obj/item/clothing/under/skrell/nralakk/oqi/med name = "Oqi healthcare uniform" desc = "A more fashionable jumpsuit that signifies the wearer as either a high-scoring Secondary Numerical or low-scoring Primary Numerical in the healthcare industry." item_state = "oqi_med" icon_state = "oqi_med" // Skrell Iqi clothing -/obj/item/clothing/under/skrell/jargon/iqi +/obj/item/clothing/under/skrell/nralakk/iqi name = "Iqi research uniform" desc = "A very fashionable jumpsuit that signifies the wearer as a high-scoring Primary Numerical in a scientific field." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise." + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise." item_state = "iqi_sci" icon_state = "iqi_sci" -/obj/item/clothing/under/skrell/jargon/iqi/security +/obj/item/clothing/under/skrell/nralakk/iqi/security name = "Iqi bridge and security uniform" desc = "A very fashionable jumpsuit that signifies the wearer as a high-scoring Primary Numerical in the security service or as pilots or bridge crew." item_state = "iqi_sec" icon_state = "iqi_sec" -/obj/item/clothing/under/skrell/jargon/iqi/engineer +/obj/item/clothing/under/skrell/nralakk/iqi/engineer name = "Iqi engineering and maintenance uniform" desc = "A very fashionable jumpsuit that signifies the wearer as a high-scoring Primary Numerical in the engineering industry or in maintenance." item_state = "iqi_engi" icon_state = "iqi_engi" -/obj/item/clothing/under/skrell/jargon/iqi/service +/obj/item/clothing/under/skrell/nralakk/iqi/service name = "Iqi mailing and service uniform" desc = "A very fashionable jumpsuit that signifies the wearer as a high-scoring Primary Numerical in the mail service or hospitality industries." item_state = "iqi_cargo" icon_state = "iqi_cargo" -/obj/item/clothing/under/skrell/jargon/iqi/med +/obj/item/clothing/under/skrell/nralakk/iqi/med name = "Iqi healthcare uniform" desc = "A very fashionable jumpsuit that signifies the wearer as a high-scoring Primary Numerical in the healthcare industry." item_state = "iqi_med" @@ -186,7 +186,7 @@ /obj/item/clothing/suit/storage/toggle/skrell name = "Ox research jacket" desc = "A plain, utilitarian jacket that signifies the wearer as a Tertiary Numerical in a scientific field." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Jargon Society." + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society." icon = 'icons/obj/contained_items/skrell/jargon_jackets.dmi' item_state = "ox_sci_jacket" icon_state = "ox_sci_jacket" @@ -220,7 +220,7 @@ /obj/item/clothing/suit/storage/toggle/skrell/ix name = "Ix research jacket" desc = "A plain jacket that signifies the wearer as a low-scoring Secondary Numerical in a scientific field." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Jargon Federation, with Ix being those who are in the lower end of the band. " + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Nralakk Federation, with Ix being those who are in the lower end of the band. " item_state = "ix_sci_jacket" icon_state = "ix_sci_jacket" @@ -252,7 +252,7 @@ /obj/item/clothing/suit/storage/toggle/skrell/oqi name = "Oqi research jacket" desc = "A more fashionable jacket that signifies the wearer as either a high-scoring Secondary Numerical or low-scoring Primary Numerical in a scientific field." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Jargon Federation." + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Nralakk Federation." item_state = "oqi_sci_jacket" icon_state = "oqi_sci_jacket" @@ -284,7 +284,7 @@ /obj/item/clothing/suit/storage/toggle/skrell/iqi name = "Iqi research jacket" desc = "A very fashionable jacket that signifies the wearer as a high-scoring Primary Numerical in a scientific field." - desc_fluff = "The Jargon Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise." + desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise." item_state = "iqi_sci_jacket" icon_state = "iqi_sci_jacket" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 66c8e6b2630..dc752144643 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2065,7 +2065,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/clothing/suit/storage/fluff/quoro_suit //Skrellian Fancy Robes - Quoro Wurri'Til - witchbells name = "skrellian fancy robes" desc = "An elaborate yet functional set of robes favored by the upper echelons of skrellian society, with a silver belt attached. A star is embroidered on the back, \ - symbolizing the Jargon Federation." + symbolizing the Nralakk Federation." icon = 'icons/obj/custom_items/quoro_items.dmi' icon_override = 'icons/obj/custom_items/quoro_items.dmi' icon_state = "quoro_suit" @@ -2073,9 +2073,9 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng/fluff/eden_cloak // Zeng-Hu Jargon division cloak - Eden Li - Huntime - name = "Zeng-Hu cloak: Jargon Division" - desc = "A cloak worn by Zeng-Hu personnel who worked with or in the Jargon Federation." +/obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng/fluff/eden_cloak // Zeng-Hu Nralakk division cloak - Eden Li - Huntime + name = "Zeng-Hu cloak: Nralakk Division" + desc = "A cloak worn by Zeng-Hu personnel who worked with or in the Nralakk Federation." icon = 'icons/obj/custom_items/eden_cloak.dmi' icon_override = 'icons/obj/custom_items/eden_cloak.dmi' icon_state = "ZH_cape_custom" diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index 9e87ad5c6ea..bd16193c597 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -62,17 +62,17 @@ P.back_icon = "card_back_adhomai" cards += P -/obj/item/deck/tarot/jargon +/obj/item/deck/tarot/nralakk name = "qwei'paqui homeworld deck" desc = "A Skrellian deck of tarot cards depicting the main constellations of Nralakk." icon_state = "deck_jargon" -/obj/item/deck/tarot/jargon/generate_deck() +/obj/item/deck/tarot/nralakk/generate_deck() var/datum/playingcard/P for(var/name in list("Island","Hatching Egg","Star Chanter","Jiu'x'klua","Stormcloud","Gnarled Tree","Poet","Bloated Toad","Void","Qu'Poxii","Fisher","Mountain","Sraso","Nioh")) P = new() P.name = "[name]" - var/suit = "jargon" + var/suit = "nralakk" switch(name) if("Island") P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. It is associated with Loneliness. Introspection. Earth. Rising above or Sinking beneath. Reality." @@ -115,12 +115,12 @@ P.back_icon = "card_off_[suit]" cards += P -/obj/item/deck/tarot/nonjargon +/obj/item/deck/tarot/nonnralakk name = "qwei'paqui colonist deck" desc = "A Skrellian deck of tarot cards depicting the local constellations of planets outside Nralakk." icon_state = "deck_nonjargon" -/obj/item/deck/tarot/nonjargon/generate_deck() +/obj/item/deck/tarot/nonnralakk/generate_deck() var/datum/playingcard/P for(var/name in list("Shell","Wave","Trident","Palm Tree","Pulque","Eel","Iqi Star","Sky-Grazer","Dyn")) P = new() diff --git a/code/modules/hydroponics/seed_datums/jargon.dm b/code/modules/hydroponics/seed_datums/nralakk.dm similarity index 100% rename from code/modules/hydroponics/seed_datums/jargon.dm rename to code/modules/hydroponics/seed_datums/nralakk.dm diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index 4214468da32..200774c4d51 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -120,7 +120,7 @@ /decl/origin_item/culture/diona_eridani, /decl/origin_item/culture/diona_dominia, /decl/origin_item/culture/dionae_moghes, - /decl/origin_item/culture/dionae_jargon, + /decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/diona_coalition, /decl/origin_item/culture/deep_space ) diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm index 27e792f9d5b..ef7fb287dcc 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm @@ -233,7 +233,7 @@ mob_size = 28 taste_sensitivity = TASTE_DULL - blurb = {"Type E Vaurca, otherwise known as the Bulwarks, are a new bodyform derived from the worker caste in a collaboration by the C'thur and Jargon scientists. Originally only the C'thur had access to these behemoths, but after a short amount of time, the bodyform started appearing in the ranks of the Zo'ra and K'lax as well, causing an even more strained relationship between the hives.
+ blurb = {"Type E Vaurca, otherwise known as the Bulwarks, are a new bodyform derived from the worker caste in a collaboration by the C'thur and Nralakk scientists. Originally only the C'thur had access to these behemoths, but after a short amount of time, the bodyform started appearing in the ranks of the Zo'ra and K'lax as well, causing an even more strained relationship between the hives.
Similar to Workers, Bulwarks are generally passive, and prefer to flee a fight rather than resist. Though due to their speed, they may still choose to defend themselves should they be unable to properly escape a battle. The main exception to this is when another Vaurca is in danger. When this occurs, they tend to put themselves in between the attacker and the Vaurca, acting as a shield of sorts. They won't go out of their way to take down the attacker, but will ensure the others get away safely.
Bulwarks are much larger and have significantly thicker carapaces than most Vaurca, making them slow but resistant to most hits, including a complete immunity to radiation. Their powerful arms and claws grant them stronger punches, enough to bend metal, and is often used to pry open non-functional doors.
Type E Vaurca are typically used for heavy lifting, agricultural and industrial work, thus they can typically be found as Engineers, Cargo Technicians, Miners and similar jobs, though they can also be found in positions such as janitor and Assistant should they be needed."} diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 2cd6d911e49..9944b5122fd 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -213,8 +213,8 @@ return //Fuck robots. /obj/item/gun/energy/gun/skrell/pistol - name = "jargon particle pistol" - desc = "A Jargon Federation particle-beam pistol with two settings: Disable and Lethal." + name = "nralakk particle pistol" + desc = "A Nralakk Federation particle-beam pistol with two settings: Disable and Lethal." icon = 'icons/obj/guns/jargonpistol.dmi' icon_state = "particlepistol" item_state = "particlepistol" @@ -229,8 +229,8 @@ ) /obj/item/gun/energy/gun/skrell/smg - name = "jargon particle submachinegun" - desc = "A Jargon Federation particle-beam submachine gun with two settings: Disable and Lethal." + name = "nralakk particle submachinegun" + desc = "A Nralakk Federation particle-beam submachine gun with two settings: Disable and Lethal." icon = 'icons/obj/guns/jargonsmg.dmi' icon_state = "particlesmg" item_state = "particlesmg" diff --git a/code/modules/psionics/events/_psi.dm b/code/modules/psionics/events/_psi.dm index bb4b0cf4a18..d6b92e15dc5 100644 --- a/code/modules/psionics/events/_psi.dm +++ b/code/modules/psionics/events/_psi.dm @@ -6,13 +6,13 @@ priority_announcement.Announce( \ "A localized disruption within the neighboring psionic continua has been detected. All psi-operant crewmembers \ are advised to cease any sensitive activities and report to medical personnel in case of damage.", \ - "Jargon Federation Observation Probe TC-203 Sensor Array", new_sound = 'sound/misc/announcements/nightlight_old.ogg', zlevels = affecting_z) + "Nralakk Federation Observation Probe TC-203 Sensor Array", new_sound = 'sound/misc/announcements/nightlight_old.ogg', zlevels = affecting_z) /datum/event/psi/end() priority_announcement.Announce( \ "The psi-disturbance has ended and baseline normality has been re-asserted. \ Anything you still can't cope with is therefore your own problem.", \ - "Jargon Federation Observation Probe TC-203 Sensor Array", new_sound = 'sound/misc/announcements/nightlight_old.ogg', zlevels = affecting_z) + "Nralakk Federation Observation Probe TC-203 Sensor Array", new_sound = 'sound/misc/announcements/nightlight_old.ogg', zlevels = affecting_z) /datum/event/psi/tick() for(var/thing in SSpsi.processing) diff --git a/code/modules/psionics/events/mini_spasm.dm b/code/modules/psionics/events/mini_spasm.dm index d8a30ddba88..86bd0a99b94 100644 --- a/code/modules/psionics/events/mini_spasm.dm +++ b/code/modules/psionics/events/mini_spasm.dm @@ -18,7 +18,7 @@ SIGNAL SOURCE TRIANGULATED TO DISTANT SITE: All personnel are advised to avoid \ exposure to active audio transmission equipment including radio headsets and intercoms \ for the duration of the signal broadcast.", \ - "Jargon Federation Observation Probe TC-203 Sensor Array", new_sound = 'sound/misc/announcements/security_level_old.ogg', zlevels = affecting_z) + "Nralakk Federation Observation Probe TC-203 Sensor Array", new_sound = 'sound/misc/announcements/security_level_old.ogg', zlevels = affecting_z) /datum/event/minispasm/start() var/list/victims = list() @@ -62,4 +62,4 @@ /datum/event/minispasm/end() command_announcement.Announce( \ "PRIORITY ALERT: SIGNAL BROADCAST HAS CEASED. Personnel are cleared to resume use of non-hardened radio transmission equipment. Have a nice day.", \ - "Jargon Federation Observation Probe TC-203 Sensor Array", new_sound = 'sound/misc/announcements/nightlight_old.ogg', zlevels = affecting_z) + "Nralakk Federation Observation Probe TC-203 Sensor Array", new_sound = 'sound/misc/announcements/nightlight_old.ogg', zlevels = affecting_z) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm index d638aaa4508..fdc683d064b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm @@ -461,7 +461,7 @@ /decl/reagent/xuxigas name = "Xu'Xi Gas" - description = "A recreational drug hailing from Qerr'Malic that must be inhaled. It produces a mild high similar to Wulumunusha and is known to make users susceptible to persuasion. Most forms of Xu'Xi Gas found outside of the Jargon Federation are cheap, synthetic substitutes. Only works when inhaled." + description = "A recreational drug hailing from Qerr'Malic that must be inhaled. It produces a mild high similar to Wulumunusha and is known to make users susceptible to persuasion. Most forms of Xu'Xi Gas found outside of the Nralakk Federation are cheap, synthetic substitutes. Only works when inhaled." color = "#58D373" taste_description = "algae" reagent_state = GAS diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index cdc70fcbc0c..b3dc06e3283 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -4437,12 +4437,12 @@ name = "The Third Incident" color = "#1936a0" strength = 10 - description = "A controversial drink popular with the punk youth of the Jargon Federation. Represents blood, eggs, and tears." + description = "A controversial drink popular with the punk youth of the Nralakk Federation. Represents blood, eggs, and tears." taste_description = "genophage sadness" glass_icon_state = "thirdincident" glass_name = "glass of the Third Incident" - glass_desc = "A controversial drink popular with the punk youth of the Jargon Federation. Represents blood, eggs, and tears." + glass_desc = "A controversial drink popular with the punk youth of the Nralakk Federation. Represents blood, eggs, and tears." /decl/reagent/drink/upsidedowncup name = "Upside-Down Cup" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index f1af3df1941..ccd2996af08 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3927,7 +3927,7 @@ /obj/item/reagent_containers/food/snacks/skrellsnacks name = "\improper SkrellSnax" - desc = "Cured eki shipped all the way from Jargon 4, almost like jerky! Almost." + desc = "Cured eki shipped all the way from Nralakk IV, almost like jerky! Almost." icon_state = "skrellsnacks" trash = /obj/item/trash/skrellsnacks filling_color = "#A66829" @@ -4012,7 +4012,7 @@ /obj/item/reagent_containers/food/snacks/neaerakabob name = "neaera-kabob" icon_state = "neaera_skewer" - desc = "Neaera meat and organs that have been cooked on a skewer. Typical street vendor food in the Jargon Federation." + desc = "Neaera meat and organs that have been cooked on a skewer. Typical street vendor food in the Nralakk Federation." trash = /obj/item/stack/rods reagents_to_add = list(/decl/reagent/nutriment/protein/seafood = 8) reagent_data = list(/decl/reagent/nutriment/protein/seafood = list("fatty meat" = 2)) diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index e11b4c8076f..c01c812fbf6 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -78,9 +78,9 @@ desc = "A coffee cup bearing the flag of the Izweski Hegemony." icon_state = "coffeecup_hegemony" -/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/jargon - name = "\improper Jargon coffee cup" - desc = "A purple coffee cup emblazoned with the flag of the Jargon Federation." +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nralakk + name = "\improper Nralakk coffee cup" + desc = "A purple coffee cup emblazoned with the flag of the Nralakk Federation." icon_state = "coffeecup_jarg" // Organisations diff --git a/html/changelogs/jargon_to_nralakk.yml b/html/changelogs/jargon_to_nralakk.yml new file mode 100644 index 00000000000..217590ce5fd --- /dev/null +++ b/html/changelogs/jargon_to_nralakk.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - tweak: "Changes mentions of Jargon to Nralakk." \ No newline at end of file