diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index ce7a5f6a8c..b7041391d1 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1354,7 +1354,7 @@ icon: { sprite: /Textures/Structures/Storage/Crates/syndicate.rsi, state: icon } productEntity: CrateCybersunJuggernautBundle cost: - Telecrystal: 12 + Telecrystal: 11 categories: - UplinkArmor @@ -1761,6 +1761,6 @@ icon: { sprite: /Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon } productEntity: LPPClothingOuterHardsuitAcientSyndie cost: - Telecrystal: 11 + Telecrystal: 12 categories: - UplinkArmor diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 2cb4443a58..f5d5c4ac30 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -572,6 +572,7 @@ - HidesTail - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP # Syndicate Medic Hardsuit - type: entity @@ -594,6 +595,7 @@ - HidesTail - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP #Syndicate Elite Hardsuit - type: entity @@ -632,6 +634,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitSyndieElite - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP #Syndicate Commander Hardsuit - type: entity @@ -666,6 +669,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitSyndieCommander - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP #Cybersun Juggernaut Hardsuit - type: entity @@ -699,7 +703,8 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitCybersun - type: StaminaDamageResistance - coefficient: 0.5 # 50% + coefficient: 0.2 # 50% + - type: BiocodedClothing #LPP #Wizard Hardsuit - type: entity @@ -734,6 +739,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitWizard - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP #Ling Space Suit - type: entity @@ -847,7 +853,8 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitERTLeader - type: StaminaDamageResistance - coefficient: 0.5 # 50% + coefficient: 0.2 # 50% + - type: BiocodedClothing #LPP #ERT Chaplain Hardsuit - type: entity @@ -864,6 +871,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitERTChaplain - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP #ERT Engineer Hardsuit - type: entity @@ -880,6 +888,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP #ERT Medic Hardsuit - type: entity @@ -896,6 +905,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitERTMedical - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP #ERT Security Hardsuit - type: entity @@ -917,6 +927,7 @@ - HidesTail - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP #ERT Janitor Hardsuit - type: entity @@ -933,6 +944,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitERTJanitor - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: BiocodedClothing #LPP #Deathsquad - type: entity @@ -968,7 +980,8 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad - type: StaminaDamageResistance - coefficient: 0.1 # 90% + coefficient: 0.05 # 95% + - type: BiocodedClothing #LPP #CBURN Hardsuit - type: entity @@ -1005,6 +1018,7 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCBURN + - type: BiocodedClothing #LPP #MISC. HARDSUITS #Clown Hardsuit diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml index b5e7fc8b45..fa69215313 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml @@ -10,15 +10,13 @@ - type: Clothing sprite: _LostParadise/Clothing/Head/Helmets/acienthelmsyndieeva.rsi - type: BreathMask + - type: FlashImmunity - type: EyeProtection - type: PointLight color: "green" - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 10000 - - type: ClothingSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 - type: Armor modifiers: coefficients: @@ -33,8 +31,8 @@ parent: ClothingHeadHardsuitWithLightBase id: LPPClothingHeadHelmetHunter noSpawn: true - name: шлем древнего скафандра Охотника (защитный) - description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. он в защитном режиме. + name: шлем древнего скафандра Охотника + description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. components: - type: Sprite sprite: _LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi @@ -46,18 +44,19 @@ - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 10000 - - type: ClothingSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.85 - Heat: 0.85 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 - type: TemperatureProtection coefficient: 0.005 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] - type: entity parent: ClothingHeadHardsuitBase diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml index 712c1e27a0..4f87c22d4a 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml @@ -55,4 +55,4 @@ containers: toggleable-clothing: !type:ContainerSlot {} storagebase: !type:Container - ents: [] + ents: [] \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml index bb5299cc00..bf4f55d774 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml @@ -29,9 +29,9 @@ damageCoefficient: 0.2 - type: BiocodedClothing - type: ToggleableClothing - clothingPrototype: LPPClothingMaskAcientSyndie + clothingPrototype: LPPClothingHeadHelmetAcientSyndieEVA requiredSlot: - outerclothing - slot: mask + slot: head - type: StaminaDamageResistance - coefficient: 0.4 \ No newline at end of file + coefficient: 0.35 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/winterhuntersuit.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/winterhuntersuit.yml index e82cfdb58f..963f5cee14 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/winterhuntersuit.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/winterhuntersuit.yml @@ -28,5 +28,5 @@ - type: ExplosionResistance damageCoefficient: 0.8 - type: ToggleableClothing - clothingPrototype: LPPClothingMaskHunter - slot: mask + clothingPrototype: LPPClothingHeadHelmetHunter + slot: head diff --git a/Resources/Textures/Nyanotrasen/Clothing/Misc/office_skirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Nyanotrasen/Clothing/Misc/office_skirt.rsi/equipped-INNERCLOTHING.png index 29a9c07b1e..a83203f88a 100644 Binary files a/Resources/Textures/Nyanotrasen/Clothing/Misc/office_skirt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Nyanotrasen/Clothing/Misc/office_skirt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/bunny.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/bunny.rsi/equipped-INNERCLOTHING.png index 0d1203da0c..34e3689a1a 100644 Binary files a/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/bunny.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/bunny.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png index f97ff00c3d..ef30063560 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png index ceb623570e..011494358c 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png index 40209c2f66..0adfe2cf1d 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png index 62c4528ae1..502d5cee8d 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png index 489b48b78a..e2279402db 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png index ca719e883a..d170db3871 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png index 581a50d15f..eeb5ed1dd8 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json index 11326a1093..e22010f8ba 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "copyright": "Draw by Skilets: https://github.com/Skilets", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png index f52a739ad3..aae9cc2e06 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json index 54a2e31b01..9c1e376f2c 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "copyright": "Draw by Skilets: https://github.com/Skilets", "size": { "x": 32, "y": 32 @@ -11,6 +11,9 @@ "name": "beakerbluespace", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1 ] diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png index 4e0fb0fc06..94beb91ea1 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png index 5ecf243047..a96880a75b 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png index 05e647f110..33c401dfaa 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png index 0a464113d7..7b24df9435 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png index c16054a21a..da75364859 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png index 363e3a1bfc..d41d709a5c 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png index 64126589da..c47ce0514c 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json index 9c3c7d203d..c9d753f948 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Draw by Skilets: https://github.com/Skilets", "size": { "x": 32, "y": 32 @@ -68,7 +68,7 @@ { "name": "beakerlarge5" }, - { + { "name": "beakerlarge6" } ] diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png index 037de6fdee..75bf1e2075 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png index 340caf4046..de42732758 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png index 6cff981ad6..e73846ee8e 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png index eda7228dac..482b00d6db 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png index 93ea9e5fec..b7e17e85eb 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png index 5fcb6725a5..b7e17e85eb 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png index a90ed4846c..6bd5356a02 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png index a90ed4846c..6bd5356a02 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json index 616fc1b571..684e69c98d 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Draw by Skilets: https://github.com/Skilets", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png index d7e70697ad..a521b4cda1 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png index 29fc1fb7ac..d7c74129ee 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png and b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/inhand-left.png index 93138a8733..b9f4b4db42 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/inhand-right.png index 2f7875947a..5d7b922ba9 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json index 3ff460a2c7..c8aeeba939 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305", + "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305, resprite by mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png index 1fda41e3b5..e046475ad8 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png index 5ecf243047..190f295e21 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png index 05e647f110..de13f5063e 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png index 0a464113d7..317c216a09 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png index c16054a21a..8300da2afb 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png index 363e3a1bfc..8c45737d14 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png index 64126589da..d6edd64317 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json index 85c293d34d..13b94ed039 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by HoofedEar", + "copyright": "Draw by Skilets: https://github.com/Skilets", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png index 8b00bb5040..e06a92dca3 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/butch.png b/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/butch.png index 922bb19c1a..9eb6e30526 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/butch.png and b/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/butch.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json index 266149d72c..72b10f5546 100644 --- a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png index 2d24521008..511e89fdf4 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png index 9f8ae76c3c..c594138d95 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png index ce78cfc276..339d96b14c 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png index 910dda1a14..7731151458 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json index 3d83a91ae5..d558b8b07e 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken and modified by Taral from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png index f928b92fb1..31c8bec241 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png index 65a9442394..27f6733f76 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/equipped-BACKPACK.png index c4a05dd80e..2e33383a00 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png index 58e2f14942..16d3f92dcd 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-left.png index 420ab54038..cde202e811 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-right.png index b9ef6c0e9a..92f591290d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/meta.json index 6432748b6f..d558b8b07e 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken and modified by Taral from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806 and then further modified by EmoGarbage404", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-left.png index c40ba4c065..be352a376a 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-right.png index 7775de7e60..5828809222 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png index 288f9fbce5..4550985e2f 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png index 4a9e66b72a..ec739fde2e 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png index b2f253c30b..dfe5c9d514 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png index ac3aec2247..f3df34072d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json index 08894a12a7..8b91ce96a5 100644 --- a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png index 288f9fbce5..4f24bae15a 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/icon.png index 8ec73e718b..d1cae1befa 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png index b2f253c30b..6739d43adc 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png index ac3aec2247..db4b3ed7f1 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json index 455734e044..925b9922c4 100644 --- a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32