From cc669caa0a992bfdab7f458a3ad11b598d076697 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:08:22 +0200 Subject: [PATCH] Merge pull request #571 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Mags * Fix Security Gear * Nano Machine Son * Merge branch 'new-frontiers-14:master' into CombatMagboots * PirateMags * Merge branch 'CombatMagboots' of https://github.com/dvir001/frontier-… * CombatBoots * MAGS * Missing Info --- .../Catalog/Fills/Lockers/heads.yml | 3 +- .../Catalog/Fills/Lockers/security.yml | 1 + .../Catalog/Fills/Lockers/suit_storage.yml | 9 ++- .../VendingMachines/Inventories/secdrobe.yml | 3 +- .../Roles/Jobs/Command/head_of_personnel.yml | 2 +- .../Roles/Jobs/Security/brigmedic.yml | 3 +- .../Roles/Jobs/Security/head_of_security.yml | 2 +- .../Roles/Jobs/Security/security_cadet.yml | 4 +- .../_NF/Catalog/Fills/Items/misc.yml | 17 +++++ .../_NF/Catalog/Fills/Lockers/security.yml | 3 +- .../Catalog/Fills/Lockers/suit_storage.yml | 2 +- .../_NF/Entities/Clothing/Shoes/magboots.yml | 71 ++++++++++++++++++ .../Roles/Jobs/Security/prisonguard.yml | 11 ++- .../Boots/magboots-syndicate.rsi/meta.json | 2 +- .../magboots-combat.rsi/equipped-FEET.png | Bin 0 -> 1210 bytes .../Boots/magboots-combat.rsi/icon-on.png | Bin 0 -> 493 bytes .../Shoes/Boots/magboots-combat.rsi/icon.png | Bin 0 -> 491 bytes .../Boots/magboots-combat.rsi/inhand-left.png | Bin 0 -> 390 bytes .../magboots-combat.rsi/inhand-right.png | Bin 0 -> 392 bytes .../Shoes/Boots/magboots-combat.rsi/meta.json | 41 ++++++++++ .../magboots-combat.rsi/on-equipped-FEET.png | Bin 0 -> 1057 bytes .../magboots-combat.rsi/on-inhand-left.png | Bin 0 -> 370 bytes .../magboots-combat.rsi/on-inhand-right.png | Bin 0 -> 389 bytes .../magboots-pirate.rsi/equipped-FEET.png | Bin 0 -> 1325 bytes .../Boots/magboots-pirate.rsi/icon-on.png | Bin 0 -> 558 bytes .../Shoes/Boots/magboots-pirate.rsi/icon.png | Bin 0 -> 579 bytes .../Boots/magboots-pirate.rsi/inhand-left.png | Bin 0 -> 415 bytes .../magboots-pirate.rsi/inhand-right.png | Bin 0 -> 435 bytes .../Shoes/Boots/magboots-pirate.rsi/meta.json | 41 ++++++++++ .../magboots-pirate.rsi/on-equipped-FEET.png | Bin 0 -> 1258 bytes .../magboots-pirate.rsi/on-inhand-left.png | Bin 0 -> 486 bytes .../magboots-pirate.rsi/on-inhand-right.png | Bin 0 -> 491 bytes 32 files changed, 198 insertions(+), 17 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/on-equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/on-inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/on-inhand-right.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index bbc173e519c..f0a5c6b81a3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -355,7 +355,8 @@ - id: OxygenTankFilled # Frontier - id: JetpackSecurityFilled # Frontier - id: HandheldGPSBasic # Frontier - + - id: ClothingShoesBootsMagCombatFilled # Frontier + - type: entity id: LockerHeadOfSecurityFilled suffix: Filled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index cfe9d42f6d1..95ac0e5e975 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -28,6 +28,7 @@ - id: ClothingMaskGasSecurity # Frontier - id: JetpackSecurityFilled # Frontier - id: HandheldGPSBasic # Frontier + - id: ClothingShoesBootsMagCombatFilled # Frontier - type: entity id: LockerWardenFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 006320a878c..62139b378f8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -90,6 +90,7 @@ - id: ClothingMaskGas - id: JetpackBlackFilled # Frontier - id: HandheldGPSBasic # Frontier + - id: ClothingShoesBootsMagPirateFilled # Frontier #NTSRA Voidsuit - type: entity @@ -174,7 +175,7 @@ - id: ClothingMaskBreath - id: JetpackSecurityFilled # Frontier - id: HandheldGPSBasic # Frontier -# - id: ClothingShoesBootsMagCombatFilled # Frontier + - id: ClothingShoesBootsMagCombatFilled # Frontier - type: AccessReader access: [["Security"]] @@ -246,7 +247,7 @@ - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat - id: HandheldGPSBasic # Frontier -# - id: ClothingShoesBootsMagCombatFilled # Frontier + - id: ClothingShoesBootsMagCombatFilled # Frontier - type: AccessReader access: [["HeadOfSecurity"]] @@ -264,7 +265,7 @@ - id: ClothingMaskBreath - id: JetpackSecurityFilled # Frontier - id: HandheldGPSBasic # Frontier -# - id: ClothingShoesBootsMagCombatFilled # Frontier + - id: ClothingShoesBootsMagCombatFilled # Frontier - type: AccessReader access: [["Armory"]] @@ -335,7 +336,7 @@ - id: JetpackBlackFilled # Frontier - id: HandheldGPSBasic # Frontier - id: HandheldGPSBasic # Frontier -# - id: ClothingShoesBootsMagPirateFilled # Frontier - TODO: Add this ones its ready + - id: ClothingShoesBootsMagPirateFilled # Frontier #Wizard - type: entity diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 6b142a6762f..4383de1711d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -15,9 +15,10 @@ ClothingUniformJumpsuitSecGrey: 3 ClothingUniformJumpskirtSecGrey: 3 ClothingUniformJumpsuitSecBlue: 3 - ClothingHeadsetSecuritySafe: 3 # Ask SR or Sheriff for keys + ClothingHeadsetSecuritySafe: 3 # Frontier - Ask SR or Sheriff for keys ClothingOuterWinterSec: 2 ClothingOuterArmorBasic: 2 ClothingOuterArmorBasicSlim: 2 ClothingEyesBlindfold: 1 ClothingShoesBootsCombat: 1 + ClothingShoesBootsMagCombat: 1 # Frontier diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 4cd2edba14e..6341d80ee69 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -11,7 +11,7 @@ startingGear: HoPGear icon: "JobIconHeadOfPersonnel" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-centcom # Frontier canBeAntag: false access: - Command diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml index 44cc90312b3..0decdec2a8f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -29,13 +29,14 @@ jumpsuit: ClothingUniformJumpsuitBrigmedic outerClothing: ClothingOuterCoatAMG back: ClothingBackpackBrigmedicFilled - shoes: ClothingShoesBootsJack + shoes: ClothingShoesBootsCombatFilled gloves: ClothingHandsGlovesNitrile eyes: ClothingEyesHudMedical head: ClothingHeadHatBeretSecurity id: BrigmedicPDA ears: ClothingHeadsetBrigmedic belt: ClothingBeltMedicalFilled + pocket1: WeaponPistolMk58Nonlethal # Frontier innerClothingSkirt: ClothingUniformJumpskirtBrigmedic satchel: ClothingBackpackSatchelBrigmedicFilled duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 55c3ebed9c3..76158212fe1 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -23,7 +23,7 @@ startingGear: HoSGear icon: "JobIconHeadOfSecurity" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-hop # Frontier whitelistRequired: true canBeAntag: false access: diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 4371bd7a12a..baaaa541c07 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -12,12 +12,14 @@ inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" - supervisors: job-supervisors-security + supervisors: job-supervisors-hos # Frontier canBeAntag: false access: - Security - Brig - Maintenance + - Service # Frontier + - External # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml new file mode 100644 index 00000000000..5755ad6305d --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml @@ -0,0 +1,17 @@ +- type: entity + id: ClothingShoesBootsMagCombatFilled + parent: ClothingShoesBootsMagCombat + suffix: Filled + components: + - type: StorageFill + contents: + - id: CombatKnife + +- type: entity + id: ClothingShoesBootsMagPirateFilled + parent: ClothingShoesBootsMagPirate + suffix: Filled + components: + - type: StorageFill + contents: + - id: KukriKnife diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml index b21fb645e28..147241c1f66 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml @@ -36,6 +36,7 @@ - id: ClothingMaskBreathMedicalSecurity - id: JetpackSecurityFilled - id: HandheldGPSBasic + - id: ClothingShoesBootsMagCombatFilled - type: entity id: LockerBrigmedicFilled @@ -68,4 +69,4 @@ prob: 0.7 - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse prob: 0.15 - - id: CrowbarRed # Frontier + - id: CrowbarRed diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index d2842ee582a..f4b1ad65e6b 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -32,7 +32,7 @@ - id: ClothingMaskBreathMedicalSecurity - id: JetpackSecurityFilled - id: HandheldGPSBasic -# - id: ClothingShoesBootsMagCombatFilled + - id: ClothingShoesBootsMagCombatFilled # Frontier - type: AccessReader access: [["Security"]] diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml new file mode 100644 index 00000000000..40b16d4d0be --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml @@ -0,0 +1,71 @@ +- type: entity + parent: ClothingShoesBootsMag + id: ClothingShoesBootsMagCombat + name: combat magboots + description: combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. + components: + - type: Sprite + sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi + state: icon + - type: Clothing + sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi + - type: Magboots + toggleAction: ActionToggleMagbootsCombat + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.9 + enabled: false + - type: NoSlip + - type: MovementSpeedModifier + weightlessAcceleration: 1 + weightlessFriction: 0.3 + weightlessModifier: 1.2 + - type: Tag + tags: + - WhitelistChameleon + - type: Storage + capacity: 10 + whitelist: + tags: + - Knife + - Sidearm + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + +- type: entity + parent: ClothingShoesBootsMagCombat + id: ClothingShoesBootsMagPirate + name: pirate magboots + description: pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. + components: + - type: Sprite + sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi + state: icon + - type: Clothing + sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi + - type: Magboots + toggleAction: ActionToggleMagbootsPirate + +- type: entity + id: ActionToggleMagbootsCombat + parent: ActionBaseToggleMagboots + noSpawn: true + components: + - type: InstantAction + icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi, state: icon } + iconOn: _NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png + +- type: entity + id: ActionToggleMagbootsPirate + parent: ActionBaseToggleMagboots + noSpawn: true + components: + - type: InstantAction + icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi, state: icon } + iconOn: _NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml index 91b46ed8828..dbec9b8cb83 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml @@ -7,14 +7,15 @@ - !type:OverallPlaytimeRequirement time: 21600 startingGear: PrisonGuardGear - canBeAntag: false icon: "JobIconWarden" - supervisors: job-supervisors-warden - setPreference: true + supervisors: job-supervisors-hos # Frontier + canBeAntag: false access: - Security - Brig - Maintenance + - Service # Frontier + - External # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] @@ -24,12 +25,14 @@ equipment: jumpsuit: ClothingUniformJumpsuitPrisonGuard back: ClothingBackpackSecurityFilled - shoes: ClothingShoesBootsJack + shoes: ClothingShoesBootsCombatFilled eyes: ClothingEyesGlassesSecurity head: ClothingHeadPrisonGuard + outerClothing: ClothingOuterArmorBasic # Frontier id: GuardPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58Nonlethal # Frontier innerClothingSkirt: ClothingUniformJumpsuitPrisonGuard satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json index ead74d88966..a7e695cf008 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/debf90acfcafa4fb8d6723a37e0b8ac556c0702b", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..9219f6fe609ba2adfcbbd2aeba9c1abbc2cd0d7f GIT binary patch literal 1210 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Z|*86aP zNSl1N>q;?pSr-|jjKT~@kt2bx9|SE4VckDX%{NMMt)i!3p=gW@3;V^R>krm1Sp8s? z0!Np^qi64~D+!(7>ePKjI`7=!>i5+amCOsLnQYF#b~7w6tYQ z%1*yKsC<~k)1>5-PU7Rq6QU-adG(vEu4b}M_wfna4{NQn_#|>fT70WctnbQcFP7Pu zt=9U!zq0Dug@mQm(L%H2njdWCpSAsAwl;?yfAfRa98&TR_Jn-Z_x4kMzbHR+>%H2H z`1Z@)tCqb#aFea%u63mOZ)MX{e34>%<~Wq_S*=st6mas@_c@QPXT(j8FJawXEin1_ z+wS`}1k%6XS>gMgfq|LB)5S5QV$R!H_Sv@`B--osikQw$FgO*bVihr&cagVU zQ&}zR-Yj!6_(izZ`1ag79?Z_PJcB)>h?sD5v+>RjBay${ zSEij-wRryNUX9&(S;mIqzNbZ;_rHJN#m2+dd@E_=gs;sC2Xf4q8P22`vp6ce))(Uj zO8i~NIPbaY*DBda&X>#Q%Uzzn{`%_=Hu>wb8=hBoF3a>#y|HcX>ipZ=YASs%dtKF6 zS#URR@zpHFzT}ofj&qfI49{f}C4iy2B}#Y8?YCO*cZwc1P-vOJegE_4;&+u*vaW(H z0tP&bKio0BDqrw~jQ9gb^s^VNBJcQ56s?%o5S#NlT*KObsr~~2TgKftuC5Q5c8TfV zU0|B8Jan~U&&QkT6Rz!$>M#8KX^U~RpcnTHzvVAVtai?8_`ScCf8+TX*MQ**3`*ye zU!tq7tlz?R=6Uf><~e!Y`}ge&o4HCTQR2~`KQas{mtD5`FXWket-;rpvDb}x-Rrtv zRu6XNUCJ=our_|7&Q#W%SDYDUv!^;uS$H$&-J5WY)A9>fxxM@u=Gp@+lNdZ*{an^L HB{Ts5q>?ay literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png new file mode 100644 index 0000000000000000000000000000000000000000..bdc5318d1576aba1ced90414afe529c0eefe0083 GIT binary patch literal 493 zcmVPx$r%6OXR9J=Wmc4G;P!xbaS7zZ);0#v~l>sr(3`jf!3+loUbz$sNpiI05OJ5-B z8x)C^3BkewL_#z&9h*eP-bfvo&1Ph?SpdrA@>wn- zESJld3EXr#{`~F^fMT(T>$=S6b9Rr9oZ_}^Q>jz{a2$tHsr2sxH=T}eS{8<30N}bV z0Pim^ImHu+1eRq11QIXmK>p%_>eUq@g5x+$r&B&utDtE|{MT5mR%9|6QmNG04xD|2 zPenw8d_Mn2?s*=b=K-+a?}Ky0;V?9RXa}BNvu)b}`+k2Px$rAb6VR9J=Wmc42sQ51l`S;odc)WBXetSn;Th9LM17O}Ip%u`4zU&AKvkwUPw z5+z`xCWsrxX=jdR9C5bF>}GYxolPLc&Vk!}_ug|p&bh_a`u#p18J|A1dL$4DL;{fj zpohKCY&Jbz*U|N#SNHop+wGR$c|Mr3uJ?gd4d5on{)i1~bui1g<%*6TtrAFlhkUpz`UV4Fr7|Gr_%tGN~M!rL|7~q zZxgs_x4qfJ0|13W0mpHe&1P($pE<@Y%c5K^17O=W#bWW_1#a4H&oE7Lxf}qF;{fpG z{G4Mv7K>q;CV(&TrVeD!&Zt~mAR^ed&15p+TcrY;cEEp)<#I_Xl_HTyob15KNBB}i zM95~df8?&~;<_#XyWP$|Hy8{8^9Od|Kg1HN9bUlkt?hyECXLW_RI hkw7F63HoU^tg7WpS>Yv>l?)bedZ0S9f@t~JGkN!RD$Qu z+9N8={aWOtz=X2B;W~5X?|N1fE?e&40s&9v-z+TMaeen$hF^c#7p>qvQ1IhWiqXlh z={IZQL}wr0XFGp>n!5aZiR6w&dQ*2-Gn{+%HRfm8?pUq(BkR6)A9y^^Ux0<-Na2}_ zXH6xVx4(aSN`HF%9$C5kIr@jHSeq11*ql!`n;p3N>W5nSWS-t*tSdb$rFj1R*_^Xa zW3}jxS0$Saau^G4<_NXvKKpEWHEZg{7gsCmgu}EGf}D+fKm2W$fB*5vCI0^aEC{6tCrd z`p#`Ug+fujD?58le*N}o{2;fV{k{EO`3@-fV{E;;j)(2Ke| zEBDjgKfQa7_Aftv^WtmnV-hv{{U1LQYnU9i`qmZcAeH}l_t?Hy^R0W$B*4Ph9zH#R z=i9#6#5ZR(C;dNNS{7@*Id}HY8o$jqj}*%E7;d?penjnAqRFjSf*P~xGgo8oB79EIU&i}q`P2F^V0V(zx0~;cBTb>UH+qS*K=_} z1emBbweH25>iP%HdG-l&cYS9Ud-{#}+REzsgusWdqrU$;klyOH;N9Own^rf6_wSW} cp#Fq)U(4A$yl>C%1O_dGr>mdKI;Vst0Dr-pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/meta.json new file mode 100644 index 00000000000..a7e695cf008 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..934c155eb53efef64825a9589ef8d8037afb5ed9 GIT binary patch literal 1057 zcmV++1m63JP))=wPR0Y45CQVu)tszMfaTQz~1P9T@ zufczytKh022#O%$=I+-b63?|li_{x#&cl1}dpLOmp_FYDz3?a$OTL?#NNTfl^IG#W z5yC`iC6+ZjXDppg@$dS$r9su3gzEMGy}GM4XL<%SvjvY zz}W_L-8)$~`y(~V4p|nwoIrFAI<6tIP|51|oZ~x~UXx#R1-p9?ll$$9-`Egm_uQyW z_W%F_Z%IT!RCt{2+ObRPKpepFZy%`&9tt`H3WkzDAeq{!h0sYXPX2F>4z7;kCeqm@ z=%5IVgPm>_51K4_Q;ybG`!0EX4)6UwP?Ge1-0yN+Zn+-_A%qY@2qAImV>jawJ`^0S6m$5x^`KcG3JljS8<+zVfZ=e6Qfg(K3(qBJGMTiFj*dzI-}eD{ zetx#sUatp$)|xEKn9XJz-2?9K?pi?**!=hR_qOfn=?Q>-zmL|M>2%85+uLUMfG`Zp zcDqfMWoWGd*x%n@x>hgWZnp`;aHD%b7>1?ic}%BMwAS?d{iXbiFYkF?t^7_C(ChUG zf`FnZNYfOp_0j;e)}(1lQ4|D0U{}PZbh}-QF?Qp7d3jlCub%Tf#~4Gm+udk>A%qY@ z2qASs$wpL%@B8KM?k)gXmR0}RG1b**5BRDkpwsCz8blqPPG@bs bLR~)rFG&^hG<@0K00000NkvXXu0mjfs*M9G literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4e754a4314d96ea74d738c0695cd5c400fe4e70b GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zbv#`hLn`LH zy|vKqaDc?okM=EHU5{40%ob=nydlN=nz)3%!zQmA&I{Z(i6?L-%{XZNMbsdI5m zffrjA32>Y^^)B{OLEWoapJPk!FbYDz#QJ9^u0H(vXCG^Xj-2NtNru;7xhvpHs7AU)6KBgn}}te{k}1- zyLpG-;wJl!v|{@UySZ-MbP0 Hl+XkK(|(%# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-right.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4a8c25be7e9e077b45cb519e6bad0137be6d3835 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z?LA!_Ln`LH zy|vNrkb}(ekL%sq_)0f>#~<#P-K{d=g7^V(gN2Jf37nhpfoYP(gQk7X@e9>_Qj=`h z+SIO{WZA;Pzw+Ui?=xqal>dw^`v0;{K?wprotIhj`{L`nVhn%(*%sbmO)#lSGMc$2 zcC-J!+5b1>d_3D7zh^G5!7+j3vG4rk87mmhe;|iv&Gn& z>)(V+RF~&`s^57oQ9^9rd*j(>KiKpua2OoBkP%~KUM$ykc&{Ae?LXSe1y^5+1YTiV za5YEBHCL>gb!$}b#~(k%`!~+b{j|QPVW#w^OgDi!YigFi)UKR2*?03R|BuY;o{I}2 zz(lRwzZYIs)jx2~v`-Me{+s!<*KfwzJMPIxq}9g8zUQw=Gi6%$o&8iqZ^OO&t}ZSv c|0a}gx4it0_it${FkBftUHx3vIVCg!05qDX(EtDd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..6b99854adbbdaa2b39f4b3c0667276f5a4479587 GIT binary patch literal 1325 zcmb7EX;{(+9R62mcpqVw+3<=nHA_Qgc@bh>VaC*_M8zwWh^a-E7ua%|IhRJ+M4e_H zA&;^(`TzhJ1qEVo z8;bfDVBHOFA!fV+fK6ngpI;a;F%baZ<>$-2L-=8kLMX|fxqa(yjI~>8M(SaR;P`?R z*ATALT>-;J*|ypSnPpf+TZ6Wa^l_fh>R8ei8}L<|zvPRPcIMC9&?PT+eLuv{S<3Oq z+H(5_8PchQLqfW$Dg#gder`Ex`G8q3hPbD~-7CepCRDZbslD;=cvZnW^_R}aEccXb zUBm;h$*!Ll44xqxB69;&P3g_YpUMkN3S?|UcrKID*?a8jvIX_K_n|5Mwhh^*SFI*U zFX8R}v((vF^)X25o8yGhN(NFstR;qmP6xISg)p?wsruHs&N8 z*2K&6sJu7TRd2e6&i{H2snOB@5q&!h4*9S6f*Cb-wjcuogZf8Z?d?*9qLjz;+-nNH z65QA;5EMkv($nKeGnpr%qaS>#t*ync6%`g@($e

