Патч первой секунды

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -1695,3 +1695,60 @@
   conditions:
   - !type:ListingLimitedStockCondition
     stock: 1
+
+# LPP
+
+- type: listing
+  id: LPPUplinkGlaive
+  name: Кроваво красная глефа
+  description: Модифицированная версия глефы, усовершенствованная каким-то больным утилизатором...
+  icon: { sprite: /Textures/LPP/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon }
+  productEntity: LPPWeaponSyndieGlaive
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkWeapons
+
+- type: listing
+  id: LPPUplinkupgrwebbing
+  name: разгрузочный жилет "Хомяк"
+  description: Комплект из карманов, сумок и прочей лабуды предоставляет кучу места для ваших всевозможных вещей, что вы сюда запихнёте. Выглядит крайне громоздко однако.
+  icon: { sprite: /Textures/LPP/Clothing/Belt/upgrwebbing.rsi, state: icon }
+  productEntity: LPPClothingBeltMaximumWebbing
+  cost:
+    Telecrystal: 2
+  categories:
+    - UplinkArmor
+
+- type: listing
+  id: LPPUplinkAcientHardsuitSyndie
+  name: древний скафандр Синдиката
+  description: Очень странная модель скафандра Ядерных Оперативников, явно нестандартной конфигурации
+  icon: { sprite: /Textures/LPP/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon }
+  productEntity: LPPClothingOuterHardsuitAcientSyndie
+  cost:
+    Telecrystal: 11
+  categories:
+  - UplinkArmor
+
+- type: listing
+  id: LPPUplinkEcbow
+  name: мини арбалет синдиката
+  description: Любимое оружие агентов из далёких времён. Выстрел сразу же поражает цель, роняя моментально вашу цель на короткое время. Хоть оно и не требуется боеприпасов для стрельбы, однако самому оружию требуется перезарядка для повторного выстрела.
+  icon: { sprite: /Textures/LPP/Objects/Weapons/Guns/Battery/ecbow.rsi, state: icon }
+  productEntity: LPPWeaponEnergyCrossbow
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkWeapons
+
+- type: listing
+  id: LPPUplinkhelmetswat
+  name: шлем спецназа синдиката
+  description: Крепкий шлем, что защитит вашу голову от ненужных свинцовых, а так же лазерных выстрелов.
+  icon: { sprite: Textures/Clothing/Head/Helmets/swat_syndicate.rsi, state: icon }
+  productEntity: ClothingHeadHelmetSwatSyndicate
+  cost:
+    Telecrystal: 2
+  categories:
+    - UplinkArmor

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -1041,3 +1041,133 @@
         Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
     soundHit:
       collection: MeatLaserImpact
+
+#---------------------LPP--------------------------
+
+- type: entity
+  id: BulletCutter
+  name: Cutter bolt
+  parent: BaseBullet
+  nospawn: true
+  description: Not too bad, but you still don't want to get hit by it.
+  components:
+  - type: Reflective
+    reflective:
+      - NonEnergy
+  - type: Sprite
+    noRot: false
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    layers:
+    - state: scatterlaser
+  - type: GatheringProjectile
+  - type: Projectile
+    DeleteOnCollide: false
+    damage:
+      types:
+        Blunt: 0.5
+  # Короткий срок пули
+  - 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.3,0.15,0.3"
+        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: 9
+    soundHit:
+      path: "/Audio/LPP/Weapons/Guns/Gunshots/ion/ion_hit_1.ogg"
+    soundForce: true
+  - 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: LPP/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: hitscan
+  id: RedAILaser
+  damage:
+    types:
+      Heat: 1
+  muzzleFlash:
+    sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi
+    state: AILaser_3
+  travelFlash:
+    sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi
+    state: AILaser_2
+  impactFlash:
+    sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi
+    state: AILaser_1

Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/buttplug.yml

@@ -133,13 +133,6 @@
   components:
   - type: Sprite
     sprite: _LostParadise/Clothing/Underwear/buttplugtail/big.rsi
-    scale: 1.0, 1.0
-    layers:
-      - state: equipped-NECK
-  - type: Clothing
-    sprite: _LostParadise/Clothing/Underwear/buttplugtail/big.rsi
-  - type: Item
-    size: Tiny
 
 - type: entity
   name: Medium tail buttplug
@@ -149,13 +142,6 @@
   components:
   - type: Sprite
     sprite: _LostParadise/Clothing/Underwear/buttplugtail/medium.rsi
-    scale: 1.0, 1.0
-    layers:
-      - state: equipped-NECK
-  - type: Clothing
-    sprite: _LostParadise/Clothing/Underwear/buttplugtail/medium.rsi
-  - type: Item
-    size: Tiny
 
 - type: entity
   name: Small tail buttplug
@@ -165,13 +151,6 @@
   components:
   - type: Sprite
     sprite: _LostParadise/Clothing/Underwear/buttplugtail/small.rsi
-    scale: 1.0, 1.0
-    layers:
-      - state: equipped-NECK
-  - type: Clothing
-    sprite: _LostParadise/Clothing/Underwear/buttplugtail/small.rsi
-  - type: Item
-    size: Tiny
 
 - type: entity
   name: big teal buttplug

Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml

@@ -109,3 +109,15 @@
       types:
         Blunt: 3
         Heat: 15
+
+- type: entity
+  id: LPPBulletLightRifleHunting
+  name: Huntingbullet (.30 rifle)
+  parent: BaseBullet
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 16
+        Blunt: 7

Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29, modified by linkblyat (Discord)",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14",
+  "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
   "size": {
     "x": 32,
     "y": 32