diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml index 3285384cc2..b797f588fe 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -3,8 +3,10 @@ startingInventory: FoodSnackRaisins: 3 FoodSnackChocolate: 3 - FoodSnackPopcorn: 3 + FoodSnackCnDs: 3 + FoodSnackPistachios: 3 + FoodSnackSus: 3 + FoodSnackSemki: 3 + emaggedInventory: FoodSnackSyndi: 3 - DrinkRamen: 3 - DrinkHellRamen: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml index e529df937b..60a7098328 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml @@ -21,6 +21,7 @@ - FoodPacketChipsTrash - FoodPacketChocolateTrash - FoodPacketChowMeinTrash + - FoodPacketCnDsTrash - FoodPacketDanDanTrash - FoodPacketEnergyTrash - FoodPacketPistachioTrash diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index fb02a92949..9c6d4a73fa 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -42,6 +42,21 @@ - type: Food trash: FoodPacketBoritosTrash +- type: entity + name: C&Ds + parent: FoodSnackBase + id: FoodSnackCnDs + description: Legally, we cannot say that these won't melt in your hands. + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: cnds + - type: Item + - type: Food + trash: FoodPacketCnDsTrash + - type: entity name: cheesie honkers parent: FoodSnackBase @@ -153,6 +168,22 @@ state: energybar-open - type: Item +- type: entity + name: sweetie's pistachios + parent: FoodSnackBase + id: FoodSnackPistachios + description: Sweeties's name-brand pistachios. probably won't give you diseases. Probably. + components: + - type: FlavorProfile + flavors: + - salty + - nutty + - type: Sprite + state: pistachio + - type: Item + - type: Food + trash: FoodPacketPistachioTrash + - type: entity name: popcorn parent: FoodSnackBase @@ -187,7 +218,22 @@ trash: FoodPacketRaisinsTrash - type: entity - name: Sus Jerky + name: bob's semki sunflower seeds + parent: FoodSnackBase + id: FoodSnackSemki + description: Proudly produced by the Bob Bobson nutritional corporation. Perfect for spitting at people. + components: + - type: FlavorProfile + flavors: + - nutty + - type: Sprite + state: semki + - type: Item + - type: Food + trash: FoodPacketSemkiTrash + +- type: entity + name: sus jerky parent: FoodSnackBase id: FoodSnackSus description: Something about this packet makes you feel incredibly uneasy. Jerky's good though. @@ -413,6 +459,16 @@ state: boritos-trash - type: Item +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodPacketCnDsTrash + name: C&Ds bag + components: + - type: Sprite + state: cnds-trash + - type: Item + - type: entity noSpawn: true parent: FoodPacketTrash diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds-trash.png new file mode 100644 index 0000000000..0f622e08f7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds.png new file mode 100644 index 0000000000..9747f62a51 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cnds.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json index d2fa0235ad..116e05d18f 100644 --- a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x", "size": { "x": 32, "y": 32 @@ -63,6 +63,12 @@ "name": "chocolatebar-inhand-left", "directions": 4 }, + { + "name": "cnds" + }, + { + "name": "cnds-trash" + }, { "name": "cookie_fortune" }, @@ -116,6 +122,9 @@ { "name": "peachtinmaint-open" }, + { + "name": "pistachio" + }, { "name": "pistachio-trash" }, @@ -139,6 +148,9 @@ { "name": "raisins-trash" }, + { + "name": "semki" + }, { "name": "semki-trash" }, diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/pistachio.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/pistachio.png new file mode 100644 index 0000000000..bcc453be10 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/pistachio.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/semki.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/semki.png new file mode 100644 index 0000000000..70d798a391 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/semki.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes-trash.png index 242abe85d0..3ee1cd302e 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes-trash.png and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes.png index 1b45ff7bbd..af19280faf 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes.png and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes.png differ