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 new file mode 100644 index 00000000000..6cb6f978963 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/ussp_mup.ftl @@ -0,0 +1,2 @@ +ent-ADTUSSPMug = кружка СССП + .desc = Кружка с гербом СССП. Пейте во славу Союза. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ussp_mug.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ussp_mug.yml new file mode 100644 index 00000000000..66f70665fa5 --- /dev/null +++ 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: ADT/Objects/Consumable/Drinks/ussp_cup.rsi + - type: PhysicalComposition + materialComposition: + Steel: 25 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml index ee37a0acb40..764122002bb 100644 --- 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 new file mode 100644 index 00000000000..450babc9b74 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-0.png differ 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 new file mode 100644 index 00000000000..af27fd34854 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-1.png differ 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 new file mode 100644 index 00000000000..39360e1cfd8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-2.png differ 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 new file mode 100644 index 00000000000..c46dd0db14a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/ussp_cup.rsi/icon-3.png differ 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 new file mode 100644 index 00000000000..88936512494 --- /dev/null +++ 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": "made by discord: schrodinger71, a member of SS14 Adventure Time team", + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + } + ] +} \ No newline at end of file