GVj&`g&Ir@o$IENzL$^!Np=R zmPBU2#Ok#*Zx)NSvbKIfO(KzYABfM(i)k1m0**KJ=gwA^mKp(+n3Pkebgl{cO66}6 z*TlC-Ecgz?tBvSO5`ugsMuTgOJb36(eJqFMaw|k65=k?8t7@iT7D~HsX^4YEe5UbW zm1M3$Bo-H!mz%}L#sU|qRJl@FCKLvc4850zN0OfMIua~p%&yyEG0$Iit z;k;VAs;DJx6iIRmLRR(3R43Z*MO}ZG>u#l*#3VIOYo#Eq`*s!l%}RJ0%_% z(90i(_Ut!o8F%bUD916Aw9w(iX1IAVn7=>W!@2-%YhDZ*NrmL6B7*J8Z6Nxy=^pzH zF9$k|t{>!%%*<2Fjf)17+yn`(K*GHpl}8KHJ$@RSKf~*8JyzG;Tol#XKR#~JM09g^ zKQ(;-yKM|{(9@GYPjN#clWVSrs+7u}xw$<6hr>COmWJ1yePsP8+Bjyim7!8)Oyx|i zgVsrukK0y!?--WtMIi?P$>ya0Z+$y9J%sr|i9@e>HF~Li+z0>`yMbZy&ovyI9uFSuospi@|vgR;A|Ggsxcn z^mL3NAF$c@TbWG8W|)FOg3q75lo!Hb8+X-cB@)T%D3#zQ#aHGZxue=+rWj5|Y=r(X Zx6h>^_hwuE1bbr!fgt}-3>zKy!#__hd_MpH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png new file mode 100644 index 0000000000000000000000000000000000000000..0454ae67b0cdbafd8b5707c2e1fbb82af7d18694 GIT binary patch literal 558 zcmV+}0@3}6P)Px$=t)FDR9J=Wl0SdXVU)yCgKoN=(>&(fnR_q4dEnsS;PBLWcB*Ju zmd%AiAxj8>5Mt*{(_}iGvhQQD7=~d`tyYiDIcotSgq27n@caEcHy)3v*Xtbe?RFa> z1l?};@e34-MJt_7+uo_wYRIxoG#a(ln$0GqQVCU6kIs31YJq(||9s2GnZ*06AAI}t z27rFQj}U_Ip}eg&9*;2$<7CgX7P$9*;okfE;lt+GCEzXDYRzU7RaKczr$>99bq6Am zh~;v*@cDdy`ChNbArD{}28~AJ|NMg4Y=$IBB$G-0ybrlt?x5FoopQN+vgbb&h~C{< zgI*5+kH^DmwZb$_UIYRh@{%MG3pFwMfavWlS77t4R%`d&Xfz_5%_7S(g+k%-1mf|y1)IyaWxZbGcDvd4 w!{HFvB(NnI4ASXzST2_*=QubxI6Q5B0U?X>MtZA<+W-In07*qoM6N<$f^ygdtN;K2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..75fbae54a6eb1c9bd04be3d531fbc836ce08d874 GIT binary patch literal 579 zcmV-J0=)f+P)Px${YgYYR9J=WmOYCaK>&syj}!xBHaGLcA_STGpe3Ly|e9GGDkESF23^Jp~6d_E_W$v93Dcpf3dHWrH^ zNz#GMW-}U%2FG}%Qh6fuPXhUTep{>6OuSmHqN*y2qL{i?t3{zuIFA6p;8TWQ-+vH! z|BkP&*E=>CAcR2r_QllAW;5pV`S}F=_n-0K@5UehvTC)8EX(*6#niQ0EqcA)c?5E~ zoFg0#Z=FsjUa$8_*YEc^#sOqmK92yvYPG`S@eq&4NhXsAuBz%$KAB7?7K@g1I;eE{5UH=E4{!!UU1^Kp!OJRSmp006qKvtF;!H0`wC@Wb8R_SN+@Z*Fb? zSS%I*yp2Zr-E5lpe$h}UL@JeHJRVanmo0a|QsC#~Ba$SsTrSadoo=^FC=@!%_c08E zPNze&*+dAzdc8hfKvh+IJ|E-pn8{?qa5zM{z2yo_yxndezMD>`q|<3+Stgs!o-R-- zm4Myh+vnlo0hh~V;-k?B*zEv-rfCEM0d!rr6tFym|05T_4Q&Biz!tCt{s1Qx-*Y6d Rn8pAA002ovPDHLkV1g}W0Gt2- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c9693883426aaef3c1c2d07eb79338435642303c GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zBRyRlLn`LH zy|ppxP=LhIkM-7F!AqL*e8by!r3gHFpuuYHzR=rkR#$mx_D@Sk$_dK7$D3@3qCA`!2s!Idy#ENwe7PnWvsgGhBNep7Z$^E- zzYEhY)yQ1Wlw*5f(Wg08XWD7i+i#~;{hfFC;ei5+CmZjdw~-HD#XaNqzK=Hi4bMMH zod0~|{dW;AR<>rxXFu11t{N|Z2?>aDo{ ywjyJDa&7P{)=r(&i}EL~@&?p907F2}kEXc?7)(w%qin))Zdz7X z!hxebhhC<1hOFG^>-pxtFQ<9q|9REhiW!w4U{U?EXIGqd-xXt!=yl838pXhHz4YPl ze<$lNJ#qip&Z~O3P3Zh*6%M9KCLl4>qEAKoclnW%^;@KtMNTjJDaK$hf4|f9_jcEh zJuZA@t>E`he|Dgk=hC2qIcCkvGFODH{!lCbw@&{3YEijaXG6ptG*w@JmHJupZ_S^b zFHRpRJhDlL;lSqvhSQri+{_8k5V`QS?0tX4h9Xe?i=>{ zV)-}TmR}&(016(C`%R@9aB!KliqqMB8=ys#CxIHm>OQ(|-M(eNoZ< z`XUca)uof#UY2w{E$WOqd!TH$>-y`5lb26+Ip%Uy%i-F4ei`A_v6l7fz(CohBwtYS Wy71#2mIz=hFnGH9xvX)=wPR0Y45CQVu)tszMfaTQz~1P9T@ zufczytKh022#O%$=I+-b63?|li_{x#&cl1}dpLOmp_FYDz3?a$OTL?#NNTfl^IG#W z5yC`iC6+ZjXDppg@$dS$r9su3gzEMGy}GM4XL<%SvjvY zz}W_L-8)$~`y(~V4p|nwoIrFAI<6tIP|51|oZ~x~UXx#R1-p9?ll$$9-`Egm_uQyW z_W%F`I7vi7RCt{2+ObPBcO1v@ccdnw7qAIPz!*@hh#ZGPT*Bc{!jVD9|KMOlW+@^L z8APOX&ft*A=^31S775QF*%Xu?B4R}cBOHNC5!0Y?_;vE2t@XL2sYCmHP08Ii-%sv$ z$1T4v2qAV<^`hKGj%7#bSl{{Eih$((+#Zb9i z)`>*IKdzK|{Y_t=fVc8jS64&3ySs1Z_w@+?NF)+EnM@Lk#Q?atxS(FIhmy&po|~Hk zpxJCvuh(&1cNh2}Xz!r;6B84}<8jW<&jI{=0Mj(_JdeA(J6zWdd|d-Uin7_PHcgXo zI7}v!p-?E`I1T`g<4`CR$Ye5v!(mL*B%95yc7KUq&yPeR*tSi%Tqc*x0g%h(D3{CF zwoN1wdCk{fY3U2}5-b*rD5con-=|Wku(Gm3DwP5tl}e$MqEe|aIy#EuI9QfNwOZ}v zTHo~W@W9Q@4FJ#2&+P5(`R8i28ns%DXf*2AOifMoEn5g7gb+dqA%qY@2qA!;5ZJ;%gZRGI6OSWG)({+jfPfA{i};$S(bjC1!}k3WHK2n%i`eRfJ&v( zb-$h#Kq-Y%ip$GOB9RD_las_^F*==2FYUV0>2w$v7@*l~a(jD=Qi|Ex*`E9T4h_d< UV)bO@H2?qr07*qoM6N<$f(^rG@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4553ebde7ffe646ae2e62fb3cf52d1ff6b349838 GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z7kIijhE&XX zduyYYa-hhukNYQOnVC)8%CTmXU`lMzjMABTLDGU()KU`!&GZvyihHP+edanS!mYOP zlypkFL)P>eg58ZKoGY2GdmTJfnx4Lhr*8kNLm%cAzfas%?dSplPv%BOg*^0Hn#3U0 z%l5QLvLSDK_xs=fuNY_j^PRgb?99ufT_0`Evp6PXteLIAaVB+lZk)3GF{foOEnGKm z`zF}%`nCO&qWSXsO=q8-UbU+)_>ZKbyw@A%4Y{{dHb=5GGtTsBtFh~U|NF}8(!BTY zENud|xlDuBZXkl%CyfpUMW5a2wfosF!&%|%LJ@M0j8t9ni;VA>W{)Ap0t5zJ@O zjQ72LS9JAdi&b!zqIK+q#fOvI4hu#{$KSm1Px$rAb6VRCt{2+A&KTVI0TtZza<;E|EF}tQbLR$zZD7cA1S7T9=Fg5zHHK%p1s7 z-0m%eW+<4%DeoXX0+}N*R~!zqBxDLaPKu#Qd(kU7`uj}J@jM5==Xw6y^9Kf?@bT{=Cau| z(Z+rqVe&tD8jh1U>+A0T==ZP5WVRmW>h=1vSAgp{`Ln;x|J!D4+cxQRnqIF*DwQIe z&Eoq$)oPVrx3_#gI$G)j2%CT9@yB7IU|iP);M>IouIn-yjj$|>a=H8ux3QSZW;1mD zxzli*yqQcU03?%1?#DMb17@=snannx_j740Any4^L_|bHL_|bHL_|a+N((;|#l3&v zMdIE+@Yq7P74!aqIV*o&GS9Ycv$mF^+wC$O4$0;A7>~zPDiuynPou~fsZh6dSSXmc zmPM!2;lu7O_hW$RbjqjweXd%qSXDqG%;K+Kju{Mw?CgAGb93Wi+-UqDkw}o+JK(C- hiYlv!h=_>1raP#5=gkg?LJa@_002ovPDHLkV1n!w