diff --git a/Resources/Audio/_LostParadise/Weapons/Guns/Gunshots/shasspo.ogg b/Resources/Audio/_LostParadise/Weapons/Guns/Gunshots/shasspo.ogg new file mode 100644 index 00000000000..1132bcf3e7b Binary files /dev/null and b/Resources/Audio/_LostParadise/Weapons/Guns/Gunshots/shasspo.ogg differ diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl index ca7dabf4141..09685301350 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl @@ -11,3 +11,5 @@ ent-LPPClothingMilitaryWebbingSecEng = Security engineer webbing .suffix = Security ent-LPPClothingBeltMaximumWebbing = Webbing "Hamster" .desc = A set of pockets, bags and other rubbish provides a lot of space for your various things that you will stuff here. It looks extremely cumbersome, however. +ent-LPPClothingBeltSalvagerWebbing = Salvager webbing + .desc = Decommissioned military webbing that was colored in salvagers tones. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/hand/gloves.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/hand/gloves.ftl index dc677e94fbd..b155367bc56 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/hand/gloves.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/hand/gloves.ftl @@ -8,3 +8,5 @@ ent-LPPClothingHandsGlovesNightGuard = night guard battle gloves .desc = { ent-ClothingHandsGlovesBoxingBlue.desc } ent-LPPClothingHandsClownPomni = Pomni's? .desc = Good ring. +ent-LPPClothingHandsGlovesSalvage = salvager gloves + .desc = Nylon gloves with polyurethane coating for hand protection. Protects against minor cuts. It felt like they were digging into the ground. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet-eva.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet-eva.ftl index d912566e8c2..ef2c879bcb5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet-eva.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet-eva.ftl @@ -6,3 +6,5 @@ ent-LPPClothingHeadHelmetRND = RHS-14s Helmet .desc = The helmet from the NIS spacesuit is quite useful and has built-in functionality, such as chemical detection and welding protection, which is why it is quite bulky. ent-LPPClothingHeadHelmetScienceNPZ = NPZ-34r .desc = The helmet from the spacesuit is quite useful and has built-in eye protection from welding. +ent-LPPClothingHeadHelmetSecurityEngineer = FPI-72 Helmet + .desc = Standart helmet of security engineers, it has wielding protection integrated into eyes. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl index 3f6d547456c..694c0376cc0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl @@ -58,3 +58,9 @@ ent-LPPClothingHeadHelmetHardsuitGorlexMedic = GRX-113 helmet .desc = Good helmet for every needs. ent-LPPClothingHeadHelmetHardsuitGorlexSoldier = GRX-101 helmet .desc = Good helmet for every needs. +ent-LPPClothingHeadHelmetHardsuitAcientHos = NT-014 helmet + .desc = Good helmet for every needs. +ent-LPPClothingHeadHelmetHardsuitSpatioUpgraded = GRT|HpI-004 helmet + .desc = Good helmet for every needs. +ent-LPPClothingHeadHelmetHardsuitCombatAlternative = GRT|FPA-88 helmet + .desc = Good helmet for every needs. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hats.ftl index a8e31960df1..16591796422 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hats.ftl @@ -20,3 +20,5 @@ ent-LPPClothingHeadHatMaid = Maid's cap .desc = An item of clothing that is an integral part of any elite maid. ent-LPPClothingAnonMask = Anonymous mask .desc = Anon! +ent-LPPClothingHeadHatBeretSalvager = salvager beret + .desc = You are wearing it because of two things- you only flying on expeditions or your co-workers forget you on the station. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/helmet.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/helmet.ftl index e7e825bcb2a..07056e7288c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/helmet.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/helmet.ftl @@ -16,3 +16,13 @@ ent-LPPClothingHeadHelmetNPZ = NPZ Helmet .desc = A sturdy helmet made of kevlar and plasteel, will protect against small-caliber bullets, as well as shrapnel. ent-LPPClothingHeadHelmetNPZAssault = NPZ assault helmet .desc = Robust helmet with additional armor on neck, pretty good for asaults. +ent-LPPClothingHeadHelmetHeavy = Heavy armor helmet + .desc = A sturdy helmet made of kevlar and plasteel, will protect against small-caliber bullets, as well as shrapnel. +ent-LPPClothingHeadHelmetSwat = SWAT armor helmet + .desc = A sturdy helmet made of kevlar and plasteel, will protect against small-caliber bullets, as well as shrapnel. +ent-LPPClothingHeadHelmetSwatAlternative = Lightened SWAT armor helmet + .desc = A sturdy helmet made of kevlar and plasteel, will protect against small-caliber bullets, as well as shrapnel. +ent-LPPClothingHeadHelmetSwatEpistemic = Epistemic SWAT armor helmet + .desc = A sturdy helmet made of kevlar and plasteel, will protect against small-caliber bullets, as well as shrapnel. +ent-LPPClothingHeadHelmetSalvager = Salvager helmet + .desc = Sturdy metal helmet, what else do you need? diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/armor.ftl index 8772442df3b..cc20caff526 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/armor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/armor.ftl @@ -2,3 +2,7 @@ ent-LPPClothingOuterArmorBlueshield = blueshield's carapace .desc = An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest. ent-LPPClothingOuterArmorErengySyndie = anti-energy cuirass .desc = Anti-energy cuirass, that provides, no wonder, good energy protection for wearer, it sometimes can even ricoshet them. +ent-LPPlothingOuterArmorSwatAlternative = Lightened swat suit + .desc = Composed of semi-flexible polycarbonate, reinforced materials, and integrated ballistic plating, it offers exceptional protection against melee, bullet, and environmental threats, ensuring officers remain combat-ready in the harshest conditions. +ent-LPPlothingOuterArmorSwatEpistemic = Epistemic swat suit + .desc = Composed of semi-flexible polycarbonate, reinforced materials, and integrated ballistic plating, it offers exceptional protection against melee, bullet, and environmental threats, ensuring officers remain combat-ready in the harshest conditions. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl index c63981ec879..549861674b3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl @@ -64,3 +64,9 @@ ent-LPPClothingOuterHardsuitGorlexMedic = Hardsuit GRX-113 - "HyperMed" .desc = A sturdy and very heavy hardsuit for total anigilation, it gives almost perfect protection. ent-LPPClothingOuterHardsuitGorlexSoldier = Hardsuit GRX-101 - "Cyclops" .desc = A sturdy and very heavy hardsuit for total anigilation, it gives almost perfect protection. +ent-LPPClothingOuterHardsuitAcientHos = Hardsuit NT-014 - "Granite" + .desc = A sturdy and very heavy hardsuit for total anigilation, it gives almost perfect protection. +ent-LPPClothingOuterHardsuitSpatioUpgraded = Hardsuit GRT|HpI-004 - "Proskynitís" + .desc = A sturdy and very heavy hardsuit for total anigilation, it gives almost perfect protection. +ent-LPPClothingOuterHardsuitCombatAlternative = Tactical hardsuit GRT|FPA-88 - "keshik MK.I" + .desc = A purpose-built combat suit designed to protect its user against all manner of enemy combatants in low pressure environments. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/vests.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/vests.ftl index fc280498559..dc36d8e89e0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/vests.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/vests.ftl @@ -2,3 +2,5 @@ ent-LPPClothingOuterVestPG = PG west .desc = A synthetic armor vest. This one has added webbing and ballistic plates. For all PG army needs. ent-LPPClothingOuterVestUrbanPG = urban PG west .desc = A synthetic armor vest. This one has added webbing and ballistic plates. For all PG army needs. +ent-LPPClothingOuterVestSalvager = Salvager west + .desc = A synthetic armor vest. This one has added webbing and ballistic plates. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl index d82d8f1900d..6a201185254 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl @@ -142,3 +142,5 @@ ent-LPPClothingUniformGreenTracksuit = green tracksuit .desc = greeb tracksuit for sports in any situation. ent-LPPClothingUniformJumpsuitInteq = contractor jumpsuit .desc = Elite clothing for elite mercs. +ent-LPPClothingUniformExplorerAlternative = Explorer denim overalls + .desc = Made out of denim overalls are a good clothing if you are working with pickaxes a lot. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/battery/battery_guns.ftl index a937d89907f..4993341b524 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -12,3 +12,5 @@ ent-LPPWeaponEnergyGunSoleil = Hybryd module S.O.L.E.I.L. .desc = The prototype of a hybrid laser "pistol", which is a device that clings to the elbow, has lethal and non-lethal firing modes. ent-LPPWeaponEM1Gauss = EM-1 Gauss .desc = Gauss gun that fires very small projectile in a very high speed. +ent-LPPWeaponEnergyShotgunNPZ = NPZ energy shotgun + .desc = A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/projectiles/projectiles.ftl index f99b3a1f563..f913bacc399 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -8,3 +8,13 @@ ent-LPPBulletCutter = Cutter bolt .desc = Not too bad, but you still don't want to get hit by it. ent-LPPNail = Nail .desc = Not too bad, but you still don't want to get hit by it. +ent-LPPNailRifle = Rifle nail + .desc = Not too bad, but you still don't want to get hit by it. +ent-LPPBulletLebel = Lebel Bullet + .desc = Not too bad, but you still don't want to get hit by it. +ent-LPPBulletCharge2 = charge bolt + .desc = That's not a lot of damage I might say. +ent-LPPBulletchargebarrage = protocinetic barrage + .desc = { ent-LPPBulletCharge2.desc } +ent-LPPBulletChargeWeak = Weak charge bolt + .desc = Marks a target for additional damage. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/Pibodi.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/Pibodi.ftl deleted file mode 100644 index 5f1af8ae5e7..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/Pibodi.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-LPPweaponPibodi = Pibodi self-loading rifle - .desc = A hellish mix of just kinetic accelerator and classic firearms. Converts and accumulates carbon from the atmosphere into projectiles, converting part of it into a kind of gunpowder for firing, which takes quite a long time, but in the meantime you can poke your opponent with an integrated bayonet. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Salvagers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Salvagers.ftl new file mode 100644 index 00000000000..a5e8b986373 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Salvagers.ftl @@ -0,0 +1,10 @@ +ent-LPPweaponPibodi = Pibodi self-loading rifle + .desc = A hellish mix of just kinetic accelerator and classic firearms. Converts and accumulates carbon from the atmosphere into projectiles, converting part of it into a kind of gunpowder for firing, which takes quite a long time, but in the meantime you can poke your opponent with an integrated bayonet. +ent-LPPweaponShasspo = Shasspo self-loading needle rifle + .desc = A rifle that shoots needles of carbon, taking it from the atmosphere. The operating principle is similar to PSLR. Has built-in optics. +ent-LPPweaponLebel = Lebel self-loading tube rifle + .desc = Tube fed rifle that uses Pibodi technologies to produse ammunition and store it like old-fation 19 century rifle. +ent-LPPweaponManlicher = Manlicher self-loading shotgun + .desc = Double barrel self loading shotgun, works like a PCA, but shots lots of projectiles into your enemy +ent-LPPweaponSchwarzlose = Schwarzlose self-loading pistol + .desc = Protocinetic pistol, that often uses with dagger. It can marker targets for diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl index 740ff8bd1a7..aa217e049c1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl @@ -1,26 +1,2 @@ ent-ClothingNeckPinBase = pin .desc = be nothing do crime -ent-ClothingNeckLGBTPin = LGBT pin - .desc = be gay do crime -ent-ClothingNeckAromanticPin = aromantic pin - .desc = be aro do crime -ent-ClothingNeckAsexualPin = asexual pin - .desc = be ace do crime -ent-ClothingNeckBisexualPin = bisexual pin - .desc = be bi do crime -ent-ClothingNeckGayPin = gay pin - .desc = be gay do crime -ent-ClothingNeckIntersexPin = intersex pin - .desc = be intersex do crime -ent-ClothingNeckLesbianPin = lesbian pin - .desc = be lesbian do crime -ent-ClothingNeckNonBinaryPin = non-binary pin - .desc = 01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101 -ent-ClothingNeckPansexualPin = pansexual pin - .desc = be pan do crime -ent-ClothingNeckTransPin = transgender pin - .desc = be trans do crime -ent-ClothingNeckAutismPin = autism pin - .desc = be autism do crime -ent-ClothingNeckGoldAutismPin = golden autism pin - .desc = be autism do warcrime diff --git a/Resources/Locale/ru-RU/_LostParadise/update20.ftl b/Resources/Locale/ru-RU/_LostParadise/update20.ftl index d4635df4e76..ed67e06a8db 100644 --- a/Resources/Locale/ru-RU/_LostParadise/update20.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/update20.ftl @@ -1,4 +1,8 @@ lathe-category-hardsuit = Скафандры +trait-desc-ElfLanguage = + Эльфийский — это язык эльфов на котором говорят практически все кабали Эльфийской Паутины Систем. + Эльфийская речь со стороны может показаться текучей, плавной и красивой. +trait-desc-DwarfLanguage = Дварфийский это язык, на котором говорят дворфы. Со стороны, если не вслушиваться, похоже на бормотание пьяных русских. changelog-tab-title-ChangelogLPP = Обновления Lost Paradise announcer-NTH-name = N.T.H. announcer-AFONYA-name = C.A.S.S.I.E. diff --git a/Resources/Locale/ru-RU/_Shitmed/technologies/technologies.ftl b/Resources/Locale/ru-RU/_Shitmed/technologies/technologies.ftl index 2311b46316d..93269e9d170 100644 --- a/Resources/Locale/ru-RU/_Shitmed/technologies/technologies.ftl +++ b/Resources/Locale/ru-RU/_Shitmed/technologies/technologies.ftl @@ -1,3 +1,3 @@ research-technology-advanced-treatment = Усовершенствованное лечение research-technology-high-end-surgery = Высококачественные хирургические инструменты -research-technology-cybernetic-enhancements = Кибернетические усовершенствования \ No newline at end of file +research-technology-cybernetic-enhancements = Кибернетические усовершенствования diff --git a/Resources/Locale/ru-RU/chemistry/components/transformable-container-component.ftl b/Resources/Locale/ru-RU/chemistry/components/transformable-container-component.ftl index 2806deaaf87..027ba77b6a1 100644 --- a/Resources/Locale/ru-RU/chemistry/components/transformable-container-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/transformable-container-component.ftl @@ -1 +1 @@ -transformable-container-component-glass = {$reagent} стакан +transformable-container-component-glass = { $reagent } стакан diff --git a/Resources/Locale/ru-RU/cluwne/cluwne.ftl b/Resources/Locale/ru-RU/cluwne/cluwne.ftl index 7b8ac3a848e..f99fcc1ba4d 100644 --- a/Resources/Locale/ru-RU/cluwne/cluwne.ftl +++ b/Resources/Locale/ru-RU/cluwne/cluwne.ftl @@ -1,2 +1,2 @@ cluwne-transform = { CAPITALIZE($target) } превратился в клувеня! -cluwne-name-prefix = клувень {$baseName} +cluwne-name-prefix = клувень { $baseName } diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl index 0ae1e1388c1..603cf73e49d 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl @@ -19,6 +19,11 @@ ui-options-general-cursor = Курсор ui-options-general-speech = Речь ui-options-general-storage = Хранение ui-options-general-accessibility = Доступность +ui-options-chatstack = Automatically merge identical chat messages +ui-options-chatstack-off = Off +ui-options-chatstack-single = Only last message +ui-options-chatstack-double = Last two messages +ui-options-chatstack-triple = Last three messages ## Меню Аудио @@ -87,15 +92,13 @@ ui-options-vp-integer-scaling-tooltip = Если эта опция включена, окно просмотра будет масштабироваться с использованием целочисленного значения при конкретных разрешениях. Это дает четкие текстуры, но часто приводит к появлению черных полос вверху/внизу экрана или к тому, что часть окна не будет видна. ui-options-vp-vertical-fit = Вертикальное подгонка окна просмотра -ui-options-vp-vertical-fit-tooltip = - Когда включено, окно просмотра будет игнорировать горизонтальную ось полностью при подгонке под экран. Если экран меньше окна, это приведет к обрезанию окна по горизонтали. +ui-options-vp-vertical-fit-tooltip = Когда включено, окно просмотра будет игнорировать горизонтальную ось полностью при подгонке под экран. Если экран меньше окна, это приведет к обрезанию окна по горизонтали. ui-options-vp-low-res = Низкое разрешение окна просмотра ui-options-parallax-low-quality = Низкое качество параллакса (фон) ui-options-fps-counter = Показать счетчик FPS ui-options-vp-width = Ширина окна просмотра: { $width } ui-options-hud-layout = Макет HUD: - ## Меню Управления ui-options-binds-reset-all = Сбросить все привязки клавиш diff --git a/Resources/Locale/ru-RU/glue/glue.ftl b/Resources/Locale/ru-RU/glue/glue.ftl index 7be75d92cf9..2bbea71c944 100644 --- a/Resources/Locale/ru-RU/glue/glue.ftl +++ b/Resources/Locale/ru-RU/glue/glue.ftl @@ -1,5 +1,5 @@ -glue-success = Вы покрыли {THE($target)} клеем! -glued-name-prefix = липкий {$baseName} -glue-failure = Не удалось покрыть {THE($target)} клеем. +glue-success = Вы покрыли { THE($target) } клеем! +glued-name-prefix = липкий { $baseName } +glue-failure = Не удалось покрыть { THE($target) } клеем. glue-verb-text = Нанести клей glue-verb-message = Покрыть предмет клеем diff --git a/Resources/Locale/ru-RU/loadouts/generic/neck.ftl b/Resources/Locale/ru-RU/loadouts/generic/neck.ftl index 633379554f2..3b864d162f3 100644 --- a/Resources/Locale/ru-RU/loadouts/generic/neck.ftl +++ b/Resources/Locale/ru-RU/loadouts/generic/neck.ftl @@ -5,4 +5,3 @@ loadout-name-LoadoutNeckCrucifixColor = Крест (окрашиваемый) loadout-name-LoadoutNeckCrucifixColorSaintPeter = Крест Святого Петра (окрашиваемый) loadout-name-LoadoutNeckTallit = Таллит (окрашиваемый) loadout-name-LoadoutNeckBedsheetWhite = Простыня (окрашиваемый) - diff --git a/Resources/Locale/ru-RU/lube/lube.ftl b/Resources/Locale/ru-RU/lube/lube.ftl index 3aa4627c71a..0b7975ab0d2 100644 --- a/Resources/Locale/ru-RU/lube/lube.ftl +++ b/Resources/Locale/ru-RU/lube/lube.ftl @@ -1,6 +1,6 @@ -lube-success = Вы покрыли {THE($target)} смазкой! -lubed-name-prefix = смазанный {$baseName} -lube-failure = Не удалось покрыть {THE($target)} смазкой! -lube-slip = {THE($target)} выскальзывает из ваших рук! +lube-success = Вы покрыли { THE($target) } смазкой! +lubed-name-prefix = смазанный { $baseName } +lube-failure = Не удалось покрыть { THE($target) } смазкой! +lube-slip = { THE($target) } выскальзывает из ваших рук! lube-verb-text = Нанести смазку lube-verb-message = Покрыть предмет смазкой diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl index 17dc57dd210..62cb30a7d5f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl @@ -11,3 +11,5 @@ ent-LPPClothingMilitaryWebbingSecEng = РПС полевого инженера .suffix = СБ ent-LPPClothingBeltMaximumWebbing = Разгрузочный жилет "Хомяк" .desc = Комплект из карманов, сумок и прочей лабуды предоставляет кучу места для ваших всевозможных вещей, что вы сюда запихнёте. Выглядит крайне громоздко однако. +ent-LPPClothingBeltSalvagerWebbing = Утилизаторский разгрузочный жилет + .desc = Списанный разгрузочный жилет военных, который был перекрашен под цвета утилизаторов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/hand/gloves.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/hand/gloves.ftl index 684c06a0733..90daac81505 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/hand/gloves.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/hand/gloves.ftl @@ -8,3 +8,5 @@ ent-LPPClothingHandsGlovesNightGuard = Перчатки НайтГарда .desc = { ent-ClothingHandsGlovesBoxingBlue.desc } ent-LPPClothingHandsClownPomni = Перчатки шута .desc = Мягкие перчатки, создающие впечатление, будто полностью обволакивают ваши руки... +ent-LPPClothingHandsGlovesSalvage = Перчатки утилизатора + .desc = Нейлоновые перчатки с полиуретановым покрытием для защиты от царапин. Чувствуется, будто бы в этих перчатках копали землю diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet-eva.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet-eva.ftl index a0b7d77c387..c8180f79b48 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet-eva.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet-eva.ftl @@ -6,3 +6,5 @@ ent-LPPClothingHeadHelmetRND = Шлем RHS-14s .desc = Шлем от скафандра НИС, довольно полезен и имеет встроенный функционал, по типу определения жидкостей и защиту от сварки, из-за чего довольно громозок. ent-LPPClothingHeadHelmetScienceNPZ = NPZ-34r .desc = Шлем от скафандра, довольно полезен и имеет встроенную защиту глаз от сварки. +ent-LPPClothingHeadHelmetSecurityEngineer = FPI-72 Helmet + .desc = Шлем от скафандра инженера отдела службы безопасности. Имеет встроенную защиту глаз от сварки. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl index 6d6ee3158ef..38a8d9316d7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl @@ -58,3 +58,9 @@ ent-LPPClothingHeadHelmetHardsuitGorlexMedic = Шлем GRX-113 .desc = Опишите характер недомогания. ent-LPPClothingHeadHelmetHardsuitGorlexSoldier = Шлем GRX-101 .desc = Задавим их интеллектом! +ent-LPPClothingHeadHelmetHardsuitAcientHos = Шлем NT-014 + .desc = Почему всё внутри вымазано пеплом...? +ent-LPPClothingHeadHelmetHardsuitSpatioUpgraded = Шлем GRT|HpI-004 + .desc = Нет, это не жучиная броня. +ent-LPPClothingHeadHelmetHardsuitCombatAlternative = Шлем GRT|FPA-88 + .desc = Тук-тук. Кто там? Закон. Какой закон? Корпоративный. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hats.ftl index 6cf1afb5c41..27bd9db0edf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hats.ftl @@ -20,3 +20,5 @@ ent-LPPClothingHeadHatMaid = Чепчик горничной .desc = Элемент одежды, который является неотъемлимой частью любой элитной горничной. ent-LPPClothingAnonMask = Маска Анонимуса .desc = Анон! +ent-LPPClothingHeadHatBeretSalvager = Утилизаторский берет + .desc = Вы носите его по двум причинам: вы летаете только на экспедиции или ваши коллеги забывают вас на станции. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/helmet.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/helmet.ftl index 15dda810cc9..997494fd1fc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/helmet.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/helmet.ftl @@ -16,3 +16,13 @@ ent-LPPClothingHeadHelmetNPZ = Шлем НПЗ .desc = Крепкий шлем из кевлара и пластали, защитит от мелкокалиберной пули, а так же шрапнели. ent-LPPClothingHeadHelmetNPZAssault = Штурмовой шлем НПЗ .desc = Прочный шлем с дополнительной броней на шее, неплохо защищает от ударов по вашему куполу. +ent-LPPClothingHeadHelmetHeavy = Шлем тяжёлого бронекостюма + .desc = Тяжёлый и очень прочный шлем из пластали. Имеет визор для защиты от пыли, не спасёт от космоса. +ent-LPPClothingHeadHelmetSwat = Шлем брони SWAT + .desc = Шлем из кевлара и пластали. Имеет дополнительный визор. +ent-LPPClothingHeadHelmetSwatAlternative = Облегчённый шлем брони SWAT + .desc = Лёгкий шлем из уплотнёного полиэтилена. Практически не чувствуется на голове, но и не даёт серьёзной защиты. +ent-LPPClothingHeadHelmetSwatEpistemic = Эпистемический шлем SWAT + .desc = Многослоный шлем, что защищает носителя от воздействий псионики. +ent-LPPClothingHeadHelmetSalvager = Шлем утилизатора + .desc = Шлем из куска стали. Что вам ещё нужно? diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/armor.ftl index 0e6d72ebf16..67ec0201267 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/armor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/armor.ftl @@ -2,3 +2,7 @@ ent-LPPClothingOuterArmorBlueshield = Бронежилет офицера "Си .desc = Бронированный нагрудник, обеспечивающий защиту и в то же время обеспечивающий максимальную мобильность и гибкость. Выдается только лучшим на станции. ent-LPPClothingOuterArmorErengySyndie = Анти-энергитическая кираса .desc = Анти-энергетическая кираса, которая, что неудивительно, обеспечивает хорошую энергетическую защиту владельца, иногда может даже рикошетить от него. +ent-LPPlothingOuterArmorSwatAlternative = Облегчённая броня SWAT + .desc = Вариант брони из уплотнённого полиэтилена и кевларовых вставок, не сковывает движения от слова совсем. +ent-LPPlothingOuterArmorSwatEpistemic = Эпистемическая броня SWAT + .desc = Противо-псионическая броня, разработана специально для работы в зонах с повышенным уровнем глиммера и защитой от псиоников. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl index 19081a971ce..9b49819099d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl @@ -66,3 +66,9 @@ ent-LPPClothingOuterHardsuitGorlexMedic = Боевой скафандр GRX-113 .desc = Стандартная модель скафандра полевых врачей Gorlex, с большим количеством дополнительных сервоприводов, для помощи в таскании раненых и быстром передвежении владельца засчёт малой бронированности. ent-LPPClothingOuterHardsuitGorlexSoldier = Боевой скафандр GRX-101 - "Cyclops" .desc = Стандартная модель скафандров Gorlex, слегка изменённая со времён корпоративных воин, в основном с улучшением визора в шлеме, что было большим недостатком предыдущих моделей. +ent-LPPClothingOuterHardsuitAcientHos = Тактический экзокостюм NT-014 - "Granite" + .desc = Старая модель скафандров от NanoTrasen, облепленная довольно простым сплавом стали, хорошо защищает, однако крайне громоздкое, а так же шумное. +ent-LPPClothingOuterHardsuitSpatioUpgraded = Скафандр GRT|HpI-004 - "Proskynitís" + .desc = Общая разработка компании GrayTide и HpI на поприще скафандров для NanoTrasen. Не стал заменой классических моделей скафандров утлиизатора и в серию так и не пошёл. +ent-LPPClothingOuterHardsuitCombatAlternative = Тактический скафандр GRT|FPA-88 - "keshik MK.I" + .desc = Ещё одна попытка GrayTide co. производить скафандры для корпорации NanoTrasen, дизайн от GRT, однако материалы от FPA, что позволило смешать лучшее от двух- манёвриность GRT и защиту от FPA. Из-за трудностей в производстве и бюрократического ада данная модель так же не пошла в серию. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/vests.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/vests.ftl index ac390872839..411e6d02500 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/vests.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/vests.ftl @@ -2,3 +2,5 @@ ent-LPPClothingOuterVestPG = Бронежилет ПГ .desc = Оснащен стальной пластиной, хорошо защищающей от пуль. Также оснащен небольшими кармашками, в которых часто носят магазины. ent-LPPClothingOuterVestUrbanPG = Бронежилет ПГ нейтральной расцветки .desc = Оснащен стальной пластиной, хорошо защищающей от пуль. Также оснащен небольшими кармашками, в которых часто носят магазины. +ent-LPPClothingOuterVestSalvager = Бронежилет утилизатора + .desc = Жилет с кевларовыми вставками и уплотнёного полиэтилена. Имеет дополнительные карманы для ваших находок на экспедиции. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl index 9c694697a21..cd6bb372748 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl @@ -142,3 +142,5 @@ ent-LPPClothingUniformGreenTracksuit = Зелёный спортивный ко .desc = Погодите, на нём три полоски? ent-LPPClothingUniformJumpsuitInteq = Комбинезон контрактника .desc = Элитная одежда для элитных наёмников. +ent-LPPClothingUniformExplorerAlternative = Джинсовка иследователя + .desc = Сделанное из джинсовки комбинезон отлично подоходящий для работы с киркой. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/battery/battery_guns.ftl index bebaa590ba6..33de1b732dc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -13,3 +13,5 @@ ent-LPPWeaponEnergyGunSoleil = Гибридный модуль S.O.L.E.I.L. .desc = Прототип гибридного лазерного "пистолета", представляющего из себя устройство, что цепляется на локоть, имеет летальный и нелетальный режимы стрельбы. ent-LPPWeaponEM1Gauss = Гаусс пушка EM-1 .desc = Гаусс пушка, что стреляет крайне маленькими металлическими шариками, уничтожающие цели на молекулярном уровне, может пройти сквозь стекло. +ent-LPPWeaponEnergyShotgunNPZ = Энергетический дробовик "Миротворец" + .desc = Созданный на базе энергитического дробовика NT модель оружия, что используется в силовых структурах NPZ, крайне популярно среди миротворческих групп Независимого Правительства Земли. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/projectiles/projectiles.ftl index 70c153ae150..df780c4a29d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -8,3 +8,13 @@ ent-LPPBulletCutter = Режущий болт .desc = Не так уж плохо, но ты все равно не хочешь, чтобы это ударило по тебе. ent-LPPNail = Гвоздь .desc = Гвоздь программы. +ent-LPPNailRifle = Иголка + .desc = Не так уж плохо, но ты все равно не хочешь, чтобы это ударило по тебе. +ent-LPPBulletLebel = Пуля Лебеля + .desc = Не так уж плохо, но ты все равно не хочешь, чтобы это ударило по тебе. +ent-LPPBulletCharge2 = Энергетический заряд + .desc = Не так уж и много урона если честно. +ent-LPPBulletchargebarrage = Протокинетический бараж + .desc = { ent-LPPBulletCharge2.desc } +ent-LPPBulletChargeWeak = Слабый Энергетический заряд + .desc = Не помечает цели. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/Pibodi.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/Pibodi.ftl deleted file mode 100644 index 68bc40c7faa..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/Pibodi.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-LPPweaponPibodi = Самозарядная винтовка Пибоди - .desc = Адская смесь протокинетического ускорителя и классического огнестрела. Преобразует и накапливает углерод из атмосферы в снаряды, преобразовывая часть него в подобие пороха для выстрела, на что требуется довольно много времени, а пока вы можете потыкать своего противника интегрированным штыком. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Salvagers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Salvagers.ftl new file mode 100644 index 00000000000..e128a3a8fc4 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Salvagers.ftl @@ -0,0 +1,10 @@ +ent-LPPweaponPibodi = Самозарядная винтовка Пибоди + .desc = Адская смесь протокинетического ускорителя и классического огнестрела. Преобразует и накапливает углерод из атмосферы в снаряды, преобразовывая часть него в подобие пороха для выстрела, на что требуется довольно много времени, а пока вы можете потыкать своего противника интегрированным штыком. +ent-LPPweaponShasspo = Самозарядная Игольная винтовка Шасспо + .desc = Винтовка, стреляющая карбоновыми иглами, добывающими его из атмосферного углерода. Принцип работы аналогичен СВП. Имеет встроенную оптику. +ent-LPPweaponLebel = Самозарядная трубчатая винтовка Лебеля + .desc = Винтовка с трубчатым питанием, в которой используются технологии СВП для производства боеприпасов и их хранения, внешне схоже со своим оригиналом из 19 века. +ent-LPPweaponManlicher = Самозарядный дробовик Манлихера + .desc = Двуствольное самозарядное ружье, работает как протокинетик, но стреляет в противника большим количеством снарядов, прямо как дробовик. +ent-LPPweaponSchwarzlose = Самозарядный Пистолет Шварцлозе + .desc = Протокинетический пистолет, подходящий как хорошее второе оружие. Можно использовать совместно с кинжалами. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl index 77f6e5e4837..afc4475b89f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl @@ -1,3 +1,5 @@ + + ent-ClothingHeadHelmetHardsuitERTChaplain = Шлем скафандра ОБР священника .desc = Защитный костюм, который носят капитаны груп быстрого реагирования на чрезвычайные ситуации. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl index 680806dc7ab..973416d4923 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -23,7 +23,7 @@ ent-ClothingOuterHardsuitVoidParamed = Скафандр ZhP-24m "Sukunabikona" ent-ClothingOuterHardsuitMaxim = Загадочный тактический скафандр .desc = Тактический боевый скафандр старой модели. Имеет выцветшую красныую эмблему с надписью "Maxim". - Выглядит крайне прочным и лёгким... Однако вы ощущаете зловещую ауру исходящую от него. + Выглядит крайне прочным... Однако вы ощущаете зловещую ауру исходящую от него. ent-ClothingOuterHardsuitSecurity = Тактический скафандр FPA-83s - "Baghatur" .desc = Укреплённый тактический скафандр массового производства фирмы Five-Points-Armory, используется службой безопасности НаноТрейзен. diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml index e42bdd8f951..f629e99a6e8 100644 --- a/Resources/Maps/Nonstations/nukieplanet.yml +++ b/Resources/Maps/Nonstations/nukieplanet.yml @@ -2025,14 +2025,6 @@ entities: - type: Transform pos: -13.51749,24.335218 parent: 2 -- proto: ActionToggleMagbootsAdvanced - entities: - - uid: 5 - components: - - type: Transform - parent: 4 - - type: InstantAction - container: 4 - proto: Airlock entities: - uid: 6 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml index 044b149efd3..873f22680df 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml @@ -7,13 +7,3 @@ cost: 500 category: cargoproduct-category-name-cargo group: market - -- type: cargoProduct - id: CargoLuxuryHardsuit - icon: - sprite: Clothing/Head/Hardsuits/luxury.rsi - state: icon - product: CrateCargoLuxuryHardsuit - cost: 9000 - category: cargoproduct-category-name-cargo - group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml b/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml index 72c9af89380..c9bd26c28ad 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml @@ -30,16 +30,6 @@ category: cargoproduct-category-name-hardsuits group: market -- type: cargoProduct - id: LogisticsLavrionHardsuit - icon: - sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi - state: icon - product: CrateLogisticsLavrionHardsuit - cost: 9000 - category: cargoproduct-category-name-hardsuits - group: market - # Security # Can't abuse em if you only got 1, good luck spamming frezon - type: cargoProduct diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index aaa7da609d1..6c208eff45a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -69,15 +69,17 @@ - type: StorageFill contents: - id: ClothingOuterArmorSwat - amount: 2 - - id: ClothingHeadHelmetSwat - amount: 2 + - id: LPPlothingOuterArmorSwatAlternative + - id: LPPlothingOuterArmorSwatEpistemic + - id: LPPClothingOuterHardsuitSWAT - id: ClothingMaskGasSwat - amount: 2 + amount: 4 - id: ClothingHandsGlovesCombat - amount: 2 + amount: 4 - id: ClothingShoesSwat - amount: 2 + amount: 4 + - id: ClothingBeltAssault + amount: 4 - type: entity id: CrateSecuritySupplies diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 02eee486913..c68f82ec21c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -28,6 +28,7 @@ prob: 0.2 - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes! prob: 0.3 + - id: Pickaxe # LPP - type: entity id: LockerSalvageSpecialistFilled @@ -58,4 +59,4 @@ - id: ClothingNeckSalvager # DeltaV - salvage cloak prob: 0.2 - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes! - prob: 0.3 \ No newline at end of file + prob: 0.3 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 3b0998e6a89..b32cd0ccaa9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -27,6 +27,7 @@ prob: 0.3 - id: WeaponEnergyGunMini #LPP - id: LPPQMPanties #LPP + - id: ShipyardComputerCircuitboard #LPP - type: entity id: LockerCaptainFilledHardsuit @@ -318,6 +319,7 @@ #LPP - id: LPPBoxArmband - id: LPPHOSPanties + - id: WeaponEnergyShotgun - type: entity id: LockerHeadOfSecurityFilled @@ -349,6 +351,7 @@ #LPP - id: LPPBoxArmband - id: LPPHOSPanties + - id: WeaponEnergyShotgun - type: entity id: LockerFreezerVaultFilled @@ -364,4 +367,4 @@ - id: JetpackBlue - id: SpaceCash1000 - id: BeachBall - - id: BikeHorn \ No newline at end of file + - id: BikeHorn diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 148faecba21..5c2d8647877 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1495,7 +1495,7 @@ discountDownTo: Telecrystal: 7 cost: - Telecrystal: 1 + Telecrystal: 11 categories: - UplinkWearables diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml index 26f93d6531d..12017a836d6 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml @@ -57,3 +57,5 @@ id: LoadoutHeadTurbanColorable - type: loadout id: LoadoutHeadKippahColorable + - type: loadout + id: LPPLoadoutSalvageHeadBeret diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml index dcf9bbec8aa..fe88abc9921 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml @@ -135,3 +135,24 @@ id: LoadoutClothingJumpsuitSuitWhiteAlt - type: loadout id: LoadoutClothingJumpsuitSuitWhiteMob + #LPP + - type: loadout + id: LPPLoadoutCargoBlackSkirt + - type: loadout + id: LPPLoadoutSupplyChiefCargo + - type: loadout + id: LPPLoadoutSupplyChiefSkirtCargo + - type: loadout + id: LPPLoadoutCargotechjean + - type: loadout + id: LPPLoadoutTurtleneckQmCargo + - type: loadout + id: LPPLoadoutCargoSkirtleneckCargo + - type: loadout + id: LPPLoadoutGorkaCargoVarg + - type: loadout + id: LPPLoadoutGorkaCargo + - type: loadout + id: LPPLoadoutUtilCargo + - type: loadout + id: LPPLoadoutQmcCargo diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml index 5bc209e3f82..81613cd4075 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml @@ -55,6 +55,8 @@ items: - type: loadout id: LoadoutCargoOuterWinterCargo + - type: loadout + id: LoadoutCargoOuterCoatCargo - type: characterItemGroup id: LoadoutCargoTechnicianShoes diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml index 7119120999d..683cf7ad51c 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml @@ -19,7 +19,7 @@ - type: loadout id: LoadoutSalvageBeltSalvageWebbing - type: loadout - id: LoadoutSalvageBeltMilitaryWebbing + id: LPPLoadoutSalvageBeltSalvageWebbingAlt #- type: characterItemGroup # id: LoadoutSalvageSpecialistEars @@ -110,3 +110,11 @@ items: - type: loadout id: LoadoutSalvageSpecialistUniformSuit + - type: loadout + id: LPPLoadoutClothingUniformExplorerAlternative + - type: loadout + id: LPPLoadoutClothingUniformJumpsuitExpeditor + - type: loadout + id: LPPLoadoutClothingUniformJumpsuitExplorer + - type: loadout + id: LPPLoadoutClothingUniformJumpsuitMercenary diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml index 8b75b147fab..1f4d5d5ec30 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml @@ -49,3 +49,74 @@ # TODO: luxury elite bar capsule for 10k # TODO: pka mods # TODO: mining drone stuff + # LPP + - id: LPPCandy + cost: 50 + - id: LPPClothingBeltSalvagerWebbing + cost: 500 + - id: LPPClothingOuterVestSalvager + cost: 1250 + - id: LPPClothingHeadHelmetSalvager + cost: 750 + - id: LPPExpeditorCoat + cost: 350 + - id: ClothingBeltHolster + cost: 500 + - id: LPPClothingBackpackHunter + cost: 1000 + - id: HandHeldMassScannerEmpty + cost: 750 + - id: SprayPaintOrange + cost: 200 + - id: LPPClothingShoesBootsMagHunter + cost: 1500 + - id: ClothingOuterHardsuitLuxury + cost: 3000 + - id: LPPClothingOuterHardsuitMiksuit + cost: 4000 + - id: LPPClothingOuterHardsuitSpatioUpgraded + cost: 6000 + - id: LPPClothingOuterHardsuitMiningPlus + cost: 6000 + - id: LPPClothingOuterHardsuitHunter + cost: 6000 + - id: LPPClothingOuterHardsuitUpgradedMining + cost: 8000 + - id: LPPClothingOuterHardsuitMiningJuggernaut + cost: 12500 + - id: ClothingOuterHardsuitMaxim + cost: 17500 + - id: WeaponCrusherDagger + cost: 200 + - id: KukriKnife + cost: 250 + - id: Machete + cost: 750 + - id: Cutlass + cost: 500 + - id: WeaponCrusherGlaive + cost: 2000 + - id: LPPweaponSchwarzlose + cost: 2000 + - id: WeaponLaserSvalinn + cost: 3750 + - id: LPPweaponPibodi + cost: 3750 + - id: LPPweaponManlicher + cost: 4500 + - id: LPPweaponShasspo + cost: 5000 + - id: LPPweaponLebel + cost: 5000 + - id: DoubleEmergencyOxygenTankFilled + cost: 300 + - id: DoubleEmergencyNitrogenTankFilled + cost: 300 + - id: BurnAutoInjector + cost: 300 + - id: BruteAutoInjector + cost: 300 + - id: AntiPoisonMedipen + cost: 300 + - id: EmergencyMedipen + cost: 300 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml index 80a06dfb39f..2287c2cbdff 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml @@ -1,6 +1,6 @@ #Basic armor vest replacement - type: entity - parent: ClothingOuterBaseMedium + parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing] id: ClothingOuterArmorPlateCarrier name: plate carrier description: A large and bulky carrier featuring steel plates that offer decent protection against gunfire. @@ -24,7 +24,7 @@ #Alternate / slim basic armor vest replacement - type: entity - parent: ClothingOuterBaseMedium + parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing] id: ClothingOuterArmorDuraVest name: durathread vest description: A tight-fitting and sturdy armor vest, reinforced with durathread weave to protect against sharp objects and blunt force trauma. @@ -44,7 +44,7 @@ damageCoefficient: 0.90 - type: entity - parent: ClothingOuterBaseLarge + parent: [ ClothingOuterBaseLarge, AllowSuitStorageClothing] id: ClothingOuterArmorARC name: ARCS description: The Advanced Riot Control Suit, or ARCS for short, is generally regarded as far too bulky and overly hot for any practical use - but when the riots are raging, most officers invariably take great comfort from the thick and claustrophobic padding. @@ -61,8 +61,8 @@ Piercing: 0.70 Heat: 0.70 - type: ClothingSpeedModifier - walkModifier: 0.75 - sprintModifier: 0.75 + walkModifier: 0.8 + sprintModifier: 0.8 - type: ExplosionResistance # Almost as good as a plate carrier! Still not going to save you from most bombs though. damageCoefficient: 0.80 - type: GroupExamine diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml index d3451108774..108a5ce71a5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml @@ -65,11 +65,11 @@ Slash: 0.65 Piercing: 0.65 Radiation: 0.80 - Caustic: 0.80 + Caustic: 0.50 Heat: 0.80 - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 + walkModifier: 0.9 + sprintModifier: 0.9 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitCombatMedical diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index e062ff6dd9d..6f478734620 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -38,7 +38,7 @@ #SWAT Helmet - type: entity - parent: [ClothingHeadBase, ClothingHeadEVAHelmetBase] + parent: ClothingHeadBase id: ClothingHeadHelmetSwat name: SWAT helmet description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top. @@ -61,9 +61,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.85 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 Heat: 0.85 Radiation: 0.8 Caustic: 0.9 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 91f91916cbf..ffef657af14 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -8,16 +8,16 @@ description: A standard Type I armored vest that provides decent protection against most types of damage. components: - type: Sprite - sprite: Clothing/OuterClothing/Armor/security.rsi + sprite: _LostParadise/Clothing/OuterClothing/Armor/security.rsi - type: Clothing - sprite: Clothing/OuterClothing/Armor/security.rsi + sprite: _LostParadise/Clothing/OuterClothing/Armor/security.rsi #LPP - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14. modifiers: coefficients: - Blunt: 0.70 - Slash: 0.70 - Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. - Heat: 0.80 + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.65 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. + Heat: 0.7 - type: ExplosionResistance damageCoefficient: 0.90 - type: Fixtures @@ -52,9 +52,9 @@ description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station. components: - type: Sprite - sprite: Clothing/OuterClothing/Armor/riot.rsi + sprite: _LostParadise/Clothing/OuterClothing/Armor/riot.rsi #LPP - type: Clothing - sprite: Clothing/OuterClothing/Armor/riot.rsi + sprite: _LostParadise/Clothing/OuterClothing/Armor/riot.rsi #LPP - type: Armor modifiers: coefficients: @@ -74,18 +74,15 @@ description: Composed of semi-flexible polycarbonate, reinforced materials, and integrated ballistic plating, it offers exceptional protection against melee, bullet, and environmental threats, ensuring officers remain combat-ready in the harshest conditions. components: - type: Sprite - sprite: Clothing/OuterClothing/Armor/swat.rsi + sprite: _LostParadise/Clothing/OuterClothing/Armor/swat.rsi - type: Clothing - sprite: Clothing/OuterClothing/Armor/swat.rsi - - type: PressureProtection - highPressureMultiplier: 0.45 - lowPressureMultiplier: 1000 + sprite: _LostParadise/Clothing/OuterClothing/Armor/swat.rsi - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 Heat: 0.85 Radiation: 0.75 Caustic: 0.85 @@ -93,8 +90,10 @@ damageCoefficient: 0.50 - type: ClothingSpeedModifier # Burdensome for running, but perfect for speedy gliding, even though running is still probably better walkModifier: 0.9 - sprintModifier: 0.7 + sprintModifier: 0.8 - type: GroupExamine + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetSwat - type: entity parent: ClothingOuterArmorBasic @@ -103,18 +102,18 @@ description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. components: - type: Sprite - sprite: Clothing/OuterClothing/Armor/bulletproof.rsi + sprite: _LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi #LPP - type: Clothing - sprite: Clothing/OuterClothing/Armor/bulletproof.rsi + sprite: _LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi #LPP - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 + Blunt: 0.85 + Slash: 0.85 Piercing: 0.4 - Heat: 0.9 + Heat: 0.85 - type: ExplosionResistance - damageCoefficient: 0.80 + damageCoefficient: 0.75 - type: entity parent: ClothingOuterArmorBasic @@ -165,27 +164,35 @@ description: A heavily armored suit that protects against excessive damage. components: - type: Sprite - sprite: Clothing/OuterClothing/Armor/heavy.rsi + sprite: _LostParadise/Clothing/OuterClothing/Armor/heavy.rsi - type: Clothing - sprite: Clothing/OuterClothing/Armor/heavy.rsi + sprite: _LostParadise/Clothing/OuterClothing/Armor/heavy.rsi - type: Armor modifiers: coefficients: - Blunt: 0.2 - Slash: 0.2 - Piercing: 0.2 - Heat: 0.5 - Radiation: 0 - Caustic: 0.75 + Blunt: 0.45 + Slash: 0.45 + Piercing: 0.45 + Heat: 0.65 + Radiation: 0.8 + Caustic: 0.65 - type: GroupExamine - type: ClothingRequiredStepTriggerImmune slots: WITHOUT_POCKET - type: Tag tags: - FullBodyOuter + - type: ClothingSpeedModifier + walkModifier: 0.7 + sprintModifier: 0.7 + - type: HeldSpeedModifier + - type: ExplosionResistance + damageCoefficient: 0.7 + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetHeavy - type: entity - parent: ClothingOuterArmorHeavy + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] id: ClothingOuterArmorHeavyGreen name: green heavy armor suit description: A heavily armored suit with green accents that protects against excessive damage. @@ -194,9 +201,30 @@ sprite: Clothing/OuterClothing/Armor/heavygreen.rsi - type: Clothing sprite: Clothing/OuterClothing/Armor/heavygreen.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.25 + Slash: 0.25 + Piercing: 0.25 + Heat: 0.8 + Radiation: 0.8 + Caustic: 0.65 + - type: GroupExamine + - type: ClothingRequiredStepTriggerImmune + slots: WITHOUT_POCKET + - type: Tag + tags: + - FullBodyOuter + - type: ClothingSpeedModifier + walkModifier: 0.65 + sprintModifier: 0.65 + - type: HeldSpeedModifier + - type: ExplosionResistance + damageCoefficient: 0.7 - type: entity - parent: ClothingOuterArmorHeavy + parent: ClothingOuterArmorHeavyGreen id: ClothingOuterArmorHeavyRed name: red heavy armor suit description: A heavily armored suit with red accents that protects against excessive damage. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index de2589af536..270a596fb9d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -211,13 +211,13 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 + walkModifier: 0.8 + sprintModifier: 0.8 - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 + Blunt: 0.55 + Slash: 0.55 Piercing: 0.5 Heat: 0.3 Radiation: 0.1 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 9359bb0ce3e..d9522e02cbb 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -33,10 +33,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible - Slash: 0.7 - Piercing: 0.5 - Heat: 0.9 + Blunt: 0.6 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible + Slash: 0.6 + Piercing: 0.7 - type: ExplosionResistance damageCoefficient: 0.9 @@ -119,4 +118,4 @@ - type: Sprite sprite: Clothing/OuterClothing/Vests/vest_orion.rsi - type: Clothing - sprite: Clothing/OuterClothing/Vests/vest_orion.rsi \ No newline at end of file + sprite: Clothing/OuterClothing/Vests/vest_orion.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml b/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml index d7383fdddac..e98298d128d 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml @@ -235,15 +235,15 @@ map: ["Base"] - state: spray_cap_colors map: ["enum.OpenableVisuals.Layer"] - color: "#f6a44b" + color: "#99826a" - type: Paint - color: "#f6a44b" + color: "#99826a" - type: GenericVisualizer visuals: enum.OpenableVisuals.Opened: enum.OpenableVisuals.Layer: - True: {state: "spray_colors" , color: "#f6a44b"} - False: {state: "spray_cap_colors" , color: "#f6a44b"} + True: {state: "spray_colors" , color: "#99826a"} + False: {state: "spray_cap_colors" , color: "#99826a"} #Purple - type: entity diff --git a/Resources/Prototypes/Loadouts/Generic/uniform.yml b/Resources/Prototypes/Loadouts/Generic/uniform.yml index 960f70b54c0..36767b2005c 100644 --- a/Resources/Prototypes/Loadouts/Generic/uniform.yml +++ b/Resources/Prototypes/Loadouts/Generic/uniform.yml @@ -27,15 +27,6 @@ requirements: - !type:CharacterItemGroupRequirement group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Medical - - Epistemics - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - type: loadout id: LoadoutUniformJumpskirtColorWhite @@ -48,15 +39,6 @@ requirements: - !type:CharacterItemGroupRequirement group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Medical - - Epistemics - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - type: loadout id: LoadoutUniformJumpsuitFlannel diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml index 0b56ef3c912..10b009d3aa1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml @@ -72,20 +72,6 @@ items: - ClothingBeltSalvageWebbing -- type: loadout - id: LoadoutSalvageBeltMilitaryWebbing - category: JobsLogisticsSalvageSpecialist - cost: 0 - customColorTint: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSalvageSpecialistBelt - - !type:CharacterJobRequirement - jobs: - - SalvageSpecialist - items: - - ClothingBeltMilitaryWebbing - # Ears # Equipment diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index 3f2c8f11c2a..7d67fe23194 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -56,7 +56,7 @@ id: SheetPGlass1 result: SheetPGlass1 completetime: 0 - miningPoints: 16 + miningPoints: 9 materials: RawQuartz: 100 RawPlasma: 100 @@ -73,7 +73,7 @@ id: SheetRPGlass1 result: SheetRPGlass1 completetime: 0 - miningPoints: 16 + miningPoints: 9 materials: RawQuartz: 100 RawPlasma: 100 @@ -94,7 +94,7 @@ id: SheetPlasma1 result: SheetPlasma1 completetime: 0 - miningPoints: 15 + miningPoints: 8 materials: RawPlasma: 100 @@ -109,7 +109,7 @@ id: SheetPlasteel1 result: SheetPlasteel1 completetime: 0 - miningPoints: 17 + miningPoints: 10 materials: RawPlasma: 100 RawIron: 200 #Twice as durable as steel, Twice the material cost @@ -135,7 +135,7 @@ id: SheetUGlass1 result: SheetUGlass1 completetime: 0 - miningPoints: 31 + miningPoints: 13 materials: RawUranium: 100 RawQuartz: 100 @@ -152,7 +152,7 @@ id: SheetRUGlass1 result: SheetRUGlass1 completetime: 0 - miningPoints: 31 + miningPoints: 13 materials: RawUranium: 100 RawQuartz: 100 @@ -194,7 +194,7 @@ id: MaterialDiamond result: MaterialDiamond1 completetime: 0 - miningPoints: 50 + miningPoints: 35 materials: RawDiamond: 100 @@ -202,7 +202,7 @@ id: SheetUranium1 result: SheetUranium1 completetime: 0 - miningPoints: 30 + miningPoints: 12 materials: RawUranium: 100 @@ -210,7 +210,7 @@ id: IngotGold1 result: IngotGold1 completetime: 0 - miningPoints: 18 + miningPoints: 9 materials: RawGold: 100 @@ -218,7 +218,7 @@ id: IngotSilver1 result: IngotSilver1 completetime: 0 - miningPoints: 16 + miningPoints: 8 materials: RawSilver: 100 @@ -234,7 +234,7 @@ id: MaterialBananium1 result: MaterialBananium1 completetime: 0 - miningPoints: 60 + miningPoints: 10 materials: RawBananium: 100 diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 572d027b91f..e3ca07bf8b3 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -23,6 +23,8 @@ id: SalvageSpecialistGear equipment: jumpsuit: ClothingUniformJumpsuitSalvageSpecialist + outerClothing: LPPExpeditorCoat + gloves: LPPClothingHandsGlovesSalvage back: ClothingBackpackSalvageFilled shoes: ClothingShoesBootsSalvage id: SalvagePDA diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml index d6c28f4b3be..ef5669c144b 100644 --- a/Resources/Prototypes/Store/presets.yml +++ b/Resources/Prototypes/Store/presets.yml @@ -16,7 +16,6 @@ - UplinkJob - UplinkAllies - UplinkPointless - - LPPKeycards - UplinkSales currencyWhitelist: - Telecrystal diff --git a/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml b/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml index f9d6770a3bb..672bd693c80 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml @@ -8,16 +8,6 @@ category: cargoproduct-category-name-security group: market -- type: cargoProduct - id: LPPCratehunterHasLanded - icon: - sprite: _LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi - state: icon - product: LPPCratehunter - cost: 22500 - category: cargoproduct-category-name-security - group: market - - type: cargoProduct id: LPPCrateVintageDEMOCRACYhasLanded icon: @@ -27,23 +17,3 @@ cost: 19000 category: cargoproduct-category-name-security group: market - -- type: cargoProduct - id: LPPCrateCrateRodoshasLanded - icon: - sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi - state: icon - product: LPPCrateLogisticsRodosHardsuit - cost: 10000 - category: cargoproduct-category-name-hardsuits - group: market - -- type: cargoProduct - id: LPPCrateCrateKerateiahasLanded - icon: - sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi - state: icon - product: LPPCrateLogisticsKerateiaHardsuit - cost: 12000 - category: cargoproduct-category-name-hardsuits - group: market diff --git a/Resources/Prototypes/_LostParadise/Catalog/uplink.yml b/Resources/Prototypes/_LostParadise/Catalog/uplink.yml index 59661831619..886c02458a5 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/uplink.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/uplink.yml @@ -49,7 +49,7 @@ icon: { sprite: /Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon } productEntity: LPPClothingBackpackDuffelAcientSyndicateHardsuitBundle cost: - Telecrystal: 12 + Telecrystal: 15 categories: - UplinkWearables diff --git a/Resources/Prototypes/_LostParadise/CharacterItemGroups/wallets.yml b/Resources/Prototypes/_LostParadise/CharacterItemGroups/wallets.yml new file mode 100644 index 00000000000..a8bd074b28a --- /dev/null +++ b/Resources/Prototypes/_LostParadise/CharacterItemGroups/wallets.yml @@ -0,0 +1,20 @@ +- type: characterItemGroup + id: LPPLoadoutWallets + maxItems: 1 + items: + - type: loadout + id: LPPLoadoutWalletBase + - type: loadout + id: LPPLoadoutWalletDark + - type: loadout + id: LPPLoadoutWalletDarkLeather + - type: loadout + id: LPPLoadoutWalletGrey + - type: loadout + id: LPPLoadoutWalletYellow + - type: loadout + id: LPPLoadoutWalletWhite + - type: loadout + id: LPPLoadoutWalletGreen + - type: loadout + id: LPPLoadoutWalletSyndicate diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml index d038b90a85a..5d368c26855 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml @@ -86,3 +86,14 @@ - type: ClothingSpeedModifier walkModifier: 0.9 sprintModifier: 0.9 + +- type: entity + parent: ClothingBeltStorageBase + id: LPPClothingBeltSalvagerWebbing + name: Salvager webbing + description: Decommissioned military webbing that was colored in salvagers tones. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Belt/salvwebbing.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Belt/salvwebbing.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Hand/gloves.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Hand/gloves.yml index c7e7d82dab2..63110178b86 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Hand/gloves.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Hand/gloves.yml @@ -81,3 +81,20 @@ sprite: _LostParadise/Clothing/Hands/Gloves/clownPomni.rsi - type: Clothing sprite: _LostParadise/Clothing/Hands/Gloves/clownPomni.rsi + +- type: entity + parent: ClothingHandsGlovesSyntheticBase + id: LPPClothingHandsGlovesSalvage + name: salvager gloves + description: Nylon gloves with polyurethane coating for hand protection. Protects against minor cuts. It felt like they were digging into the ground. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Hands/Gloves/salvager.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Hands/Gloves/salvager.rsi + - type: Fiber + fiberColor: fibers-brown + - type: Armor + modifiers: + coefficients: + Slash: 0.95 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml index eb478e8dcce..9cacad9a748 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml @@ -20,10 +20,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.95 + Heat: 0.95 - type: TemperatureProtection coefficient: 0.005 - type: ClothingSpeedModifier @@ -50,10 +50,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 + Blunt: 0.9 + Slash: 0.85 + Piercing: 0.9 - type: TemperatureProtection coefficient: 0.005 - type: ContainerContainer @@ -118,3 +117,30 @@ Radiation: 0.3 - type: TemperatureProtection coefficient: 0.005 + +- type: entity + parent: ClothingHeadHardsuitBase + id: LPPClothingHeadHelmetSecurityEngineer + categories: [ HideSpawnMenu ] + name: FPI-72 Helmet + description: Standart helmet of security engineers, it has wielding protection integrated into eyes. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi + - type: BreathMask + - type: EyeProtection + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + Radiation: 0.8 + - type: TemperatureProtection + coefficient: 0.005 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet.yml index b28245f6a5e..9fd9dbefe40 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet.yml @@ -862,3 +862,84 @@ Slash: 0.9 Piercing: 0.9 Radiation: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingHeadHelmetHardsuitAcientHos + categories: [ HideSpawnMenu ] + name: NT-014 helmet + description: Good helmet for every needs. + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi + - type: PointLight + color: "white" + radius: 5 + energy: 3 + - type: PressureProtection + highPressureMultiplier: 0.01 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Radiation: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingHeadHelmetHardsuitSpatioUpgraded + categories: [ HideSpawnMenu ] + name: GRT|HpI-004 helmet + description: Good helmet for every needs. + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi + - type: PointLight + color: "#dff250" + radius: 7 + energy: 4 + - type: PressureProtection + highPressureMultiplier: 0.01 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Radiation: 0.8 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingHeadHelmetHardsuitCombatAlternative + categories: [ HideSpawnMenu ] + name: GRT|FPA-88 helmet + description: Good helmet for every needs. + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi + - type: PointLight + color: "#dff250" + radius: 5 + energy: 4 + - type: PressureProtection + highPressureMultiplier: 0.01 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.95 + Radiation: 0.85 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml index 266153a5b41..f4f9df95af9 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml @@ -108,7 +108,6 @@ - type: Clothing sprite: _LostParadise/Clothing/Head/Hats/maidencap.rsi - - type: entity parent: ClothingMaskBase id: LPPClothingAnonMask @@ -119,3 +118,14 @@ sprite: _LostParadise/Clothing/Head/Hats/anon.rsi - type: Clothing sprite: _LostParadise/Clothing/Head/Hats/anon.rsi + +- type: entity + parent: ClothingHeadBase + id: LPPClothingHeadHatBeretSalvager + name: salvager beret + description: You are wearing it because of two things- you only flying on expeditions or your co-workers forget you on the station. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hats/salvagerberet.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Hats/salvagerberet.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml index 83fe40e2199..04f567baf97 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml @@ -137,3 +137,186 @@ sprite: _LostParadise/Clothing/Head/Helmets/NPZ/NPZassault.rsi - type: Clothing sprite: _LostParadise/Clothing/Head/Helmets/NPZ/NPZassault.rsi + +- type: entity + parent: ClothingHeadBase + id: LPPClothingHeadHelmetHeavy + categories: [ HideSpawnMenu ] + name: Heavy armor helmet + description: A sturdy helmet made of kevlar and plasteel, will protect against small-caliber bullets, as well as shrapnel. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Helmets/heavy.rsi + layers: + - state: icon + map: [ "unfoldedLayer" ] + visible: false + - state: icon-open + visible: true + map: ["foldedLayer"] + - type: Clothing + sprite: _LostParadise/Clothing/Head/Helmets/heavy.rsi + equippedPrefix: open + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + - type: Foldable + folded: true + canFoldInsideContainer: true + unfoldVerbText: fold-zip-verb + foldVerbText: fold-unzip-verb + - type: FoldableClothing + foldedEquippedPrefix: open + foldedHeldPrefix: open + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: PressureProtection + lowPressureMultiplier: 100 + - type: BreathMask + - type: Item + heldPrefix: open + +- type: entity + parent: ClothingHeadBase + id: LPPClothingHeadHelmetSwat + categories: [ HideSpawnMenu ] + name: SWAT armor helmet + description: A sturdy helmet made of kevlar and plasteel, will protect against small-caliber bullets, as well as shrapnel. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Helmets/swat.rsi + layers: + - state: icon + map: [ "unfoldedLayer" ] + visible: false + - state: icon-open + visible: true + map: ["foldedLayer"] + - type: Clothing + sprite: _LostParadise/Clothing/Head/Helmets/swat.rsi + equippedPrefix: open + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + - type: Foldable + folded: true + canFoldInsideContainer: true + unfoldVerbText: fold-zip-verb + foldVerbText: fold-unzip-verb + - type: FoldableClothing + foldedEquippedPrefix: open + foldedHeldPrefix: open + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: PressureProtection + lowPressureMultiplier: 100 + - type: BreathMask + - type: Item + heldPrefix: open + +- type: entity + parent: ClothingHeadBase + id: LPPClothingHeadHelmetSwatAlternative + categories: [ HideSpawnMenu ] + name: Lightened SWAT armor helmet + description: A sturdy helmet made of kevlar and plasteel, will protect against small-caliber bullets, as well as shrapnel. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Helmets/swatalt.rsi + layers: + - state: icon + map: [ "unfoldedLayer" ] + visible: false + - state: icon-open + visible: true + map: ["foldedLayer"] + - type: Clothing + sprite: _LostParadise/Clothing/Head/Helmets/swatalt.rsi + equippedPrefix: open + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + - type: Foldable + folded: true + canFoldInsideContainer: true + unfoldVerbText: fold-zip-verb + foldVerbText: fold-unzip-verb + - type: FoldableClothing + foldedEquippedPrefix: open + foldedHeldPrefix: open + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: PressureProtection + lowPressureMultiplier: 100 + - type: BreathMask + - type: Item + heldPrefix: open + +- type: entity + parent: ClothingHeadBase + id: LPPClothingHeadHelmetSwatEpistemic + categories: [ HideSpawnMenu ] + name: Epistemic SWAT armor helmet + description: A sturdy helmet made of kevlar and plasteel, will protect against small-caliber bullets, as well as shrapnel. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Helmets/swatepistemic.rsi + layers: + - state: icon + map: [ "unfoldedLayer" ] + visible: false + - state: icon-open + visible: true + map: ["foldedLayer"] + - type: Clothing + sprite: _LostParadise/Clothing/Head/Helmets/swatepistemic.rsi + equippedPrefix: open + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + - type: Foldable + folded: true + canFoldInsideContainer: true + unfoldVerbText: fold-zip-verb + foldVerbText: fold-unzip-verb + - type: FoldableClothing + foldedEquippedPrefix: open + foldedHeldPrefix: open + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: PressureProtection + lowPressureMultiplier: 100 + - type: BreathMask + - type: Item + heldPrefix: open + - type: TinfoilHat + destroyOnFry: false + +- type: entity + parent: ClothingHeadHelmetBasic + id: LPPClothingHeadHelmetSalvager + name: Salvager helmet + description: Sturdy metal helmet, what else do you need? + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Helmets/salvhelmet.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Helmets/salvhelmet.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.95 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/armor.yml index 85e93d7a4d4..c6ed69194b1 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/armor.yml @@ -55,3 +55,55 @@ reflectProb: 0.9 reflects: - Energy + +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, ClothingOuterEVASuitBase] + id: LPPlothingOuterArmorSwatAlternative + name: Lightened swat suit + description: Composed of semi-flexible polycarbonate, reinforced materials, and integrated ballistic plating, it offers exceptional protection against melee, bullet, and environmental threats, ensuring officers remain combat-ready in the harshest conditions. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.50 + - type: GroupExamine + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetSwatAlternative + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 + +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, ClothingOuterEVASuitBase] + id: LPPlothingOuterArmorSwatEpistemic + name: Epistemic swat suit + description: Composed of semi-flexible polycarbonate, reinforced materials, and integrated ballistic plating, it offers exceptional protection against melee, bullet, and environmental threats, ensuring officers remain combat-ready in the harshest conditions. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.7 + Heat: 0.7 + - type: ExplosionResistance + damageCoefficient: 0.50 + - type: GroupExamine + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetSwatEpistemic + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/coats.yml index 6e0a01fe7bd..2866c8dcab5 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/coats.yml @@ -94,7 +94,7 @@ Heat: 0.9 - type: entity - parent: ClothingOuterStorageBase + parent: [ ClothingOuterStorageBase, AllowSuitStorageClothing ] id: LPPExpeditorCoat name: expeditor coat description: nice coat. diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml index 786c95c054c..c0baf9dbf58 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -27,7 +27,7 @@ - type: ToggleableClothing clothingPrototype: LPPArmorMovementHead - type: StaminaDamageResistance - coefficient: 0.7 + coefficient: 0.6 - type: entity parent: ClothingOuterHardsuitBase @@ -185,7 +185,7 @@ - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitSecurityPilot - type: StaminaDamageResistance - coefficient: 0.7 + coefficient: 0.6 - type: entity parent: ClothingOuterHardsuitBase @@ -194,9 +194,9 @@ description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. components: - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/SecEng.rsi + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi - type: Clothing - sprite: Clothing/OuterClothing/Hardsuits/SecEng.rsi + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi - type: PressureProtection highPressureMultiplier: 0.5 lowPressureMultiplier: 1000 @@ -205,19 +205,20 @@ - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.70 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 Caustic: 0.8 Heat: 0.35 + Radiation: 0.45 - type: ClothingSpeedModifier - walkModifier: 0.65 - sprintModifier: 0.65 + walkModifier: 0.9 + sprintModifier: 0.9 - type: HeldSpeedModifier - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitSecurity + clothingPrototype: LPPClothingHeadHelmetSecurityEngineer - type: StaminaDamageResistance - coefficient: 0.7 + coefficient: 0.75 - type: entity parent: ClothingOuterHardsuitBase @@ -620,11 +621,11 @@ - type: Armor modifiers: coefficients: - Blunt: 0.4 - Slash: 0.4 - Piercing: 0.5 + Blunt: 0.35 + Slash: 0.35 + Piercing: 0.65 Caustic: 0.45 - Heat: 0.75 + Heat: 1.2 Radiation: 0.3 Cold: 0.8 - type: TemperatureProtection @@ -632,8 +633,8 @@ - type: ExplosionResistance damageCoefficient: 0.7 - type: ClothingSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 + walkModifier: 0.75 + sprintModifier: 0.75 - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitUpgradedMining @@ -654,20 +655,20 @@ - type: Armor modifiers: coefficients: - Blunt: 0.55 - Slash: 0.55 + Blunt: 0.6 + Slash: 0.6 Piercing: 0.85 Caustic: 0.1 - Heat: 0.7 + Heat: 1.2 Radiation: 0.4 Cold: 0.8 - type: TemperatureProtection coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.7 + damageCoefficient: 0. - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 + walkModifier: 1.0 + sprintModifier: 1.0 - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitMiningPlus @@ -692,7 +693,6 @@ Slash: 0.25 Piercing: 0.35 Caustic: 0.05 - Heat: 0.7 Radiation: 0.05 Cold: 0.1 - type: TemperatureProtection @@ -1187,3 +1187,110 @@ - type: BiocodedClothing - type: StaminaDamageResistance coefficient: 0.5 + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitAcientHos + name: Hardsuit NT-014 - "Granite" + description: A sturdy and very heavy hardsuit for total anigilation, it gives almost perfect protection. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi + - type: PressureProtection + highPressureMultiplier: 0.1 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 + Caustic: 0.5 + Heat: 0.65 + Radiation: 0.5 + Shock: 0.5 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: ClothingSpeedModifier + walkModifier: 0.65 + sprintModifier: 0.65 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetHardsuitAcientHos + - type: StaminaDamageResistance + coefficient: 0.65 + - type: EmitsSoundOnMove + soundCollection: + collection: LPPHeavyHardsuitMovement + params: + playOffsetSeconds: 0.5 + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitSpatioUpgraded + name: Hardsuit GRT|HpI-004 - "Proskynitís" + description: A sturdy and very heavy hardsuit for total anigilation, it gives almost perfect protection. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi + - type: PressureProtection + highPressureMultiplier: 0.1 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.3 + Piercing: 0.65 + Caustic: 0.5 + Heat: 1.15 + Radiation: 0.5 + Shock: 0.5 + - type: TemperatureProtection + coefficient: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetHardsuitSpatioUpgraded + - type: StaminaDamageResistance + coefficient: 0.65 + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitCombatAlternative + name: Tactical hardsuit GRT|FPA-88 - "keshik MK.I" + description: A purpose-built combat suit designed to protect its user against all manner of enemy combatants in low pressure environments. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi + - type: PressureProtection + highPressureMultiplier: 0.50 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Radiation: 0.7 + Caustic: 0.7 + Heat: 0.7 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetHardsuitCombatAlternative diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/vests.yml index 7f9ab551b38..29548794df3 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/vests.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingOuterStorageBase + parent: [ ClothingOuterStorageBase, AllowSuitStorageClothing ] id: LPPClothingOuterVestPG name: PG west description: A synthetic armor vest. This one has added webbing and ballistic plates. For all PG army needs. @@ -19,7 +19,7 @@ damageCoefficient: 0.9 - type: entity - parent: ClothingOuterStorageBase + parent: [ ClothingOuterStorageBase, AllowSuitStorageClothing ] id: LPPClothingOuterVestUrbanPG name: urban PG west description: A synthetic armor vest. This one has added webbing and ballistic plates. For all PG army needs. @@ -37,3 +37,22 @@ Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.9 + +- type: entity + parent: [ ClothingOuterStorageBase, AllowSuitStorageClothing ] + id: LPPClothingOuterVestSalvager + name: Salvager west + description: A synthetic armor vest. This one has added webbing and ballistic plates. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.9 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/winterhuntersuit.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/winterhuntersuit.yml index 579472ec04c..3266723ff70 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/winterhuntersuit.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/winterhuntersuit.yml @@ -14,15 +14,14 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 + walkModifier: 0.85 + sprintModifier: 0.85 - type: Armor modifiers: coefficients: Blunt: 0.8 - Slash: 0.40 - Piercing: 0.65 - Heat: 0.85 + Slash: 0.4 + Piercing: 0.8 Radiation: 0.5 Caustic: 0.2 - type: ExplosionResistance diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuits.yml index c9a11caa115..2ed922ab6b9 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuits.yml @@ -756,10 +756,6 @@ sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/expeditor.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/expeditor.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - type: entity parent: ClothingUniformBase @@ -826,3 +822,14 @@ sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi + +- type: entity + parent: ClothingUniformBase + id: LPPClothingUniformExplorerAlternative + name: Explorer denim overalls + description: Made out of denim overalls are a good clothing if you are working with pickaxes a lot. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Specific/syndicate.yml index 1c33fa93a4b..ca8b2cc4e0c 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Specific/syndicate.yml @@ -99,7 +99,7 @@ - LPPStoreGorlexUplinks - type: entity - parent: [ BaseItem, StorePresetUplink ] + parent: [ BaseItem, LPPStorePresetUplinkNukie ] id: LPPBaseUplinkRadio450TC name: Syndicate uplink description: Suspiciously looking old radio... diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 7d75d50d82d..ec9d61b8f54 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -313,3 +313,49 @@ autoRechargeRate: 36 - type: Telescope - type: MultiHandedItem + +- type: entity + name: NPZ energy shotgun + parent: [BaseWeaponBattery, BaseGunWieldable] + id: LPPWeaponEnergyShotgunNPZ + description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi + - type: Gun + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletLaserSpread + fireCost: 150 + - type: BatteryWeaponFireModes + fireModes: + - proto: BulletLaserSpread + fireCost: 240 + - proto: BulletLaserSpreadNarrow + fireCost: 200 + - proto: BulletDisablerSmgSpread + fireCost: 120 + - type: Item + size: Large + shape: + - 0,0,3,1 + sprite: _LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed + - type: Battery + maxCharge: 2400 + startingCharge: 2400 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 38 + autoRechargePause: true + autoRechargePauseTime: 10 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 585a301119f..27c98201885 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -67,7 +67,7 @@ - state: grapeshot shader: unshaded - type: Projectile - impactEffect: BulletImpactEffect + impactEffect: BulletImpactEffectKinetic damage: types: Blunt: 15 @@ -271,3 +271,116 @@ impactFlash: sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/gauss.rsi state: impact_gauss + +- type: entity + id: LPPNailRifle + name: Rifle nail + parent: BaseBullet + categories: [ HideSpawnMenu ] + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Reflective + reflective: + - NonEnergy + - type: Sprite + noRot: false + sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/Nail.rsi + layers: + - state: nail + - type: Projectile + impactEffect: BulletImpactEffect + damage: + types: + Piercing: 32 + Blunt: 12 + +- type: entity + id: LPPBulletLebel + name: Lebel Bullet + parent: BaseBullet + categories: [ HideSpawnMenu ] + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Reflective + reflective: + - NonEnergy + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grapeshot + shader: unshaded + - type: Projectile + impactEffect: BulletImpactEffectKinetic + damage: + types: + Blunt: 15 + Structural: 25 + Piercing: 10 + # Short lifespan + - type: TimedDespawn + lifetime: 1 + +- type: entity + id: LPPBulletCharge2 + name: charge bolt + parent: BaseBullet + categories: [ HideSpawnMenu ] + description: That's not a lot of damage I might say. + components: + - type: Reflective + reflective: + - NonEnergy + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: chronobolt + shader: unshaded + - type: Projectile + impactEffect: BulletImpactEffectKinetic + damage: + types: + Blunt: 8 + Piercing: 2 + Structural: 45 + # Short lifespan + - type: TimedDespawn + lifetime: 0.5 + +- type: entity + name: protocinetic barrage + id: LPPBulletchargebarrage + parent: LPPBulletCharge2 + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: LPPBulletCharge2 + count: 4 + spread: 17 + +- type: entity + id: LPPBulletChargeWeak + name: Weak charge bolt + parent: BaseBullet + categories: [ HideSpawnMenu ] + description: Marks a target for additional damage. + components: + - type: Reflective + reflective: + - NonEnergy + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: chronobolt + shader: unshaded + - type: Projectile + impactEffect: BulletImpactEffectKinetic + damage: + types: + Blunt: 10 + Structural: 25 + # Short lifespan + - type: TimedDespawn + lifetime: 0.35 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/Pibodi.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/Pibodi.yml deleted file mode 100644 index 3f5d3326fa5..00000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/Pibodi.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: entity - parent: BaseItem - id: LPPweaponPibodi - name: Pibodi self-loading rifle - description: A hellish mix of just kinetic accelerator and classic firearms. Converts and accumulates carbon from the atmosphere into projectiles, converting part of it into a kind of gunpowder for firing, which takes quite a long time, but in the meantime you can poke your opponent with an integrated bayonet. - components: - - type: Sprite - sprite: _LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi - state: icon - - type: Item - sprite: _LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi - size: Huge - - type: AmmoCounter - - type: Gun - fireRate: 3.5 - selectedMode: SemiAuto - angleDecay: 45 - minAngle: 44 - maxAngle: 45 - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/_LostParadise/Weapons/Guns/Gunshots/latogunshot.ogg - useKey: false - - type: GunWieldBonus - minAngle: -43 - maxAngle: -43 - - type: RechargeBasicEntityAmmo - rechargeCooldown: 2.5 - rechargeSound: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg - - type: BasicEntityAmmoProvider - proto: LPPBulletPibodi - capacity: 1 - count: 1 - - type: MeleeWeapon - attackRate: 1.8 - damage: - types: - Piercing: 5.5 - - type: Appearance - - type: Wieldable - - type: IncreaseDamageOnWield - damage: - types: - Piercing: 8.5 - - type: Clothing - quickEquip: false - slots: - - back - - suitStorage diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Snipers/Salvagers.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Snipers/Salvagers.yml new file mode 100644 index 00000000000..8d133a05c50 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Snipers/Salvagers.yml @@ -0,0 +1,281 @@ +- type: entity + parent: BaseItem + id: LPPweaponPibodi + name: Pibodi self-loading rifle + description: A hellish mix of just kinetic accelerator and classic firearms. Converts and accumulates carbon from the atmosphere into projectiles, converting part of it into a kind of gunpowder for firing, which takes quite a long time, but in the meantime you can poke your opponent with an integrated bayonet. + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi + state: icon + - type: Item + sprite: _LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi + size: Huge + - type: AmmoCounter + - type: Gun + fireRate: 4.5 + selectedMode: SemiAuto + angleDecay: 45 + minAngle: 44 + maxAngle: 45 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_LostParadise/Weapons/Guns/Gunshots/latogunshot.ogg + - type: GunWieldBonus + minAngle: -43 + maxAngle: -43 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 4.5 + rechargeSound: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: LPPBulletPibodi + capacity: 1 + count: 1 + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.5 + damage: + types: + Piercing: 5.5 + angle: 2 + - type: Appearance + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 4.5 + Structural: 17.5 + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + - type: Execution + +- type: entity + parent: BaseItem + id: LPPweaponShasspo + name: Shasspo self-loading needle rifle + description: A rifle that shoots needles of carbon, taking it from the atmosphere. The operating principle is similar to PSLR. Has built-in optics. + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi + state: icon + - type: Item + sprite: _LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi + size: Huge + - type: AmmoCounter + - type: Gun + fireRate: 5 + selectedMode: SemiAuto + angleDecay: 45 + minAngle: 64 + maxAngle: 65 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_LostParadise/Weapons/Guns/Gunshots/shasspo.ogg + - type: GunWieldBonus + minAngle: -63 + maxAngle: -63 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 5 + rechargeSound: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: LPPNailRifle + capacity: 1 + count: 1 + - type: Appearance + - type: Wieldable + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + - type: Telescope + - type: Execution + - type: MeleeWeapon + attackRate: 1.3333 + damage: + types: + Blunt: 8.5 + bluntStaminaDamageFactor: 1.25 + swapKeys: true + disableHeavy: true + animation: WeaponArcThrust + wideAnimationRotation: 180 + soundHit: + collection: MetalThud + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 2.5 + - type: DamageOtherOnHit + staminaCost: 7.5 + +- type: entity + parent: BaseItem + id: LPPweaponLebel + name: Lebel self-loading tube rifle + description: Tube fed rifle that uses Pibodi technologies to produse ammunition and store it like old-fation 19 century rifle. + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi + state: icon + - type: Item + sprite: _LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi + size: Huge + - type: AmmoCounter + - type: Gun + fireRate: 0.5 + selectedMode: SemiAuto + angleDecay: 45 + minAngle: 64 + maxAngle: 65 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_LostParadise/Weapons/Guns/Gunshots/shasspo.ogg + - type: GunWieldBonus + minAngle: -63 + maxAngle: -63 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 8 + rechargeSound: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: LPPBulletLebel + capacity: 6 + count: 6 + - type: Appearance + - type: Wieldable + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + - type: MeleeWeapon + attackRate: 1.3333 + damage: + types: + Blunt: 8.5 + bluntStaminaDamageFactor: 1.25 + swapKeys: true + disableHeavy: true + animation: WeaponArcThrust + wideAnimationRotation: 180 + soundHit: + collection: MetalThud + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 2.5 + - type: DamageOtherOnHit + staminaCost: 7.5 + +- type: entity + parent: BaseItem + id: LPPweaponManlicher + name: Manlicher self-loading shotgun + description: Double barrel self loading shotgun, works like a PCA, but shots lots of projectiles into your enemy + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi + state: icon + - type: Item + sprite: _LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi + size: Huge + - type: AmmoCounter + - type: Gun + fireRate: 0.8 + selectedMode: SemiAuto + angleDecay: 45 + minAngle: 2 + maxAngle: 10 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg + - type: RechargeBasicEntityAmmo + rechargeCooldown: 8 + rechargeSound: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: LPPBulletchargebarrage + capacity: 2 + count: 2 + - type: Appearance + - type: Wieldable + - type: GunRequiresWield + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + - type: MeleeWeapon + attackRate: 1.3333 + damage: + types: + Blunt: 8.5 + bluntStaminaDamageFactor: 1.25 + swapKeys: true + disableHeavy: true + animation: WeaponArcThrust + wideAnimationRotation: 180 + soundHit: + collection: MetalThud + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 2.5 + - type: DamageOtherOnHit + staminaCost: 7.5 + +- type: entity + parent: BaseItem + id: LPPweaponSchwarzlose + name: Schwarzlose self-loading pistol + description: Protocinetic pistol, that often uses with dagger. It can marker targets for + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi + state: icon + - type: Item + sprite: _LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi + size: Small + - type: AmmoCounter + - type: Gun + fireRate: 1.2 + selectedMode: SemiAuto + angleDecay: 45 + minAngle: 2 + maxAngle: 5 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/plasma_cutter.ogg + - type: RechargeBasicEntityAmmo + rechargeCooldown: 4 + rechargeSound: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: LPPBulletChargeWeak + capacity: 5 + count: 5 + - type: Appearance + - type: Clothing + quickEquip: false + slots: + - belt + - suitStorage + - type: MeleeWeapon + attackRate: 1.3333 + damage: + types: + Blunt: 7.5 + bluntStaminaDamageFactor: 1.25 + swapKeys: true + disableHeavy: true + animation: WeaponArcThrust + wideAnimationRotation: 60 + soundHit: + collection: MetalThud + - type: DamageOtherOnHit + staminaCost: 7.5 diff --git a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/salvageSpecialist.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/salvageSpecialist.yml new file mode 100644 index 00000000000..dc4e4e04121 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/salvageSpecialist.yml @@ -0,0 +1,83 @@ +# Шляпы ТФ2 момент +- type: loadout + id: LPPLoadoutSalvageHeadBeret + category: JobsLogisticsSalvageSpecialist + cost: 0 + exclusive: true + items: + - LPPClothingHeadHatBeretSalvager + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHead + - !type:CharacterJobRequirement + jobs: + - SalvageSpecialist + +- type: loadout + id: LPPLoadoutSalvageBeltSalvageWebbingAlt + category: JobsLogisticsSalvageSpecialist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSalvageSpecialistBelt + - !type:CharacterJobRequirement + jobs: + - SalvageSpecialist + items: + - LPPClothingBeltSalvagerWebbing + +- type: loadout + id: LPPLoadoutClothingUniformExplorerAlternative + category: JobsLogisticsSalvageSpecialist + exclusive: true + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSalvageSpecialistUniforms + - !type:CharacterJobRequirement + jobs: + - SalvageSpecialist + items: + - LPPClothingUniformExplorerAlternative + +- type: loadout + id: LPPLoadoutClothingUniformJumpsuitExpeditor + category: JobsLogisticsSalvageSpecialist + exclusive: true + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSalvageSpecialistUniforms + - !type:CharacterJobRequirement + jobs: + - SalvageSpecialist + items: + - LPPClothingUniformJumpsuitExpeditor + +- type: loadout + id: LPPLoadoutClothingUniformJumpsuitExplorer + category: JobsLogisticsSalvageSpecialist + exclusive: true + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSalvageSpecialistUniforms + - !type:CharacterJobRequirement + jobs: + - SalvageSpecialist + items: + - ClothingUniformJumpsuitExplorer + +- type: loadout + id: LPPLoadoutClothingUniformJumpsuitMercenary + category: JobsLogisticsSalvageSpecialist + exclusive: true + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSalvageSpecialistUniforms + - !type:CharacterJobRequirement + jobs: + - SalvageSpecialist + items: + - ClothingUniformJumpsuitMercenary diff --git a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/uncategorized.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/uncategorized.yml new file mode 100644 index 00000000000..3ffcd75c56e --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/uncategorized.yml @@ -0,0 +1,154 @@ +# Общая одежда карго +- type: loadout + id: LPPLoadoutCargoBlackSkirt + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPCargoBlackSkirt + +- type: loadout + id: LPPLoadoutSupplyChiefCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPSupplyChiefCargo + +- type: loadout + id: LPPLoadoutSupplyChiefSkirtCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPSupplyChiefSkirtCargo + +- type: loadout + id: LPPLoadoutCargotechjean + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPCargotechjean + +- type: loadout + id: LPPLoadoutTurtleneckQmCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPTurtleneckQmCargo + +- type: loadout + id: LPPLoadoutCargoSkirtleneckCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPSkirtleneckCargo + +- type: loadout + id: LPPLoadoutGorkaCargoVarg + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPGorkaCargoVarg + +- type: loadout + id: LPPLoadoutGorkaCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPGorkaCargo + +- type: loadout + id: LPPLoadoutUtilCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPUtilCargo + +- type: loadout + id: LPPLoadoutQmcCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPQmcCargo + +- type: loadout + id: LoadoutCargoOuterCoatCargo + category: JobsLogisticsAUncategorized + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCargoTechnicianOuter + - !type:CharacterDepartmentRequirement + departments: + - Logistics + items: + - LPPClothingOuterCoatCargo diff --git a/Resources/Prototypes/_LostParadise/Loadouts/misc.yml b/Resources/Prototypes/_LostParadise/Loadouts/misc.yml index b8824cc2898..b2058bd007d 100644 --- a/Resources/Prototypes/_LostParadise/Loadouts/misc.yml +++ b/Resources/Prototypes/_LostParadise/Loadouts/misc.yml @@ -7,6 +7,9 @@ cost: 1 items: - LPPWalletBase + requirements: + - !type:CharacterItemGroupRequirement + group: LPPLoadoutWallets - type: loadout id: LPPLoadoutWalletDark @@ -14,6 +17,9 @@ cost: 1 items: - LPPWalletDark + requirements: + - !type:CharacterItemGroupRequirement + group: LPPLoadoutWallets - type: loadout id: LPPLoadoutWalletDarkLeather @@ -21,6 +27,9 @@ cost: 1 items: - LPPWalletDarkLeather + requirements: + - !type:CharacterItemGroupRequirement + group: LPPLoadoutWallets - type: loadout id: LPPLoadoutWalletGrey @@ -28,20 +37,30 @@ cost: 1 items: - LPPWalletGrey - + requirements: + - !type:CharacterItemGroupRequirement + group: LPPLoadoutWallets + - type: loadout id: LPPLoadoutWalletYellow category: Uncategorized cost: 1 items: - LPPWalletYellow + requirements: + - !type:CharacterItemGroupRequirement + group: LPPLoadoutWallets - type: loadout id: LPPLoadoutWalletWhite category: Uncategorized + customColorTint: true cost: 1 items: - LPPWalletWhite + requirements: + - !type:CharacterItemGroupRequirement + group: LPPLoadoutWallets - type: loadout id: LPPLoadoutWalletGreen @@ -49,10 +68,16 @@ cost: 1 items: - LPPWalletGreen + requirements: + - !type:CharacterItemGroupRequirement + group: LPPLoadoutWallets - type: loadout id: LPPLoadoutWalletSyndicate category: Uncategorized - cost: 4 + cost: 1 items: - - LPPWalletSyndicate \ No newline at end of file + - LPPWalletSyndicate + requirements: + - !type:CharacterItemGroupRequirement + group: LPPLoadoutWallets diff --git a/Resources/Prototypes/_LostParadise/Store/presets.yml b/Resources/Prototypes/_LostParadise/Store/presets.yml index 1e556b1e181..f5d426ad8f2 100644 --- a/Resources/Prototypes/_LostParadise/Store/presets.yml +++ b/Resources/Prototypes/_LostParadise/Store/presets.yml @@ -131,3 +131,26 @@ - LPPKeycards currencyWhitelist: - Telecrystal + +- type: entity + id: LPPStorePresetUplinkNukie + abstract: true + components: + - type: Store + name: store-preset-name-uplink + categories: + - UplinkWeaponry + - UplinkAmmo + - UplinkExplosives + - UplinkWearables + - UplinkChemicals + - UplinkDeception + - UplinkDisruption + - UplinkImplants + - UplinkJob + - UplinkAllies + - UplinkPointless + - UplinkSales + - LPPKeycards + currencyWhitelist: + - Telecrystal diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png index 4ef70d0751f..7db04f6495f 100644 Binary files a/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/icon.png b/Resources/Textures/Clothing/Belt/assault.rsi/icon.png index 0ba4fb5030a..141ae543081 100644 Binary files a/Resources/Textures/Clothing/Belt/assault.rsi/icon.png and b/Resources/Textures/Clothing/Belt/assault.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/assault.rsi/inhand-left.png index 9edac4c151b..dbe477c2b17 100644 Binary files a/Resources/Textures/Clothing/Belt/assault.rsi/inhand-left.png and b/Resources/Textures/Clothing/Belt/assault.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/assault.rsi/inhand-right.png index 2489dcd7ec2..6bedbe91e6e 100644 Binary files a/Resources/Textures/Clothing/Belt/assault.rsi/inhand-right.png and b/Resources/Textures/Clothing/Belt/assault.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png index 1a1268ae69c..d328e18fc2d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png index 17bca1780fa..f5bd8b306ed 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png index b38de96a660..8df74dea27e 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon-open.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon-open.png index 0bfd3d8c40c..0c45f9ea341 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon-open.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png index eb580ee76f6..70e3eee8dba 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/open-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/open-equipped-HELMET.png index ca0f4d51bc4..23124c312f5 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/open-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/open-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-reptilian.png index 89211c555f3..b94e4ea613b 100644 Binary files a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vox.png index d654e3493c9..a54c29de11c 100644 Binary files a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vox.png and b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png index 648e7e6eb15..e727dbacfcf 100644 Binary files a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK.png index 92f0cfb0134..7e221faad98 100644 Binary files a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/icon.png b/Resources/Textures/Clothing/Mask/swat.rsi/icon.png index 283c9849481..7b2c8ac5212 100644 Binary files a/Resources/Textures/Clothing/Mask/swat.rsi/icon.png and b/Resources/Textures/Clothing/Mask/swat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/swat.rsi/inhand-left.png index 43a0255de7c..7c184ed5c29 100644 Binary files a/Resources/Textures/Clothing/Mask/swat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Mask/swat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/swat.rsi/inhand-right.png index fe4301a24c1..1a551008783 100644 Binary files a/Resources/Textures/Clothing/Mask/swat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Mask/swat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 656c752597d..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-shark.png deleted file mode 100644 index b7a301e7700..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-shark.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-tajaran.png deleted file mode 100644 index 3789c384d65..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-tajaran.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-vulpkanin.png deleted file mode 100644 index 240c3fdd64d..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index dc7a7e972c0..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/icon.png deleted file mode 100644 index 29cc0098690..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/inhand-left.png deleted file mode 100644 index 7740c5ed366..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/inhand-right.png deleted file mode 100644 index 3fb36acc25e..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/equipped-INNERCLOTHING.png index 119fbdc2b3e..8788c06115e 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/icon.png index f127d6b4f6d..7a0033ae7e7 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/icon.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi/equipped-INNERCLOTHING.png index 29212f6ca00..1fe076eb131 100644 Binary files a/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json index 597fa0499fb..54601ac789b 100644 --- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json @@ -42,6 +42,18 @@ }, { "name": "diamond" + }, + { + "name": "ammonia" + }, + { + "name": "adamantine" + }, + { + "name": "copper" + }, + { + "name": "titanium" } ] } diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index a13df6f7d66..08bfcb50ae2 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -211,6 +211,10 @@ "name": "direction_wash", "directions": 4 }, + { + "name": "direction_lawyer", + "directions": 4 + }, { "name": "dock" }, diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json index 0390807b73b..1b6fcc03967 100644 --- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json @@ -234,6 +234,60 @@ { "name": "rock_andesite_west" }, + { + "name": "rock_6" + }, + { + "name": "rock_0" + }, + { + "name": "rock_2" + }, + { + "name": "rock_4" + }, + { + "name": "rock_7_two" + }, + { + "name": "rock_3" + }, + { + "name": "rock_5_two" + }, + { + "name": "rock_0_two" + }, + { + "name": "rock_4_two" + }, + { + "name": "full" + }, + { + "name": "rock_5" + }, + { + "name": "rock_1_two" + }, + { + "name": "full_two" + }, + { + "name": "rock_6_two" + }, + { + "name": "rock_2_two" + }, + { + "name": "rock_1" + }, + { + "name": "rock_7" + }, + { + "name": "rock_3_two" + }, { "name": "rock_bluespace" } diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/equipped-BELT.png b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d7c16ef3986 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/icon.png new file mode 100644 index 00000000000..0b340d2cd37 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/inhand-left.png new file mode 100644 index 00000000000..fb2f37311e2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/inhand-right.png new file mode 100644 index 00000000000..b316c804183 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/meta.json new file mode 100644 index 00000000000..64afda539d2 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Belt/salvwebbing.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from SS13", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/equipped-HAND.png b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/equipped-HAND.png new file mode 100644 index 00000000000..af022c38519 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/icon.png new file mode 100644 index 00000000000..2770ff71764 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/inhand-left.png new file mode 100644 index 00000000000..45a8eabdf79 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/inhand-right.png new file mode 100644 index 00000000000..26d41eee2b0 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/meta.json new file mode 100644 index 00000000000..6643219867b --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Hands/Gloves/salvager.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/icon-flash.png new file mode 100644 index 00000000000..a170362b400 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/icon.png new file mode 100644 index 00000000000..97298c16311 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/meta.json similarity index 75% rename from Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/meta.json rename to Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/meta.json index a272ec799f8..8cf1bc65d9f 100644 --- a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Insulgon", + "copyright": "Resprited by MegaDaimond", "size": { "x": 32, "y": 32 @@ -17,24 +17,16 @@ "name": "off-equipped-HELMET", "directions": 4 }, - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, { "name": "on-equipped-HELMET", "directions": 4 }, { - "name": "on-inhand-left", + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "on-inhand-right", + "name": "off-equipped-HELMET-shark", "directions": 4 }, { @@ -42,11 +34,11 @@ "directions": 4 }, { - "name": "on-equipped-HELMET-tajaran", + "name": "off-equipped-HELMET-reptilian", "directions": 4 }, { - "name": "off-equipped-HELMET-tajaran", + "name": "on-equipped-HELMET-tajaran", "directions": 4 }, { @@ -54,20 +46,12 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-shark", + "name": "on-equipped-HELMET-vulpkanin", "directions": 4 }, { "name": "on-equipped-HELMET-reptilian", "directions": 4 - }, - { - "name": "off-equipped-HELMET-reptilian", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..d637422c3d0 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 00000000000..c9b11b3689c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 00000000000..41480e4e313 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..23bad65570b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..49a422d928e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..295a699ad90 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 00000000000..2669765d212 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 00000000000..61cac7986b9 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..5cb75c7a00a Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..a8967102236 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hosacienthelm.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/icon-flash.png new file mode 100644 index 00000000000..6776fadd3eb Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/icon.png new file mode 100644 index 00000000000..f7cc3499080 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/meta.json new file mode 100644 index 00000000000..cf40f653ec0 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Srited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..c671b7469b3 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 00000000000..a19882c26b2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 00000000000..68bdde743e6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..239ed637547 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..aad4792336c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..265b121bd3b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 00000000000..ba131220594 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 00000000000..d86766b4bad Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..302bb2c50e5 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..3d60fdc1e32 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/huntersechelm.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..9637de10fb0 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-shark.png new file mode 100644 index 00000000000..d537ebea53c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-tajaran.png new file mode 100644 index 00000000000..2d554ae4d01 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..9cab5bb150b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..d3be8e9a2c3 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/icon.png new file mode 100644 index 00000000000..6cfa9ae3b62 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/meta.json new file mode 100644 index 00000000000..315883b6d2d --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/secenghelm.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/icon-flash.png new file mode 100644 index 00000000000..64b9cede4e6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/icon.png new file mode 100644 index 00000000000..ea2cb881df7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/meta.json new file mode 100644 index 00000000000..cf40f653ec0 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Srited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..a171e5b7e7a Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 00000000000..24c1f112840 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 00000000000..e11c2b002eb Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..bcb49c7658d Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..352bf4928cc Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..f43977d08a8 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 00000000000..4ff375ee782 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 00000000000..bd311c7e92d Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..6cc26700e05 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..26caba8c72e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/spatioupgrhelm.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/icon-flash.png index 1337314e98e..79ae2c27a00 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/icon-flash.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/icon.png index 1770fdf6a75..0d6c7b73a76 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/meta.json index a272ec799f8..db3139acbf9 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Insulgon", + "copyright": "Sprited by MegaDaimond", "size": { "x": 32, "y": 32 @@ -17,26 +17,6 @@ "name": "off-equipped-HELMET", "directions": 4 }, - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, - { - "name": "on-equipped-HELMET", - "directions": 4 - }, - { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 - }, { "name": "off-equipped-HELMET-vulpkanin", "directions": 4 @@ -49,6 +29,10 @@ "name": "off-equipped-HELMET-tajaran", "directions": 4 }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, { "name": "on-equipped-HELMET-shark", "directions": 4 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-reptilian.png index 127707810a4..abc52095ca6 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-shark.png index a49a03cb249..3868ac96a0d 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-tajaran.png index 02d0fae5d8a..918d0fdeaab 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-vulpkanin.png index 15acde49649..917c6106a7f 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET.png index 2bdd2f57a71..33d643bef1f 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-inhand-left.png deleted file mode 100644 index 5db57ef6048..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-inhand-right.png deleted file mode 100644 index d075726ca07..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-reptilian.png index a63e70d751c..bf5fb3cfe71 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-shark.png index 90a9d3514f8..9c9602cc84e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-tajaran.png index 08be742d201..cd57d9074f9 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-vulpkanin.png index 2d04571a8ca..987491ae688 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET.png index bc84ec1b242..40400e5b002 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-inhand-left.png deleted file mode 100644 index 8a5e76d6a6f..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-inhand-right.png deleted file mode 100644 index 27bd0c72617..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/swat-head.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/salvagerberet.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/salvagerberet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..0332ff1d57d Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hats/salvagerberet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/salvagerberet.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/salvagerberet.rsi/icon.png new file mode 100644 index 00000000000..8f9c9ddc4e9 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Hats/salvagerberet.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/salvagerberet.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/salvagerberet.rsi/meta.json new file mode 100644 index 00000000000..3593dd6f0a5 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/salvagerberet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..33e33c7979e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/icon-open.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/icon-open.png new file mode 100644 index 00000000000..c377c5613b0 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/icon-open.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/icon.png new file mode 100644 index 00000000000..5c3a280b99e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/meta.json new file mode 100644 index 00000000000..0313d03dc22 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "open-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/open-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/open-equipped-HELMET.png new file mode 100644 index 00000000000..8ca0abe670e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/heavy.rsi/open-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..f7f1e07c276 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/icon.png new file mode 100644 index 00000000000..ce606f572fe Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/inhand-left.png new file mode 100644 index 00000000000..3494d33d9e7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/inhand-right.png new file mode 100644 index 00000000000..e8d2131595b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/meta.json new file mode 100644 index 00000000000..b29bb167089 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/salvhelmet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "modified sprite from Jackal298 based on the sprite from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1, resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..8b6e310d1ad Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/icon-open.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/icon-open.png new file mode 100644 index 00000000000..bb7ea8e5c53 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/icon-open.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/icon.png new file mode 100644 index 00000000000..a146fedeeb1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/meta.json new file mode 100644 index 00000000000..0313d03dc22 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "open-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/open-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/open-equipped-HELMET.png new file mode 100644 index 00000000000..12717b538c6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swat.rsi/open-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..d2b3e1f3eab Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/icon-open.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/icon-open.png new file mode 100644 index 00000000000..2baf8e1e4aa Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/icon-open.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/icon.png new file mode 100644 index 00000000000..d2b41df487c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/meta.json new file mode 100644 index 00000000000..0313d03dc22 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "open-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/open-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/open-equipped-HELMET.png new file mode 100644 index 00000000000..2c9e78c856e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatalt.rsi/open-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..9510ae621ed Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/icon-open.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/icon-open.png new file mode 100644 index 00000000000..d4bd56acc99 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/icon-open.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/icon.png new file mode 100644 index 00000000000..1c3d42c4aa6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/meta.json new file mode 100644 index 00000000000..0313d03dc22 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "open-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/open-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/open-equipped-HELMET.png new file mode 100644 index 00000000000..7b71369f401 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/swatepistemic.rsi/open-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..cffb51e5e56 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..00c15a4824b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png new file mode 100644 index 00000000000..b5231fc79cd Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png new file mode 100644 index 00000000000..73de4e88941 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png new file mode 100644 index 00000000000..7be22334cce Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json new file mode 100644 index 00000000000..14ac0003d8c --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox states by Flareguy for Space Station 14, resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..4925c346798 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/icon.png new file mode 100644 index 00000000000..13caa4bf631 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/inhand-left.png new file mode 100644 index 00000000000..c8484dd2ea2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/inhand-right.png new file mode 100644 index 00000000000..cdb52b19996 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/meta.json new file mode 100644 index 00000000000..75ed7b9ac50 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/heavy.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by kuro(388673708753027083), resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..f0e99ee3c33 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..94d782ec8e8 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/icon.png new file mode 100644 index 00000000000..ee82d724205 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png new file mode 100644 index 00000000000..4782f85b2d6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png new file mode 100644 index 00000000000..003eb11b8a9 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/meta.json new file mode 100644 index 00000000000..f40acda444c --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/riot.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox state by Flareguy for Space Station 14, resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..1d9b1d14596 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..159ef887c0f Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/icon.png new file mode 100644 index 00000000000..9bb8a5d5feb Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png new file mode 100644 index 00000000000..aea0f39676c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png new file mode 100644 index 00000000000..cef6f162c71 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/meta.json new file mode 100644 index 00000000000..39c6aad91e0 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/security.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox state by Flareguy for Space Station 14, resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..7c78e2c9561 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/icon.png new file mode 100644 index 00000000000..92ad7dcc615 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/inhand-left.png new file mode 100644 index 00000000000..4bd5d6f4f36 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/inhand-right.png new file mode 100644 index 00000000000..7fe32d73d36 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/meta.json new file mode 100644 index 00000000000..7986adb1462 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..5fb48fcb5ce Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/icon.png new file mode 100644 index 00000000000..efa4926178e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/inhand-left.png new file mode 100644 index 00000000000..c8484dd2ea2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/inhand-right.png new file mode 100644 index 00000000000..cdb52b19996 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/meta.json new file mode 100644 index 00000000000..75ed7b9ac50 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatalt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by kuro(388673708753027083), resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..7b29f7ff05c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/icon.png new file mode 100644 index 00000000000..39d512ae959 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/inhand-left.png new file mode 100644 index 00000000000..c8484dd2ea2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/inhand-right.png new file mode 100644 index 00000000000..cdb52b19996 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/meta.json new file mode 100644 index 00000000000..75ed7b9ac50 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/swatepistemic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by kuro(388673708753027083), resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/expeditor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/expeditor.rsi/equipped-OUTERCLOTHING.png index fcce5712794..5607da9359a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/expeditor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/expeditor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 00000000000..d7921028783 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 00000000000..f8ebcd586c1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 00000000000..d6bcdeae038 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 00000000000..e830d1134eb Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..6b94e2e9d81 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/icon.png new file mode 100644 index 00000000000..010ad5bfc76 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/inhand-left.png new file mode 100644 index 00000000000..0175ebefc7c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/inhand-right.png new file mode 100644 index 00000000000..9d15f1335da Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/meta.json similarity index 95% rename from Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/meta.json rename to Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/meta.json index c222f1fc7a0..56dde350242 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/SecEng.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hosacient.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Spac__", + "copyright": "Made by Someone", "size": { "x": 32, "y": 32 @@ -15,27 +15,27 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-reptilian", + "name": "inhand-left", "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-shark", + "name": "inhand-right", "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-tajaran", + "name": "equipped-OUTERCLOTHING-shark", "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-vulpkanin", + "name": "equipped-OUTERCLOTHING-reptilian", "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-OUTERCLOTHING-tajaran", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-OUTERCLOTHING-vulpkanin", "directions": 4 } ] diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 00000000000..c9b0d83eba2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 00000000000..9c0ef1d77b4 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 00000000000..18c81c5075f Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 00000000000..2ca4a0112e7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..5a34398ba44 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/icon.png new file mode 100644 index 00000000000..f998378cd48 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/inhand-left.png new file mode 100644 index 00000000000..f30762d5c28 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/inhand-right.png new file mode 100644 index 00000000000..3f2098aed92 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/meta.json new file mode 100644 index 00000000000..28147693a15 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/huntersec.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Sprited by MegaDaimond.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 00000000000..446cd9dac27 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 00000000000..a13163c6120 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 00000000000..b7e86f8e3ce Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 00000000000..f8b7135c40b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..23af7256035 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/icon.png new file mode 100644 index 00000000000..ccdf57df459 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/inhand-left.png new file mode 100644 index 00000000000..f30762d5c28 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/inhand-right.png new file mode 100644 index 00000000000..3f2098aed92 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/meta.json new file mode 100644 index 00000000000..9c61d38bc4e --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/seceng.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 00000000000..52b5eca0331 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 00000000000..fc2fb2e6b47 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 00000000000..e2536fa1f82 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 00000000000..ab6926a77de Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..f2751bd80ab Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/icon.png new file mode 100644 index 00000000000..be0dfbdb194 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/inhand-left.png new file mode 100644 index 00000000000..fbc53c9c2c1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/inhand-right.png new file mode 100644 index 00000000000..0ccb463801c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/meta.json new file mode 100644 index 00000000000..2b82255fdef --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/spatioupgr.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Srited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-reptilian.png index 386a00e6393..0bf92a5bc5a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-shark.png index 59e96d0bce2..4ddbc23d5cb 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-shark.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-tajaran.png index 6bf3962f2e2..cbd687ffa53 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-vulpkanin.png index e74920ae556..a30854cf4a9 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING.png index 9f41515f57c..a4ba6a0da8a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/icon.png index 73f8375fb2f..f5736d9c77e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/inhand-left.png index 1e61d948f73..20bd12869cc 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/inhand-left.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/inhand-right.png index 42f24b9778e..3be105b2120 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/inhand-right.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/meta.json index 56dde350242..0df7fd1d072 100644 --- a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-armor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Someone", + "copyright": "Sprited by MegaDaimond", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/icon-flash.png deleted file mode 100644 index 1337314e98e..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/icon-flash.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/icon.png deleted file mode 100644 index 1770fdf6a75..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-reptilian.png deleted file mode 100644 index 127707810a4..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-shark.png deleted file mode 100644 index a49a03cb249..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-shark.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-tajaran.png deleted file mode 100644 index 02d0fae5d8a..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-tajaran.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-vulpkanin.png deleted file mode 100644 index 15acde49649..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET.png deleted file mode 100644 index 2bdd2f57a71..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-inhand-left.png deleted file mode 100644 index 5db57ef6048..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-inhand-right.png deleted file mode 100644 index d075726ca07..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-reptilian.png deleted file mode 100644 index a63e70d751c..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-shark.png deleted file mode 100644 index 90a9d3514f8..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-shark.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-tajaran.png deleted file mode 100644 index 08be742d201..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-tajaran.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-vulpkanin.png deleted file mode 100644 index 2d04571a8ca..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET.png deleted file mode 100644 index bc84ec1b242..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-inhand-left.png deleted file mode 100644 index 8a5e76d6a6f..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-inhand-right.png deleted file mode 100644 index 27bd0c72617..00000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/swat-head.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..3d3809c659c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/icon.png new file mode 100644 index 00000000000..0bc39c17900 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/inhand-left.png new file mode 100644 index 00000000000..d951e6a4339 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/inhand-right.png new file mode 100644 index 00000000000..abce2e13863 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/meta.json new file mode 100644 index 00000000000..e482264df5f --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Vests/salvagerwebvest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9086974c262 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/icon.png new file mode 100644 index 00000000000..024159d4a30 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/inhand-left.png new file mode 100644 index 00000000000..02f6f42649c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/inhand-right.png new file mode 100644 index 00000000000..34fcba2b044 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/meta.json new file mode 100644 index 00000000000..0c153d40784 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/exploreralt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a3849062b8756e3c2176fa0b9bd80aef9facc3ef | In hand sprite scaled down by ps3moira#9488", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/base.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/base.png new file mode 100644 index 00000000000..a5668303032 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/base.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..cde5a99f73f Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..cde5a99f73f Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/icon.png new file mode 100644 index 00000000000..a6eb1a1d07b Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/inhand-left.png new file mode 100644 index 00000000000..933e119176d Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/inhand-right.png new file mode 100644 index 00000000000..a18d5748b5d Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-1.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..b9d74092f6e Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-2.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000..e7b81e5990e Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-3.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..bff7f901832 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-4.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..b4eb1661e47 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/meta.json new file mode 100644 index 00000000000..2b374ec4dd8 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/wielded-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..a12882ef7df Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/wielded-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..fb5ec8b2d1e Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/npz_energy_shotgun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/equipped-BELT.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/equipped-BELT.png new file mode 100644 index 00000000000..779d3da2c3e Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..ccf58cf5b8f Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/icon.png new file mode 100644 index 00000000000..a502320d3ca Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/inhand-left.png new file mode 100644 index 00000000000..9e01ed13aa5 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/inhand-right.png new file mode 100644 index 00000000000..d735ad6c21a Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/meta.json new file mode 100644 index 00000000000..c4ccc5b68ee --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/Shvartloze.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/equipped-BACKPACK.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..f0860863223 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f0860863223 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/icon.png new file mode 100644 index 00000000000..45cee749f5c Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/inhand-left.png new file mode 100644 index 00000000000..f1cfffc7e97 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/inhand-right.png new file mode 100644 index 00000000000..e957775cd50 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/meta.json similarity index 87% rename from Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/meta.json rename to Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/meta.json index dfe9a25d8cd..d1cc3d5eba1 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/meta.json @@ -29,6 +29,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/wielded-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..16f27f44e1d Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/wielded-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..4c84949282b Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Shotguns/Manlicher.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/equipped-BACKPACK.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..a8bfeed2b7c Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..a8bfeed2b7c Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/icon.png new file mode 100644 index 00000000000..4e735cc9cd1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/inhand-left.png new file mode 100644 index 00000000000..4c239178e50 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/inhand-right.png new file mode 100644 index 00000000000..de3806d3dd1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/meta.json new file mode 100644 index 00000000000..d1cc3d5eba1 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/wielded-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..3bbb0024c21 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/wielded-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..601a1882154 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Lebel.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/equipped-BACKPACK.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/equipped-BACKPACK.png rename to Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..2277fe3c788 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/icon.png similarity index 100% rename from Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/icon.png rename to Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/icon.png diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/inhand-left.png rename to Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/inhand-left.png diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/inhand-right.png rename to Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/inhand-right.png diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/meta.json new file mode 100644 index 00000000000..d1cc3d5eba1 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/wielded-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/wielded-inhand-left.png rename to Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/wielded-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/Pibodi.rsi/wielded-inhand-right.png rename to Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Pibodi.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/equipped-BACKPACK.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..cb2a77da66b Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..cb2a77da66b Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/icon.png new file mode 100644 index 00000000000..9a3ca7deea2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/inhand-left.png new file mode 100644 index 00000000000..fafd09ab64e Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/inhand-right.png new file mode 100644 index 00000000000..382948fda32 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/meta.json new file mode 100644 index 00000000000..d1cc3d5eba1 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/wielded-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..495bc21e945 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/wielded-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..a043c56c04c Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Snipers/Shasspo.rsi/wielded-inhand-right.png differ