From 1981bc34fe361b64b919c8c441a9ec8d20a731cf Mon Sep 17 00:00:00 2001
From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:04:07 +0200
Subject: [PATCH] Changes Jargon to Nralakk (Sprites) (#14735)
---
code/_helpers/text.dm | 4 ++--
code/game/objects/structures/signs.dm | 6 +++---
code/modules/client/asset_cache.dm | 2 +-
code/modules/clothing/ears/skrell.dm | 2 +-
code/modules/clothing/factions/nralakk.dm | 4 ++--
code/modules/clothing/head/xenos/vaurca.dm | 4 ++--
code/modules/clothing/shoes/xeno/vaurca.dm | 4 ++--
.../clothing/spacesuits/rig/suits/skrell.dm | 6 +++---
code/modules/clothing/suits/modular_armor.dm | 4 ++--
code/modules/clothing/suits/xeno/vaurca.dm | 5 +++--
.../clothing/under/accessories/badges.dm | 4 ++--
.../clothing/under/accessories/xeno/skrell.dm | 4 ++--
code/modules/clothing/under/xenos/skrell.dm | 8 ++++----
code/modules/games/tarot.dm | 4 ++--
.../projectiles/guns/energy/nuclear.dm | 4 ++--
.../{jargonflag.png => nralakkflag.png} | Bin
icons/clothing/accessories/passcards.dmi | Bin 17399 -> 17399 bytes
.../kit/modular_armor_accessories.dmi | Bin 5671 -> 5673 bytes
.../clothing/rig/{jargon.dmi => nralakk.dmi} | Bin 10338 -> 10339 bytes
icons/clothing/under/shirts/skrell_casual.dmi | Bin 2656 -> 2656 bytes
icons/mob/light_overlays.dmi | Bin 6806 -> 6807 bytes
icons/mob/species/breeder/head.dmi | Bin 6945 -> 6945 bytes
icons/mob/species/breeder/inventory.dmi | Bin 7119 -> 7124 bytes
icons/mob/species/breeder/shoes.dmi | Bin 1148 -> 1149 bytes
icons/mob/species/breeder/suit.dmi | Bin 15719 -> 15719 bytes
.../{jargon_caps.dmi => nralakk_caps.dmi} | Bin
.../{jargon_cloaks.dmi => nralakk_cloaks.dmi} | Bin
...jargon_jackets.dmi => nralakk_jackets.dmi} | Bin
...rgon_uniforms.dmi => nralakk_uniforms.dmi} | Bin
...rgon_uniforms.dmi => nralakk_uniforms.dmi} | Bin
icons/obj/flags.dmi | Bin 159914 -> 159915 bytes
.../{jargonpistol.dmi => nralakkpistol.dmi} | Bin
.../guns/{jargonsmg.dmi => nralakksmg.dmi} | Bin
icons/obj/playing_cards.dmi | Bin 35265 -> 35270 bytes
34 files changed, 33 insertions(+), 32 deletions(-)
rename html/images/{jargonflag.png => nralakkflag.png} (100%)
rename icons/clothing/rig/{jargon.dmi => nralakk.dmi} (97%)
rename icons/obj/contained_items/skrell/{jargon_caps.dmi => nralakk_caps.dmi} (100%)
rename icons/obj/contained_items/skrell/{jargon_cloaks.dmi => nralakk_cloaks.dmi} (100%)
rename icons/obj/contained_items/skrell/{jargon_jackets.dmi => nralakk_jackets.dmi} (100%)
rename icons/obj/contained_items/skrell/{jargon_uniforms.dmi => nralakk_uniforms.dmi} (100%)
rename icons/obj/contained_items/vaurca/bulwark/{jargon_uniforms.dmi => nralakk_uniforms.dmi} (100%)
rename icons/obj/guns/{jargonpistol.dmi => nralakkpistol.dmi} (100%)
rename icons/obj/guns/{jargonsmg.dmi => nralakksmg.dmi} (100%)
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 9b1ea1505862a0f7c827e16da240925685186903..8a4f4b34cf5d6a0ec100ba8c2778408cd74ad1fa 100644
GIT binary patch
delta 397
zcmV;80doHLhXMD80gyR=mBDUm?Y~
zD2WH{knEn-r0#0=ubc}|*5SULxhDbMy&A0XKV)f2f4IR;26)#{`NQMHrUic`SgaYcdPe??8|r-@Ze&6yX*n`
z2H6|3g(gtYw!wmb!mp8kON#M7BEKp4BVzyFxDFIRa|r}jfBt4h1lJB+8nuB;A27(B
zF#+!7WE)A+RZ#Yv<^AG%yrH&0K?nLKqb*AESF}b?pzDC;hb(Jyu1lYP!OWHTo`Vy(UI$RH}9#Q5Zb1aFt5cHVK1DV_CWJhaEVr
zQnhMWZ%Q_i4v9`)@+JzAjM)}6EROXfD0gDY(G0__qCIk+F#-a(EB=1z{*
z^*}!HuZhzWbCYN@)75A^b53gKn_CY$YvlOCHfT`hPix7EN4>S=-r6$*UtElI%0{r%
z$kvj}Za}5=MbwLb&tzl#!pQo6aAXO1<*gR3-YUqQ(;#{1dLcthiW7G3C#zGsH
ru>-2HtbEVQlk%{1?~%Q2TdU*cpbqC#_y^B(R^~>55+DGxwgEvx4i?1E
diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi
index 1268df90022fddde742c52e3207d4ca0fed747e0..d17001b1544726c2a95e2f741886ee803cf51147 100644
GIT binary patch
delta 552
zcmV+@0@wYgEU7H8ssaHildA$Cf4=A=+ir>kK^Dy~7_>-B15u;r{<@@r-)AP$~`S|mtcrzi2cjfo;;nU}0cM?4`>E+wkV%Hd{n_+p0gBnbF
zyo;vVSHA0%(L}S4?3xL#C1bMwF+n$4vdCLfL+aP4uNi|sIz&I;`+%kjI
zoH^BUh@Qx84AQ$$NHBV`+)_1?n(A3ARd_!^{w!xroB(80k3=X{BcG`r>6jo|IRQhg
z1k%b3QyYWt6&Ym)nAn2Qe?8bJ=^O8Awx2RZ_u3%5DPD{)174`>AEp2$To^yIFz*#QCl;@t{WLbcCB}3g*L@XAh*o0EV1W+qGYOP
zNiq}g`lzf7f)4YIf!D`OA;CsEL)O|{e=YX05nzOzqi;zs7l6gbe}b@sUFr1DjDZ~2
znPG?gMj=5JQ{Mbai-26aFA!3^!jPl(oj4)gT?u5D8KicUm_8N928@#tB)38Av`6vQ
z!*J_qv^lgx9o(Ld?oG|6N7MPyc!G|>n97f?67s!tMX@z?#j!pHWmVgf-Yf*`=gP3d
q$<(GxcL8!ftq79a6`;S{-Iq_VkMmz%zX6(9`V42RzkIXW1Wgf3Y!)5>
delta 550
zcmV+>0@?kkET=56ssaHgldA$Ce?I6V+iZ#iMHbC37_>-BQ&XfsN-^B85A~qz0#1|D
zodnMT5BRu4`L_J=^z-?peEjuXyqXZjyYivDzxz^bj-vY}y?p;xY#JkV)6XxlSG`G(
zH_=qv%D1g@+JtTFgLEd|6dNrerr*C7n|)BNnV6jo|IRQf~
z1k%b3QyYTs6d7d#nAnWae>2!9=^F29cAhdt&*91;&CU+J2Lny@NNpxq@JlpxP?}`;
zg0SGv5DPD{AEs3$X1G7IFz*#(XwWQT{kj>><-?Y6gm_Of!s2~vc#SOijuLO
zCCNm<>!Y&L3u@*o1Fw&nLV}I7hU~Se{!;97BftnbMSmb`IRh*{e`bU=cBRupGX&DE
zGsBwvN+CfNQ{MbZn}A%q&k$0)z>uT%tvDg8yAa4OGe~VOF?}iy4HzdQNN$B#w@2~T
z!Eoznv^jJ_9Xy_no=wfBN7MPyc!Ku9n92{X67s!tL9sn`!6D7xD%7Yy%>a^H5Z0MY
oZQ67ZAkAq(klPBq6K{80KD|6n|98CsahUkyF05AXIP~%XLB!9blR9JLGWpiV4X>fFDZ*Bkpc$}S*y9&cF3`J-AD@3xFKC*f#
z2_-}F3&AC-W#YtOJL&It2((K}u{H_r;p%`&xHh-8hq`O!h9O$NfP(69l;UZ}M4;eu
zmV(e4O8XL%P6!H$C1|IoX$aO7Qj9i4P;ips5%i4v{4G1&^+hLM{f`^xH;h>g5w*jS
zLmHQL+q)=>B6Kq*juC?-P
Kj+WT5=X)o(8)2~k
delta 207
zcmV;=05JdKP~uRKB!9YkR9JLGWpiV4X>fFDZ*Bkpc$}S*&kBPu42RF{Qv|(_{qfq%
zP{f12f^?X*9o0fx-RtilY?qCZ+!FYGNj^vk*QV_TsQXTC7?TSND5wrcDV}c178G30
zQdo4x=DkT-X9NYsLq`*qF*;L7F}avP!AXjH)HCk&m*{xYpG0)^H*I{_Fj3|w)E*}W
zXguYx_ZkXh(a)F}HgwP;!-fd0j^jecR)z@?vVrwvbk1^IenKTQLk)G`$rmxED??8O
J1e&qvdne$DU-19{
diff --git a/icons/clothing/under/shirts/skrell_casual.dmi b/icons/clothing/under/shirts/skrell_casual.dmi
index 94d5abc63fa72d23b6e43d04bab0a4e14742d2d3..0f3a044662475a80e39494d661a09d30eb33e4bb 100644
GIT binary patch
delta 267
zcmV+m0rdXh6yOw)&VRvf!Y~Ym&&^XraG%EDx(fm!4&xOfLk+Q-rj=vX*Ixxfh$(<`
zOO*f9=ii4+?Q*@@?(FJkYkrXvb-*Yi`ru@VtPebSxdJ-o<=TfmTnyMMN1{2ZjHaK|(?9@3gB
zjCd?*@h`6^a3M6a--4R4dy0)q4Pyw-!vI7O-wJY&N_OTxV7V@fX@r6high_iBijc!
zl@}pDc@z5(&!>XfTq0P6Yhm_YS+8fZr|^Y=Lt0aX
z5qBjmp7M$U7eX`pEvOm$MDgg-kue14p$8&}Zv{C>B|GyeV7V@fX@r6high_iBijVn
zmhUo4X>`3ODc@z5(&!Gr`z{vy^4JUE*e=%d%Rl%Bx1pDS7f1HL000P)Nkl`+=nCYxQF-S
z$9RHa8r4dYIYsE<@bs*@E1Tk=hqqVNIb!R|ZO8=+K@U4eK2Xt~tt&g#8I}w^98|Xm
z2FlRG%im&cF6i3{?bEf5vO*L$7*%p8#$jy$SVGErVWGB#gv^EunyF?&5;$T>vcYZs
z!N+kOr_U|FB93Evh%7?nG0r5F9)V=m!uBT5b^0~2$rmoQ(A^HI_AyBmn}EB_@9$@Zc`+=nCYxQF-S
zX*|O)jcO&yoFepaczRadl}&Nb!`rLs9I0)|H*=3`>R{4ys!O
z17+yp3|P7-y17k3ceOVSAJ3I{lj1ridxtR9gA4n%Iv%=RMb=8w^ZuCQ7+hEkjbUhSfe^tS{3*?WRxjVdxkJY{
zd7l=S?rH~^-pVy{NqK^XIvl0=q)-VO>MRAtG*bOXslG;NG?dopIL@vR=Or{!gv13J
yN{T!CcP!92ZT{~0^55O)R%zkg>fw3J(-v#d4F;yS@&}VCQU#0RRg_|}zGE8ol13%~
diff --git a/icons/mob/species/breeder/inventory.dmi b/icons/mob/species/breeder/inventory.dmi
index 2ecda1808be9d9b27502e47b11c747c53493a857..bf0eff6cbc26b80b874d421620b02e008b88790a 100644
GIT binary patch
delta 216
zcmV;}04M*?H`F(fBmv)%B_V$}_1cR}WCwkP5nOERYAbEs^zA(iK}2-9CGdYFUowTw
zc2^ys+*h)rm~8N%U_D<*(c2~)P_SA`VaRHehbCpr1PUe>(x@HUjusOs8XFTRD5N+=
zywFg8$rj(UODP(1_y7gP>a`cykR9|DMscyJZmYC))3^691d-vETLS+_{*NqS
zpC5`7WXD2w=!11FDA=tNDSBH)0tMTR6ol4L9F`DuL{PA3&}dU@+hMYhqOv}Kf>er&
z*9{KyNH!hMZltKN)-O62x@vD+J0CmO
zE)oVdz;yahOsNmXwF=}oPJtZTXkge+a`SC^+nQ;K-nM3D_aXYX@)Gh>2HCNYZ<1yj
N1-eL}akC5o$QnW$WCZ{K
diff --git a/icons/mob/species/breeder/shoes.dmi b/icons/mob/species/breeder/shoes.dmi
index 4a7788b5267568989cd8ccd1ce338dad51c225a2..c42a92ec1594e79f2437aa76a4c8533cb1a97b17 100644
GIT binary patch
delta 42
zcmV+_0M-Be2>l3#-&dU_cvO3X>j&c>xpS;5uM1?+zST6s|-x6qJZvkU=n1F<6$
AHUIzs
delta 41
xcmey%@rPqVC1cmbswxRD9k27}4=?qOJb3jy>zi5z7V&`nzB$~+%C00D<_QkPZg0&q^pW9E9IasrH;$j7(MN(q#$F~;&8+EzC>#oFuHx^c
za5#MZ!b+{sqwU5yGNprd82u|~lr{TU}lZ78v6Q$Lb&oSPD5
SUD-G9`=e@2SAw0f)sj4WZ%~E+
delta 164
zcmV;V09*g(dgpqOJ%2D1h2gnBjTCc?7!wiFBx7X_Fhv;BX9JO-fM;AXsqKyQD%vqjEB-3i}EHEgvy0E>I
zz~J!p^DA{skFK9Wbd(Od+hkwqs*i5rbau5ohWURdj>9sf{uvXSHk6pOsozC8s=HS;R&nZ36Laz7J5`zbVOxyV{&P5bZKvH004NLm6yA2+%OPD>(y5fb|2*7
zcAH?0U<>;f7GrTF5~4|B$dw~~eF{C+NgT{gCjo~%BT{!L-J9=^KhDqQ^mJ}Umf}-1
zNAvLMb8~p}wmNe(-@Y~n$G&%Uxha(@o1?kw0`-@d^povfbFf~2iaDAu&7l)|<>h)u
z#pnDUd-xdZ0`=-#U7-FFpt&xhVo@m2FsRm*1H>DtyQ|R1QdpI5AYk87UGL{NE`wL?
zD+kCoQg@dW`ZTKQ1p~}02<$h-RD}vheam+g+4UQ&7h%(@kDk;DRu0f_r0(u~p=hs8
z&)EthS=&%u-;>RMRNYln|4sr0+*n}oeTw?hvv^BU568*@HEtvj4z?7lFM2#y5DCbJ
z>iQIHACgR}eggshjsp9W1xQ8~C>B|eOdv)~i2356`{IE3;(+)ZXFczZGm>@38OiyJ
z=fXjiE*PL)L0#M?3cmWJ_xGIy^fwkbSFHfq^;V$ZE*$cIG2tW0lvz4%q38c=1oV0F
z=NP@RnZ{(xko0D{lRzam7HFt#tM}5jMcQcF0zP4jzlQH&pn~6U{J6jTkK=}NU;R&kY36Laz6?#-ybVOxyV{&P5bZKvH004NLm6ywI+b|GC*Vb1M$-d|#
zTW<;nffvay7!z?MvSLVLNGp}Uz6(9uJcQdm{5ARymRUGFdNTn4Y&
z7Y>lGr0y;$^l4PpGX|I!P!~svsR|X=Z}=4j3b=vwB5Zo|(UV%i!U6h~)ZLvg6z$pR
zAzMHsXe+Agd$O5-symD7-$uPiWEtpM5eR-oX{9P%=M;UmeESvqc^>;G#7^m_5<
z8oja$jmefF>CJQ_fl96{&`{e}@1<>vw9&Q&e8Lug3~yneg5Pj_+@Jo(@xdb9G)^S}
zeQm~oA{I~=4=GL*^{4On_p)}U!q0jJo|$~0*6Ba0k=Z}
G0%&fIJrRTe
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 3ebf26c05bb958622c401a0fff312cb9c89267dd..e042e93509cd1fcc81fe09b1a92e48590fbeb815 100644
GIT binary patch
delta 663
zcmV;I0%-lglLE$*0+1wsdwNt@bVOxyV{&P5bZKvH004NLt(VPi+b|5r&+$_T?R6No
zZrClCA;r)`ivfE8fsq(nu_QW@94~qL9h_#nXr>Gy7YF$BXMTvJ^(ekS|9E*5yVsZI
zj3FBGVk^FW{M2kFqf;lg;>%OB>Cm)Yn*YQE3B^`CXjJ_}v(YAhM6ng0o6RAB!}<9x
zQV_J|`e`8{1y
z1YR%4K5NxDaHVm7qQK@3=o2W*sDZ|^QPGjr+!mX){DTR)BL{|=?Z30-X2<69D)g>q
z)o8sl%(}kI3oFa@Cc#memMN1RXv1a7gwX<w$}kKT=f6}QXm@m(MCn%a;F|4wB#kaA!VHT)@(F?TDXX
z@vzMdjx{jVfzNjT8enh7%=B49i;03$md1+tYdr*uIt9df(19>BC)UvRmLQ={1Qp{x
zlc`8MjRXCE&TXYNz=Mfhje|IMr*t&>1i4kR0vH2Csz&pMx>^H|eDMg2_R1GKqnKZ-
zbU4U)q%U7y>{Z4NbC_
xvAxZy#u%7cvA?tdu2nYDOw^b4GvHA?zwN~C^`-d<0|&WOVApR(yGCHXWL_OY@(YAfecb2aT$KXg1n^gebP+bF`t@!W~#!5ThVybmVy<>(ug>u_p|LK|d`d<40E>784>f2g8cI
z4eY86MHxO&&q&gJu`(v`8iFneIgrP=sNY#oy;QWEkARx35Uw8llKJ6CAvBzBLY@2r5uM8PRbW4+w99)d-k0%A4hK$x+I6|kKpNT?G*y-lCU)Po(z
zfqv&E(F)#w-o&oP0i0V>IvRa~-1Jxhi~%B5qj^JJC6DvuOKmIK3t#MvVt${}elKSe
zU%sx`i;NxSu4ARsY=TpTK92SxQ!pBRg+6vhB{_i2Tyx4%qdkrlHaSo1+}(M_yf()Q
sCU9lN{@ez*)bN2TQJ>daz@vD1e-_VgugxDlT1)5ztoiOAv#0_dhiIljk^lez