Merge pull request #137 from MegaDaimond/master

Пулл длинных ножей

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

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

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

Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml

@@ -55,4 +55,4 @@
     containers:
       toggleable-clothing: !type:ContainerSlot {}
       storagebase: !type:Container
-        ents: []
+        ents: []

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
+    coefficient: 0.35

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

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

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
         ]

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"
     }
   ]

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

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

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

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

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

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

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

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