Merge pull request #177 from Lost-Paradise-Project/revert-175-duplica…

…te-removal Revert "LPPHammer & C4Low Removal"
Lost-Paradise-Project · Sep 21, 2024 · 0ce1d71 · 0ce1d71
2 parents c2ef1e8 + 8bf56e7
commit 0ce1d71
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 13 deletions.
diff --git a/Resources/Locale/ru-RU/_LostParadise/update20.ftl b/Resources/Locale/ru-RU/_LostParadise/update20.ftl
@@ -35,6 +35,8 @@ ent-LPParbitermask = Трофейная маска
     .desc = Трофейная маска одного из известных охотников. От неё так и веет отчаянием
 ent-LPPBrasMat = Раздатчик бюстгальтеров
     .desc = Раздатчик, что дополняет образ пользователя и делает его неотразимым!
+ent-LPPC4Low = C4Low
+    .desc = Взрывпакет предназначенный для быстрого выламывания шлюзов или стен, но его взрыв довольно слабый в плане радиуса. Виднеется этикетка (ставьте прямо на объект)
 ent-LPPCargodrobeVard = Раздатчик продвинутой одежды снабжения
     .desc = Красивая одежда для персонала снабжения!
 ent-LPPClothingMaskGasIIC = Противогаз Delta

diff --git a/Resources/Migrations/LostParadiseMigrations.yml b/Resources/Migrations/LostParadiseMigrations.yml
@@ -19,5 +19,3 @@ LPPFlagPoleSYND: null
 LPPLockerElectricalSuppliesSynFilled: null
 LPPRusUnder: null
 PlastitaniumPwindow: WindowReinforcedDirectional
-LPPC4Low: BreachingCharge
-LPPHammer: SecBreachingHammer
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -24,7 +24,7 @@
     ClothingOuterArmorPlateCarrier: 2 # DeltaV - moved body armour from SecDrobe to SecTech
     ClothingOuterArmorDuraVest: 2
     ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter.
-    BreachingCharge: 8
+    # BreachingCharge: 8
     LPPWeaponEnergyGunSoleil: 2 #LPP
     LPPTelebaton: 3 #LPP
   # security officers need to follow a diet regimen!

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -718,6 +718,7 @@
     idleState: icon
     runningState: icon
     staticRecipes:
+      - LPPC4Low
       - ClothingEyesHudSecurity
       - CombatKnife
       - Flash

diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/security.yml
@@ -14,7 +14,7 @@
       - id: ToolboxMechanicalFilled
       - id: ClothingHandsGlovesCombat
       - id: LPPClothingOuterHardsuitSecurityEng
-      - id: BreachingCharge
-      - id: SecBreachingHammer
+      - id: LPPC4Low
+      - id: LPPHammer
       - id: RCD
       - id: RCDAmmo
diff --git a/Resources/Prototypes/_LostParadise/Catalog/Hos_catalog.yml b/Resources/Prototypes/_LostParadise/Catalog/Hos_catalog.yml
@@ -1191,7 +1191,7 @@
   id: LPPHosCatalogHammer
   name: штурмовой молот
   description: Молот предназначенный для быстрого проникновения сквозь стены, шлюзы, а также для крушения чьих то черепов. Он явно более робастный, чем обычные молоты.
-  productEntity: SecBreachingHammer
+  productEntity: LPPHammer
   cost:
     LPPCentcoin: 5
   categories:
@@ -1221,7 +1221,7 @@
   id: LPPHosC4Low
   name: Слабая C4
   description: Взрывпакет предназначенный для быстрого выламывания шлюзов или стен, но его взрыв довольно слабый в плане радиуса. Виднеется этикетка (ставьте прямо на объект).
-  productEntity: BreachingCharge
+  productEntity: LPPC4Low
   cost:
     LPPCentcoin: 1
   categories:

diff --git a/Resources/Prototypes/_LostParadise/Catalog/cburn_defence_catalog.yml b/Resources/Prototypes/_LostParadise/Catalog/cburn_defence_catalog.yml
@@ -306,7 +306,7 @@
 #  id: LPPCBURNCatalogEngineeringHammer
 #  name: cburn-catalog-engineering-hammer-name
 #  description: cburn-catalog-engineering-hammer-desc
-#  productEntity: SecBreachingHammer
+#  productEntity: LPPHammer
 #  cost:
 #    Telecrystal: 5
 #  categories:

