diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index acdd9f270ee..126694bd0c5 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_nralakk\]", "") + 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_nralakk\]") + 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/structures/signs.dm b/code/game/objects/structures/signs.dm index 30325c34175..8349cdb514e 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -590,13 +590,13 @@ /obj/structure/sign/flag/nralakk name = "Nralakk Federation flag" desc = "The insignia of the Nralakk Federation." - icon_state = "jargon" + icon_state = "nralakk" /obj/structure/sign/flag/nralakk/left - icon_state = "jargon_l" + icon_state = "nralakk_l" /obj/structure/sign/flag/nralakk/right - icon_state = "jargon_r" + icon_state = "nralakk_r" /obj/item/flag/nralakk name = "Nralakk Federation flag" diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index b48c59cadec..9e9eedde672 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -429,7 +429,7 @@ var/list/asset_datums = list() "solflag.png" = 'html/images/solflag.png', "cocflag.png" = 'html/images/cocflag.png', "domflag.png" = 'html/images/domflag.png', - "jargonflag.png" = 'html/images/jargonflag.png', + "nralakkflag.png" = 'html/images/nralakkflag.png', "praflag.png" = 'html/images/praflag.png', "dpraflag.png" = 'html/images/dpraflag.png', "nkaflag.png" = 'html/images/nkaflag.png', diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index b37eb386ea2..4c0b95b7b3e 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -211,7 +211,7 @@ /obj/item/clothing/ears/skrell/workcap name = "Worker's Cap" desc = "A simple clothing item used by Skrell to cover their headtails. It comes with a main sleeve for the middle headtail, with smaller sleeves for the outer headtails to help keep it in place." - icon = 'icons/obj/contained_items/skrell/jargon_caps.dmi' + icon = 'icons/obj/contained_items/skrell/nralakk_caps.dmi' item_state = "skrell_cap" icon_state = "skrell_cap_item" diff --git a/code/modules/clothing/factions/nralakk.dm b/code/modules/clothing/factions/nralakk.dm index 647296ecd13..ea9003852ee 100644 --- a/code/modules/clothing/factions/nralakk.dm +++ b/code/modules/clothing/factions/nralakk.dm @@ -76,5 +76,5 @@ /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" + icon_state = "nralakk_skrell_hawaiian" + item_state = "nralakk_skrell_hawaiian" diff --git a/code/modules/clothing/head/xenos/vaurca.dm b/code/modules/clothing/head/xenos/vaurca.dm index 028bf2c83e3..09c37f54145 100644 --- a/code/modules/clothing/head/xenos/vaurca.dm +++ b/code/modules/clothing/head/xenos/vaurca.dm @@ -23,5 +23,5 @@ /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" + item_state = "hive_rep_shroud_nralakk" + icon_state = "hive_rep_shroud_nralakk" diff --git a/code/modules/clothing/shoes/xeno/vaurca.dm b/code/modules/clothing/shoes/xeno/vaurca.dm index 2b561b471ca..e01807be963 100644 --- a/code/modules/clothing/shoes/xeno/vaurca.dm +++ b/code/modules/clothing/shoes/xeno/vaurca.dm @@ -46,5 +46,5 @@ /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" + item_state = "hive_rep_shoes_nralakk" + icon_state = "hive_rep_shoes_nralakk" diff --git a/code/modules/clothing/spacesuits/rig/suits/skrell.dm b/code/modules/clothing/spacesuits/rig/suits/skrell.dm index 71b7a2bbc5f..624809aadef 100644 --- a/code/modules/clothing/spacesuits/rig/suits/skrell.dm +++ b/code/modules/clothing/spacesuits/rig/suits/skrell.dm @@ -1,12 +1,12 @@ /obj/item/clothing/head/helmet/space/rig/skrell - light_overlay = "helmet_light_jargon_rig" + light_overlay = "helmet_light_nralakk_rig" light_color = LIGHT_COLOR_CYAN /obj/item/rig/skrell 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" + icon = 'icons/clothing/rig/nralakk.dmi' + icon_state = "nralakk_rig" suit_type = "nralakk suit" armor = list( melee = ARMOR_MELEE_VERY_HIGH, diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 7a9ed97a475..b3b22f0236a 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -470,8 +470,8 @@ 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" + icon_state = "flagpatch_nralakk" + item_state = "flagpatch_nralakk" /obj/item/clothing/accessory/flagpatch/pra name = "pra flagpatch" diff --git a/code/modules/clothing/suits/xeno/vaurca.dm b/code/modules/clothing/suits/xeno/vaurca.dm index 540aef8911f..70f16cb4952 100644 --- a/code/modules/clothing/suits/xeno/vaurca.dm +++ b/code/modules/clothing/suits/xeno/vaurca.dm @@ -47,6 +47,7 @@ desc = "A large piece of clothing used by K'lax representatives." item_state = "hive_rep_clothes_klax" icon_state = "hive_rep_clothes_klax" + /obj/item/clothing/suit/vaurca/breeder/cthur name = "c'thur representative clothes" desc = "A large piece of clothing used by C'thur representatives." @@ -56,5 +57,5 @@ /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" + item_state = "hive_rep_clothes_nralakk" + icon_state = "hive_rep_clothes_nralakk" diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 131c5c7f24f..8264ade96cf 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -542,8 +542,8 @@ /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" + icon_state = "passport_nralakk" + item_state = "passport_nralakk" open = CLOSED var/credit_score = 5 var/species_tag = "" diff --git a/code/modules/clothing/under/accessories/xeno/skrell.dm b/code/modules/clothing/under/accessories/xeno/skrell.dm index 23ccd31123e..f2b6f29414b 100644 --- a/code/modules/clothing/under/accessories/xeno/skrell.dm +++ b/code/modules/clothing/under/accessories/xeno/skrell.dm @@ -3,8 +3,8 @@ name = "Ox cloak" desc = "A plain cloak that denotes the wearer as being an Ox-class worker." 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' + icon = 'icons/obj/contained_items/skrell/nralakk_cloaks.dmi' + icon_override = 'icons/obj/contained_items/skrell/nralakk_cloaks.dmi' item_state = "ox_cloak" icon_state = "cloak_item" flippable = FALSE diff --git a/code/modules/clothing/under/xenos/skrell.dm b/code/modules/clothing/under/xenos/skrell.dm index a60c301f5a8..a76333d5e64 100644 --- a/code/modules/clothing/under/xenos/skrell.dm +++ b/code/modules/clothing/under/xenos/skrell.dm @@ -55,9 +55,9 @@ 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 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' + icon = 'icons/obj/contained_items/skrell/nralakk_uniforms.dmi' sprite_sheets = list( - BODYTYPE_VAURCA_BULWARK = 'icons/obj/contained_items/vaurca/bulwark/jargon_uniforms.dmi' + BODYTYPE_VAURCA_BULWARK = 'icons/obj/contained_items/vaurca/bulwark/nralakk_uniforms.dmi' ) item_state = "ox_sci" icon_state = "ox_sci" @@ -187,7 +187,7 @@ name = "Ox research jacket" desc = "A plain, utilitarian jacket that signifies the wearer as a Tertiary Numerical in a scientific field." 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' + icon = 'icons/obj/contained_items/skrell/nralakk_jackets.dmi' item_state = "ox_sci_jacket" icon_state = "ox_sci_jacket" contained_sprite = TRUE @@ -340,7 +340,7 @@ name = "star coat" desc = "A very fashionable coat, that traps moisture and provides good insulation. Starry patterns have been woven into its fabric." desc_fluff = "The patterns typically represent the constellations visible from the home system of the wearer. Coats like this one are usually very personal and custom made." - icon = 'icons/obj/contained_items/skrell/jargon_jackets.dmi' + icon = 'icons/obj/contained_items/skrell/nralakk_jackets.dmi' item_state = "starcoat" icon_state = "starcoat" contained_sprite = TRUE diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index bd16193c597..3b7f2d5f6e0 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -65,7 +65,7 @@ /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" + icon_state = "deck_nralakk" /obj/item/deck/tarot/nralakk/generate_deck() var/datum/playingcard/P @@ -118,7 +118,7 @@ /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" + icon_state = "deck_nonnralakk" /obj/item/deck/tarot/nonnralakk/generate_deck() var/datum/playingcard/P diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 9944b5122fd..47e9fc0ad25 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -215,7 +215,7 @@ /obj/item/gun/energy/gun/skrell/pistol name = "nralakk particle pistol" desc = "A Nralakk Federation particle-beam pistol with two settings: Disable and Lethal." - icon = 'icons/obj/guns/jargonpistol.dmi' + icon = 'icons/obj/guns/nralakkpistol.dmi' icon_state = "particlepistol" item_state = "particlepistol" slot_flags = SLOT_BELT|SLOT_HOLSTER @@ -231,7 +231,7 @@ /obj/item/gun/energy/gun/skrell/smg 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 = 'icons/obj/guns/nralakksmg.dmi' icon_state = "particlesmg" item_state = "particlesmg" slot_flags = SLOT_BELT|SLOT_HOLSTER|SLOT_BACK diff --git a/html/images/jargonflag.png b/html/images/nralakkflag.png similarity index 100% rename from html/images/jargonflag.png rename to html/images/nralakkflag.png diff --git a/icons/clothing/accessories/passcards.dmi b/icons/clothing/accessories/passcards.dmi index 9b1ea150586..8a4f4b34cf5 100644 Binary files a/icons/clothing/accessories/passcards.dmi and b/icons/clothing/accessories/passcards.dmi differ diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi index 1268df90022..d17001b1544 100644 Binary files a/icons/clothing/kit/modular_armor_accessories.dmi and b/icons/clothing/kit/modular_armor_accessories.dmi differ diff --git a/icons/clothing/rig/jargon.dmi b/icons/clothing/rig/nralakk.dmi similarity index 97% rename from icons/clothing/rig/jargon.dmi rename to icons/clothing/rig/nralakk.dmi index c3069ed07cc..454efa83788 100644 Binary files a/icons/clothing/rig/jargon.dmi and b/icons/clothing/rig/nralakk.dmi differ diff --git a/icons/clothing/under/shirts/skrell_casual.dmi b/icons/clothing/under/shirts/skrell_casual.dmi index 94d5abc63fa..0f3a0446624 100644 Binary files a/icons/clothing/under/shirts/skrell_casual.dmi and b/icons/clothing/under/shirts/skrell_casual.dmi differ diff --git a/icons/mob/light_overlays.dmi b/icons/mob/light_overlays.dmi index 6f214afb00a..31bc1840fc3 100644 Binary files a/icons/mob/light_overlays.dmi and b/icons/mob/light_overlays.dmi differ diff --git a/icons/mob/species/breeder/head.dmi b/icons/mob/species/breeder/head.dmi index 1cf6721555a..920c48c06fd 100644 Binary files a/icons/mob/species/breeder/head.dmi and b/icons/mob/species/breeder/head.dmi differ diff --git a/icons/mob/species/breeder/inventory.dmi b/icons/mob/species/breeder/inventory.dmi index 2ecda1808be..bf0eff6cbc2 100644 Binary files a/icons/mob/species/breeder/inventory.dmi and b/icons/mob/species/breeder/inventory.dmi differ diff --git a/icons/mob/species/breeder/shoes.dmi b/icons/mob/species/breeder/shoes.dmi index 4a7788b5267..c42a92ec159 100644 Binary files a/icons/mob/species/breeder/shoes.dmi and b/icons/mob/species/breeder/shoes.dmi differ diff --git a/icons/mob/species/breeder/suit.dmi b/icons/mob/species/breeder/suit.dmi index b430220bd24..3a17b773523 100644 Binary files a/icons/mob/species/breeder/suit.dmi and b/icons/mob/species/breeder/suit.dmi differ diff --git a/icons/obj/contained_items/skrell/jargon_caps.dmi b/icons/obj/contained_items/skrell/nralakk_caps.dmi similarity index 100% rename from icons/obj/contained_items/skrell/jargon_caps.dmi rename to icons/obj/contained_items/skrell/nralakk_caps.dmi diff --git a/icons/obj/contained_items/skrell/jargon_cloaks.dmi b/icons/obj/contained_items/skrell/nralakk_cloaks.dmi similarity index 100% rename from icons/obj/contained_items/skrell/jargon_cloaks.dmi rename to icons/obj/contained_items/skrell/nralakk_cloaks.dmi diff --git a/icons/obj/contained_items/skrell/jargon_jackets.dmi b/icons/obj/contained_items/skrell/nralakk_jackets.dmi similarity index 100% rename from icons/obj/contained_items/skrell/jargon_jackets.dmi rename to icons/obj/contained_items/skrell/nralakk_jackets.dmi diff --git a/icons/obj/contained_items/skrell/jargon_uniforms.dmi b/icons/obj/contained_items/skrell/nralakk_uniforms.dmi similarity index 100% rename from icons/obj/contained_items/skrell/jargon_uniforms.dmi rename to icons/obj/contained_items/skrell/nralakk_uniforms.dmi diff --git a/icons/obj/contained_items/vaurca/bulwark/jargon_uniforms.dmi b/icons/obj/contained_items/vaurca/bulwark/nralakk_uniforms.dmi similarity index 100% rename from icons/obj/contained_items/vaurca/bulwark/jargon_uniforms.dmi rename to icons/obj/contained_items/vaurca/bulwark/nralakk_uniforms.dmi diff --git a/icons/obj/flags.dmi b/icons/obj/flags.dmi index 550e12e27f0..25c1075a2c1 100644 Binary files a/icons/obj/flags.dmi and b/icons/obj/flags.dmi differ diff --git a/icons/obj/guns/jargonpistol.dmi b/icons/obj/guns/nralakkpistol.dmi similarity index 100% rename from icons/obj/guns/jargonpistol.dmi rename to icons/obj/guns/nralakkpistol.dmi diff --git a/icons/obj/guns/jargonsmg.dmi b/icons/obj/guns/nralakksmg.dmi similarity index 100% rename from icons/obj/guns/jargonsmg.dmi rename to icons/obj/guns/nralakksmg.dmi diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi index 3ebf26c05bb..e042e93509c 100644 Binary files a/icons/obj/playing_cards.dmi and b/icons/obj/playing_cards.dmi differ