Добавили со Шрёдькой кружку СССП

AdventureTimeSS14 · Mar 11, 2024 · 51139a3 · 51139a3
1 parent 3808a02
commit 51139a3
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 0 deletions.
diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/ussp_mup.ftl b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/ussp_mup.ftl
@@ -0,0 +1,2 @@
+ent-ADTUSSPMug = кружка СССП
+    .desc = Кружка с гербом СССП. Пейте во славу Союза.
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ussp_mug.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ussp_mug.yml
@@ -0,0 +1,11 @@
+- type: entity
+  parent: DrinkBaseMug
+  id: ADTUSSPMug
+  name: ussp mug
+  description: A metal mug. You're not sure which metal.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/mug_metal.rsi
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 25
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -28,3 +28,4 @@
     DrinkMugOne: 1
     DrinkMugRainbow: 2
     DrinkMugRed: 2
+    ADTUSSPMug: 2
diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-0.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-0.png
diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-1.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-1.png
diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-2.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-2.png
diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-3.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-3.png
diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon-0"
+        },
+        {
+            "name": "icon-1"
+        },
+        {
+            "name": "icon-2"
+        },
+        {
+            "name": "icon-3"
+        }
+    ]
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-ADTUSSPMug = кружка СССП
		.desc = Кружка с гербом СССП. Пейте во славу Союза.