diff --git a/Resources/Prototypes/_LostParadise/Catalog/delta_catalog.yml b/Resources/Prototypes/_LostParadise/Catalog/delta_catalog.yml
@@ -659,7 +659,7 @@
 #  id: LPPDeltaCatalogEngineeringHammer
 #  name: delta-catalog-engineering-hammer-name
 #  description: delta-catalog-engineering-hammer-desc
-#  productEntity: SecBreachingHammer
+#  productEntity: LPPHammer
 #  cost:
 #    Telecrystal: 3
 #  categories:

diff --git a/Resources/Prototypes/_LostParadise/Catalog/ert_catalog.yml b/Resources/Prototypes/_LostParadise/Catalog/ert_catalog.yml
@@ -657,7 +657,7 @@
 #  id: LPPERTCatalogEngineeringHammer
 #  name: ert-catalog-engineering-hammer-name
 #  description: ert-catalog-engineering-hammer-desc
-#  productEntity: SecBreachingHammer
+#  productEntity: LPPHammer
 #  cost:
 #    Telecrystal: 5
 #  categories:

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Bombs/C4Low.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Bombs/C4Low.yml
@@ -0,0 +1,30 @@
+- type: entity
+  name: C4Low
+  description: Взрывпакет предназначенный для быстрого выламывания шлюзов или стен, но его взрыв довольно слабый в плане радиуса. Виднеется этикетка (ставьте прямо на объект)
+  parent: BasePlasticExplosive
+  id: LPPC4Low
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Bombs/C4Low.rsi
+    state: icon
+  - type: OnUseTimerTrigger
+    delay: 5
+    delayOptions: [5, 10, 15, 20]
+    initialBeepDelay: 0
+    beepSound:
+      path: /Audio/Effects/Cargo/buzz_two.ogg
+      params:
+        volume: -6
+    startOnStick: false
+    canToggleStartOnStick: true
+  - type: TriggerOnSignal
+  - type: DeviceLinkSink
+    ports:
+    - Trigger
+  - type: Explosive
+    explosionType: DemolitionCharge
+    totalIntensity: 10
+    intensitySlope: 10
+    maxIntensity: 10
+    canCreateVacuum: false
+  - type: ExplodeOnTrigger
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/hammer.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/hammer.yml
@@ -0,0 +1,34 @@
+- type: entity
+  id: LPPHammer
+  parent: BaseItem
+  name: штурмовой молот
+  description: Молот предназначенный для быстрого проникновения сквозь стены, шлюзы, а также для крушения чьих то черепов
+  components:
+  - type: Tag
+    tags:
+      - LPPHammer
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Melee/LPPHammer.rsi
+    state: icon
+  - type: Item
+    size: Huge
+  - type: MeleeWeapon
+    attackRate: 0.75
+    range: 1.70
+    damage:
+      types:
+        Blunt: 10
+        Structural: 30
+    bluntStaminaDamageFactor: 1.50
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 10
+        Structural: 80
+  - type: ToolTileCompatible
+  - type: Clothing
+    sprite: _LostParadise/Objects/Weapons/Melee/LPPHammer.rsi
+    quickEquip: false
+    slots:
+    - back
diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/HammerCabinet.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/HammerCabinet.yml
@@ -94,7 +94,7 @@
 #         ejectOnInteract: true
 #         whitelist:
 #           tags:
-#           - SecBreachingHammer
+#           - LPPHammer
 #   - type: Lock
 #   - type: AccessReader
 #     access: [["Engineering"], ["Salvage"], ["Security"]]
@@ -107,4 +107,4 @@
 #   - type: ContainerFill
 #     containers:
 #       ItemCabinet:
-#       - SecBreachingHammer
+#       - LPPHammer
diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml
@@ -102,3 +102,11 @@
   completetime: 5
   materials:
     Steel: 1150
+
+- type: latheRecipe
+  id: LPPC4Low
+  result: LPPC4Low
+  completetime: 10
+  materials:
+    Plastic: 375
+    Plasma: 375
diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml
@@ -46,4 +46,4 @@
     back:
     - SheetSteel10
     - SheetGlass10
-    - BreachingCharge
+    - LPPC4Low
diff --git a/Resources/Prototypes/_LostParadise/tags.yml b/Resources/Prototypes/_LostParadise/tags.yml
@@ -143,6 +143,8 @@
 - type: Tag
   id: LPPDrinkBottleAlko
 
+- type: Tag
+  id: LPPHammer
 # [Обоема для M41-A]
 
 - type: Tag