Merge pull request #287 from 1Stepka1/pizza-rofl

Взрывающиеся коробки для пиццы
AdventureTimeSS14 · Jan 7, 2024 · 1a1ffff · 1a1ffff
2 parents 5bdc98b + be17a0e
commit 1a1ffff
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 0 deletions.
diff --git a/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl b/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl
@@ -67,3 +67,7 @@ uplink-shrapnel-grenade-desc = Выбрасывает облако мелких
 
 uplink-smoke-grenade-name = Дымовая граната
 uplink-smoke-grenade-desc = Граната, выпускающая густое облако дыма. Идеально для побега после выполнения цели.
+
+uplink-explosive-pizzabox-name = Фальшивая коробка от пиццы
+uplink-explosive-pizzabox-desc = Фальшивая коробка от пиццы при открытии взрывается с силой сопостовимой с обычной разрывной гранатой. Эффективно если у жертвы нету сопротивлений к взрыву.
+
diff --git a/Resources/Locale/ru-RU/ADT/Objects/specific/explosivepizzabox.ftl b/Resources/Locale/ru-RU/ADT/Objects/specific/explosivepizzabox.ftl
@@ -0,0 +1,3 @@
+ent-ADTExplosivePizzabox = коробка пиццы
+    .desc = { ent-BaseItem.desc }
+    .suffix =  "Explosive" 
diff --git a/Resources/Prototypes/ADT/Catalog/uplink.yml b/Resources/Prototypes/ADT/Catalog/uplink.yml
@@ -338,3 +338,18 @@
       whitelist:
       - Medical
 
+
+- type: listing
+  id: ADTuplinkExplosivePizzabox
+  name: uplink-explosive-pizzabox-name
+  description: uplink-explosive-pizzabox-desc
+  productEntity: ADTExplosivePizzabox
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkJob
+  conditions:
+    - !type:BuyerJobCondition
+      whitelist:
+      - Chef
+      - ServiceWorker
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -94,3 +94,23 @@
     - type: Tag
       tags:
       - HideContextMenu
+
+- type: entity
+  name: Pizza box
+  parent: BaseItem
+  id: ADTExplosivePizzabox
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Grenades/explosivepizzabox.rsi
+    state: icon
+  - type: Item
+    size: Small
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 10
+    intensitySlope: 3
+    totalIntensity: 120 
+    canCreateVacuum: false
+  - type: OnUseTimerTrigger
+    delay: 0.1 
diff --git a/Resources/Textures/ADT/Objects/Weapons/Grenades/explosivepizzabox.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Grenades/explosivepizzabox.rsi/icon.png
diff --git a/Resources/Textures/ADT/Objects/Weapons/Grenades/explosivepizzabox.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Grenades/explosivepizzabox.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}