diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 7504751dc3..8fb2ff6a97 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -20,6 +20,7 @@ - PonderingOrb - Skub - ClothingHeadHatCatEars + - DrinkMugDog rareChance: 0.01 prototypes: - Lighter @@ -38,8 +39,8 @@ - ClothingUnderSocksCoder chance: 0.6 offset: 0.0 - - + + - type: entity name: Maint Loot Spawner suffix: Tools+Cells+Mats @@ -73,7 +74,7 @@ - SheetPlastic chance: 0.6 offset: 0.0 - + - type: entity name: Maint Loot Spawner suffix: Scrap+Weapons diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 83fb388132..84f790848f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -79,6 +79,16 @@ sprite: Objects/Consumable/Drinks/mug_green.rsi state: icon-3 +- type: entity + parent: DrinkBaseCup + id: DrinkMugDog + name: funny dog mug + description: It looks like a cartoon beagle. + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/mug_dog.rsi + state: icon-3 + - type: entity parent: DrinkBaseCup id: DrinkMugHeart diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png new file mode 100644 index 0000000000..b733d745fe Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json new file mode 100644 index 0000000000..f605d28ff7 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/unitystation/unitystation/blob/221bbcc50edf4e63dc71ac6fd5152664a6b6745a/UnityProject/Assets/Textures/items/drinks/mug_gromit.png | Created By https://github.com/ksivte", + "states": [ + { + "name": "icon-3" + } + ] +} \ No newline at end of file