diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 6341042bf8..61c3d74924 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -4,7 +4,7 @@ sprite: Objects/Weapons/Guns/SMGs/wt550.rsi state: icon product: CrateArmorySMG - cost: 9000 + cost: 13000 category: cargoproduct-category-name-armory group: market @@ -14,7 +14,7 @@ sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi state: icon product: CrateArmoryShotgun - cost: 7000 + cost: 11000 category: cargoproduct-category-name-armory group: market @@ -44,7 +44,7 @@ sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi state: icon product: CrateArmoryLaser - cost: 4800 + cost: 8800 category: cargoproduct-category-name-armory group: market @@ -54,6 +54,6 @@ sprite: Objects/Weapons/Guns/Pistols/mk58.rsi state: icon product: CrateArmoryPistols - cost: 5200 + cost: 6000 category: cargoproduct-category-name-armory group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index b20e52004b..49873a763a 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -34,7 +34,7 @@ sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi # DeltaV - resprite state: icon product: CrateSecurityRiot - cost: 5500 + cost: 8000 category: cargoproduct-category-name-security group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index a6e9e02f44..770e8e8fdb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -61,10 +61,16 @@ LPPClothingUniformBlackTracksuit: 4 LPPClothingUniformBlueTracksuit: 4 LPPClothingUniformRedTracksuit: 4 + LPPClothingNeckShemagGreen: 4 + LPPClothingNeckShemagRed: 4 + LPPClothingNeckShemagBrown: 4 + LPPClothingNeckShemagPurple: 4 + LPPClothingNeckShemagBlue: 4 + LPPClothingNeckShemagWhite: 4 contrabandInventory: ClothingMaskNeckGaiter: 2 - ClothingUniformJumpsuitTacticool: 1 - ClothingUniformJumpskirtTacticool: 1 + ClothingUniformJumpsuitTacticool: 2 + ClothingUniformJumpskirtTacticool: 2 ClothingEyesGlassesSunglasses: 2 ClothingHandsGlovesColorBlack: 4 ClothingHandsGlovesColorGray: 4 @@ -74,4 +80,5 @@ ClothingHandsGlovesColorBlue: 2 ClothingHandsGlovesColorGreen: 2 ClothingHandsGlovesColorOrange: 2 - ClothingHandsGlovesColorPurple: 2 \ No newline at end of file + ClothingHandsGlovesColorPurple: 2 + LPPClothingNeckShemagNPZ: 4 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index ade8ed071f..e5b3fecdf8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -15,6 +15,6 @@ Fulton: 2 #LPP WeaponCrusherDagger: 2 - contrabandInventory: - # LPPWeaponSyndieGlaive: 1 - ClothingBackpackDuffelSyndicate: 1 + emaggedInventory: + LPPWeaponSyndieGlaive: 1 + ClothingBackpackDuffelSyndicate: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index cf2e71e490..97247659dd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -25,9 +25,10 @@ ClothingOuterArmorDuraVest: 2 ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter. BreachingCharge: 8 + LPPWeaponEnergyGunSoleil: 2 #LPP + LPPTelebaton: 3 #LPP # security officers need to follow a diet regimen! contrabandInventory: FoodDonutHomer: 12 FoodBoxDonut: 2 #box evidence - LPPTelebaton: 3 #LPP diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index e5ee3cf86c..e9386fb74d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -49,5 +49,7 @@ ClothingHeadBandBlack: 2 ClothingHeadBandSkull: 1 LPPClothingHeadSecHat: 2 - # contrabandInventory: - # ClothingMaskClownSecurity: 1 + LPPClothingBalaclavawide: 4 + ContrabandInventory: + ClothingMaskClownSecurity: 1 + LPPClothingMaskKinkyMuzzle: 1 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml index 6b59a93261..fd711d8df1 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml @@ -1,12 +1,18 @@ - type: messagePack id: PrideDrobeAds messages: - - advertisement-pride-1 - - advertisement-pride-2 - - advertisement-pride-3 + # - advertisement-pride-1 + # - advertisement-pride-2 + # - advertisement-pride-3 +# Увы (Нет бля УвУ) + - advertisement-sectech-1 + - advertisement-sectech-2 + - advertisement-sectech-3 + - advertisement-sectech-4 + - advertisement-sectech-5 - type: messagePack id: PrideDrobeGoodbyes messages: - - thankyou-pride-1 - - thankyou-pride-2 + # - thankyou-pride-1 + # - thankyou-pride-2 diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml index 9e1de27fa4..581f4d9b1e 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml @@ -1,29 +1,15 @@ - type: vendingMachineInventory id: PrideDrobeInventory startingInventory: - ClothingNeckLGBTPin: 3 - ClothingNeckAromanticPin: 3 - ClothingNeckAsexualPin: 3 - ClothingNeckBisexualPin: 3 - ClothingNeckIntersexPin: 3 - ClothingNeckLesbianPin: 3 - ClothingNeckNonBinaryPin: 3 - ClothingNeckPansexualPin: 3 - ClothingNeckTransPin: 3 - PlushieSharkBlue: 2 - PlushieSharkPink: 2 - PlushieSharkGrey: 2 - ClothingNeckCloakTrans: 2 - ClothingNeckCloakAro: 2 - ClothingNeckCloakAce: 2 - ClothingNeckCloakBi: 2 - ClothingNeckCloakIntersex: 2 - ClothingNeckCloakEnby: 2 - ClothingNeckCloakPan: 2 - ClothingNeckCloakGay: 2 - ClothingNeckCloakLesbian: 2 - ClothingHeadHatXmasCrown: 2 - BedsheetRainbow: 2 - ClothingUniformColorRainbow: 2 - ClothingUnderSocksCoder: 1 - ClothingUnderSocksBee: 1 \ No newline at end of file + ClothingNeckRussianPin: 99 + ClothingUnderSocksCoder: 99 + ClothingNeckCloakTrans: 3 + ClothingNeckCloakAce: 3 + ClothingNeckCloakAro: 3 + ClothingNeckCloakBi: 3 + ClothingNeckCloakIntersex: 3 + ClothingNeckCloakLesbian: 3 + ClothingNeckCloakGay: 3 + ClothingNeckCloakEnby: 3 + ClothingNeckCloakPan: 3 + #Простите Дельтовцы, но мы русские с нами УК и КОАП РФ \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index 61162edf2c..0e68144980 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -37,8 +37,8 @@ - type: entity parent: BaseItem id: LGBTQHandyFlag - name: LGBTQ handheld flag - description: "The be gay do crime handy flag." + name: флаг Франции #6.21 КОАП РФ + description: Национальный флаг французов #6.21 КОАП РФ components: - type: Sprite sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml index 35f0808dfe..8c9f077bcd 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml @@ -360,6 +360,32 @@ Heat: 0.95 - type: Tag tags: - - HidesHair + # - HidesHair - WhitelistChameleon - - HidesNose \ No newline at end of file + # - HidesNose + +- type: entity + parent: ClothingMaskGas + id: LPPClothingMaskNPZGasmask + name: противогаз спецназа НПЗ + description: Усовершенствованная модель противогаза спецназа из далёких корпоративных воин. Сможет защитить лицо от различных осколков. Защита глаз от вспышек и сварки гарантирована. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Mask/NPZgas.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Mask/NPZgas.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + - type: Tag + tags: + # - HidesHair + - WhitelistChameleon +# - HidesNose + - type: IdentityBlocker + - type: FlashImmunity + - type: EyeProtection \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml index df8878c4e0..6552685bbf 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml @@ -27,6 +27,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/greenup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/greenup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -57,6 +58,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/redup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/redup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -87,6 +89,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/blueup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/blueup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -117,6 +120,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/brownup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/brownup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -147,6 +151,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -177,3 +182,32 @@ sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi + - type: IdentityBlocker + +- type: entity + parent: ClothingNeckBase + id: LPPClothingNeckShemagWhite + name: белый шемаг + description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/whitedown.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/whitedown.rsi + - type: ToggleableClothing + clothingPrototype: LPPClothingMaskShemagWhite + requiredSlot: + - neck + slot: mask + +- type: entity + parent: ClothingMaskBase + id: LPPClothingMaskShemagWhite + noSpawn: true + name: белый шемаг + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/whiteup.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/whiteup.rsi + - type: IdentityBlocker diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml index 87b13f3717..32de71c901 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml @@ -88,7 +88,7 @@ parent: ClothingShoesMilitaryBase id: LPPClothingShoesBootsNPZ name: Сапоги НПЗ - description: Нет, вы не перепутали обувь цветами, это такой стиль. + description: Крепкие берцы для любой труднопроходимой местности. components: - type: Sprite sprite: _LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml index 610d7f0ac5..2b4a6dd138 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml @@ -22,5 +22,5 @@ - id: LPPweaponPibodi - id: LPPMagazineBoxHunting - id: LPPClothingOuterHardsuitHunter -# - id: LPPWeaponBattleCutter + - id: LPPWeaponBattleCutter - id: LPPWeaponCutterMagazine diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/BattleCutter.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/BattleCutter.yml index 727a8bf0b2..73b9ea72d3 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/BattleCutter.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/BattleCutter.yml @@ -1,41 +1,41 @@ -#- type: entity -# name: боевой резак -# parent: BaseWeaponPowerCellSmall -# id: LPPWeaponBattleCutter -# description: Старая модель резаков, что, вроде как, предназначались для горной добычи, теперь же для рубки ксеносов. -# components: -# - type: Sprite -# sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi -# layers: -# - state: base -# map: ["enum.GunVisualLayers.Base"] -# - state: mag-unshaded-4 -# map: ["enum.GunVisualLayers.MagUnshaded"] -# shader: unshaded -# - type: Item -# size: Small -# shape: -# - 0,0,1,0 -# - 0,1,0,1 -# - type: Clothing -# sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi -# soundForce: true -# slots: -# - Belt -# - suitStorage -# - type: Gun -# soundGunshot: -# path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/BattleCutterFire.ogg" -# params: -# volume: 100 -# soundForce: true -# - type: AmmoCounter -# - type: ItemSlots -# slots: -# gun_magazine: -# name: Magazine -# startingItem: LPPWeaponCutterMagazine -# - type: MagazineVisuals -# magState: mag -# steps: 5 -# zeroVisible: true +- type: entity + name: боевой резак + parent: BaseWeaponPowerCellSmall + id: LPPWeaponBattleCutter + description: Старая модель резаков, что, вроде как, предназначались для горной добычи, теперь же для рубки ксеносов. + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + size: Small + shape: + - 0,0,1,0 + - 0,1,0,1 + - type: Clothing + sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi + soundForce: true + slots: + - Belt + - suitStorage + - type: Gun + soundGunshot: + path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/BattleCutterFire.ogg" + params: + volume: 100 + soundForce: true + - type: AmmoCounter + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: LPPWeaponCutterMagazine + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true 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 d75052d5a8..9c072ed7ea 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 @@ -218,3 +218,60 @@ startingCharge: 4000 - type: Item size: Large + +- type: entity + name: гибридный модуль S.O.L.E.I.L. + parent: BaseWeaponBatterySmall + id: LPPWeaponEnergyGunSoleil + description: Прототип гибридного лазерного "пистолета", представляющего из себя устройство, что цепляется на локоть, имеет летальный и нелетальный режимы стрельбы. + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: Battery + maxCharge: 750 + startingCharge: 750 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 75 + name: lethal + state: lethal + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + - type: Tag + tags: + - Sidearm + - type: StaticPrice + price: 750 \ No newline at end of file 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 5d43045183..948e6edec2 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -128,90 +128,94 @@ # Короткий срок пули - type: TimedDespawn lifetime: 0.2 -# -# - type: entity -# name : Cutter bolt -# id: BulletCutter2 -# parent: BaseBullet -# noSpawn: true -# components: -# - type: Reflective -# reflective: -# - Energy -# - type: FlyBySound -# sound: -# collection: EnergyMiss -# params: -# volume: 5 -# - type: Sprite -# noRot: false -# sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi -# layers: -# - state: scatterlaser -# shader: unshaded -# - type: Physics -# - type: Fixtures -# fixtures: -# projectile: -# shape: -# !type:PhysShapeAabb -# bounds: "-0.15,-0.45,0.15,0.15" -# hard: false -# mask: -# - Impassable -# - BulletImpassable -# fly-by: *flybyfixture - # - type: Ammo - # - type: StaminaDamageOnCollide - # damage: 13 - # - type: Projectile - # impactEffect: BulletImpactEffectDisabler - # # deleteOnCollide: false - # damage: - # types: - # Heat: 5 - # Slash: 8 - # soundHit: - # path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/ion_hit_1.ogg" - # - type: TimedDespawn - # lifetime: 0.4 - # - type: GatheringProjectile -# -# - type: entity -# name : battlecutter1 -# id: battlecuttershot -# parent: BaseBullet -# noSpawn: true -# components: -# - type: Reflective -# reflective: -# - Energy -# - type: FlyBySound -# sound: -# collection: EnergyMiss -# params: -# volume: 5 -# - type: Sprite -# sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi -# layers: -# - state: ion -# shader: unshaded -# - type: Physics -# - type: Fixtures -# fixtures: -# projectile: -# shape: -# !type:PhysShapeAabb -# bounds: "-0.15,-0.3,0.15,0.3" -# hard: false -# mask: -# - Impassable -# - BulletImpassable -# fly-by: *flybyfixture -# - type: Ammo -# - type: Projectile -# impactEffect: BulletImpactEffectDisabler -# damage: -# types: -# Blunt: 5 -# Slash: 10 + +- type: entity + name : Cutter bolt + id: BulletCutter2 + parent: BaseBullet + noSpawn: true + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + layers: + - state: scatterlaser + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.45,0.15,0.15" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: StaminaDamageOnCollide + damage: 13 + - type: Projectile + impactEffect: BulletImpactEffectDisabler + # deleteOnCollide: false + damage: + types: + Heat: 5 + Slash: 8 + soundHit: + path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/ion_hit_1.ogg" + - type: TimedDespawn + lifetime: 0.4 + - type: GatheringProjectile + +- type: entity + name : battlecutter1 + id: battlecuttershot + parent: BaseBullet + noSpawn: true + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 6 + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi + layers: + - state: omnilaser + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffectDisabler + damage: + types: + Blunt: 5 + Slash: 10 + soundHit: + collection: WeakHit + - type: IgniteOnCollide + fireStacks: 0.2 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png index 1bf0eeba71..3dc4a73feb 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png index b81ad3dddb..679e4c7640 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png index 80a27e48f6..1e02dea8ac 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png index 0426a30945..3201545532 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png index 77e9c2bd4d..929c5ade05 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png index 51353910da..c140f1895f 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png index 6983acd036..97b01ccf5c 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png index 191de8786a..115d226bbc 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png index cf6c7acdac..adf65f34f2 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png index 3e864b37be..e0623b2d15 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png index 30334415f1..7215d38698 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png index 2c1054e46a..92ac14c8d8 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png index 257de32121..b4069cde17 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png index 3518554230..8420c0cbd6 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png index db81ed15ee..c545e6cc6c 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png index 1bac95d0e4..448c42a6b0 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png index a71e8ae3a9..7de1bb6e71 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png index 6aeeeff755..9ecf2bca6d 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json index 2b78bcd698..2cfe8371a7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -13,6 +13,18 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json index 2b78bcd698..2cfe8371a7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json @@ -13,6 +13,18 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json index 2b78bcd698..2cfe8371a7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json @@ -13,6 +13,18 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d8960add98..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 317f89c00f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index cba1d28f0e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 49851b9bb7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 9255751a8e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 0391ee21e8..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 546b81558a..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index cc0cf452b7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 3f34c5be8b..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f4d7057e87..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 2ba22afa79..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index b4fbf22af0..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a26665a2c3..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 8f1055ef54..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 4dddbe160b..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index deaa8f3ce8..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 8e73b8c062..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index bf5c3aa1d9..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f10a193710..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 4301ebaa08..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6776388d92..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 63a349a59f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 00c03e85a7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 25cd1faabf..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index fff9f1e87e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 14a9971cab..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 24580f676c..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index be62f857dc..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index dc75131489..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 4e04083a25..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a0e52e41f0..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e748677ae1..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6d943fcc54..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 777e7bab93..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 34418d86b8..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 1bd7b93004..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a1f7b446dd..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 46f37517fc..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d7e3353385..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json index 8fe98eacbe..e643f2360d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json @@ -21,6 +21,18 @@ { "name": "overlay-inhand-right", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index b653b9098e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6f3f702482..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 18c92442de..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 4719a7a743..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index c531ba4c59..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 25cc127d5f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a55e3438e7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d0d66766d8..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d867c165bc..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index c06401e4c0..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e87050158f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 39ded499d7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 29774ea42f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 8bc1e48d5f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f6bef563e2..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index cbfa0a9076..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d790925131..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 871b47e6b5..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 3660f96127..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 0647feb1d2..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 9adb7abaa5..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 132e70f822..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index b2f938c3f7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index bba33b69ed..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6842498c43..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f895a9776d..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 7a22c7020a..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 76d8c46426..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index ca780d602e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 36b904794e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 5fb74c2e39..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 51c23ec028..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e77a48829f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 9dec46b1ee..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6346716b45..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index b83d03df51..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index eb0e370471..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 038a02fe1b..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 11da9384bd..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e33e2de670..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a91e1ee91b..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f873addd83..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json index d09b8a7004..6296d199e7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json @@ -18,10 +18,6 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e6126fdabe..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 84702a9ceb..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e47e18d589..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index fdf5e0f005..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 260b3f8506..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index cce036889c..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 41b388bc1d..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 5061c7cfd1..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 44f7070114..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 41e3359f1c..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 01d359edce..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json index 016f008fc9..00b173ecb4 100644 --- a/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json @@ -61,6 +61,9 @@ { "name": "eyes", "directions": 4 + }, + { + "name": "nian_m" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png index ff4e3eb2cf..740cb2102c 100644 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png index 63005e5416..93e0e03631 100644 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png index fbdf7c7e77..0402da86b3 100644 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi/meta.json index b6df9ad690..1741026542 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi/meta.json @@ -36,6 +36,38 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/equipped-MASK.png new file mode 100644 index 0000000000..683d4505b1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/icon.png new file mode 100644 index 0000000000..1f9f520351 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-left.png new file mode 100644 index 0000000000..40a7979685 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-right.png new file mode 100644 index 0000000000..c677b51ad6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/meta.json new file mode 100644 index 0000000000..f0f9546ac8 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZdown.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZdown.rsi/equipped-NECK.png index a498e80879..06cd3c7fa6 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZdown.rsi/equipped-NECK.png and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZdown.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZup.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZup.rsi/equipped-MASK.png index 7da4c3ea99..1ccd2dd8f6 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZup.rsi/equipped-MASK.png and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZup.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/equipped-NECK.png new file mode 100644 index 0000000000..3fa44c9e39 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/icon.png new file mode 100644 index 0000000000..f1e31fd108 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/meta.json new file mode 100644 index 0000000000..e8ed079623 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bluemoon https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/equipped-MASK.png new file mode 100644 index 0000000000..d32665f2b7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/icon.png new file mode 100644 index 0000000000..f1e31fd108 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/meta.json new file mode 100644 index 0000000000..28729e502b --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "evgen99, Spac__", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/winterhunter.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/winterhunter.rsi/meta.json index d45b473678..7bc2f5c71f 100644 --- a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/winterhunter.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/winterhunter.rsi/meta.json @@ -21,6 +21,22 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/equipped-FEET.png b/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/equipped-FEET.png index 3c326a2bf5..4071a8160f 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/equipped-FEET.png and b/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/icon.png index ef0ca81714..1478918e0d 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/maidenNPZ.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/maidenNPZ.rsi/equipped-INNERCLOTHING.png index 52a2ecf2fa..ef972068fe 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/maidenNPZ.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/maidenNPZ.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json index 02580f30fb..451acd6c3b 100644 --- a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json @@ -39,6 +39,24 @@ }, { "name": "LPPSecurityEnginer" + }, + { + "name": "Passenger" + }, + { + "name": "NoId" + }, + { + "name": "Prisoner" + }, + { + "name": "Geneticist" + }, + { + "name": "Lawyer" + }, + { + "name": "Nanotrasen" } ] } diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/meta.json index 91ebbd4815..78094a5b17 100644 --- a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/meta.json @@ -26,6 +26,18 @@ { "name": "antenna_default", "directions": 4 + }, + { + "name": "moth_markings", + "directions": 4 + }, + { + "name": "moth_antenna", + "directions": 4 + }, + { + "name": "moth_wings", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_antenna.png b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_antenna.png deleted file mode 100644 index dce2646aea..0000000000 Binary files a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_antenna.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_markings.png b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_markings.png deleted file mode 100644 index 2429b0aa12..0000000000 Binary files a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_markings.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_wings.png b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_wings.png deleted file mode 100644 index c3461b3be7..0000000000 Binary files a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_wings.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/stan.png b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/stan.png deleted file mode 100644 index a454cc87f8..0000000000 Binary files a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/stan.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/protogen.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Customization/protogen.rsi/meta.json index 535513e2ab..56b022a7d5 100644 --- a/Resources/Textures/_LostParadise/Mobs/Customization/protogen.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Mobs/Customization/protogen.rsi/meta.json @@ -106,6 +106,20 @@ { "name": "protogen_legs_r_rgb", "directions": 4 + }, + { + "name": "protogen_torso_gif000", + "directions": 4, + "delays": [ + [1.0, 0.13, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [1.0, 0.13, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [1.0, 0.13, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [1.0, 0.13, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1] + ] + }, + { + "name": "protogen_torso_rgb000", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Mobs/Species/Tajaran/parts.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Species/Tajaran/parts.rsi/meta.json index 7f99e6a7c6..8cf79bb156 100644 --- a/Resources/Textures/_LostParadise/Mobs/Species/Tajaran/parts.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Mobs/Species/Tajaran/parts.rsi/meta.json @@ -69,6 +69,9 @@ { "name": "tail_m", "directions": 4 + }, + { + "name": "full" } ] } diff --git a/Resources/Textures/_LostParadise/Mobs/Species/Vulpkanin/parts.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Species/Vulpkanin/parts.rsi/meta.json index 1dcfef60e1..a64c329a93 100644 --- a/Resources/Textures/_LostParadise/Mobs/Species/Vulpkanin/parts.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Mobs/Species/Vulpkanin/parts.rsi/meta.json @@ -70,6 +70,10 @@ { "name": "vulpkanin_m", "directions": 4 + }, + { + "name": "eyes", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Objects/Fun/belka.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Fun/belka.rsi/meta.json index 7c20ce9918..2363e01cfc 100644 --- a/Resources/Textures/_LostParadise/Objects/Fun/belka.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Fun/belka.rsi/meta.json @@ -9,6 +9,14 @@ "states": [ { "name": "belka-toy" + }, + { + "name": "belka-toy-inhand-right", + "directions": 4 + }, + { + "name": "belka-toy-inhand-left", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json index 4bbe9fa5c2..4933d5998b 100644 --- a/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json @@ -238,6 +238,22 @@ { "name": "pebbles-inhand-right", "directions": 4 + }, + { + "name": "amina-inhand-left", + "directions": 4 + }, + { + "name": "amina-inhand-right", + "directions": 4 + }, + { + "name": "crab-inhand-left", + "directions": 4 + }, + { + "name": "crab-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/hos-laser.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/hos-laser.rsi/meta.json index eafe3e519b..8357d8efea 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/hos-laser.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/hos-laser.rsi/meta.json @@ -32,6 +32,13 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "mag-unshaded-0" } ] } diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/lato.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/lato.rsi/meta.json index f66a392475..6fba53ac04 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/lato.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/lato.rsi/meta.json @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/ion.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/ion.png deleted file mode 100644 index 25f46e32b0..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/ion.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/meta.json index 1443b5465a..f87ad790f6 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "omnilaser" }, - { - "name": "ion" - }, { "name": "omnilaser_greyscale" }, diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/omnilaser.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/omnilaser.png index 34ddcc86ba..25f46e32b0 100644 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/omnilaser.png and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/omnilaser.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-12.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-12.png deleted file mode 100644 index 39e06d114e..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-12.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-20.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-20.png deleted file mode 100644 index 20e7201092..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-20.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-32.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-32.png deleted file mode 100644 index d98af343e6..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-32.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-8.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-8.png deleted file mode 100644 index 6d2b3fd034..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-8.png and /dev/null differ