diff --git a/Resources/Locale/en-US/advertisements/vending/chang.ftl b/Resources/Locale/en-US/advertisements/vending/chang.ftl new file mode 100644 index 0000000000..34b6ece3ff --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/chang.ftl @@ -0,0 +1,4 @@ +advertisement-chang-1 = Taste 5000 years of culture! +advertisement-chang-2 = Mr. Chang, approved for safe consumption in over 10 sectors! +advertisement-chang-3 = Chinese food is great for a date night, or a lonely night! +advertisement-chang-4 = You can't go wrong with Mr. Chang's authentic Chinese food! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml new file mode 100644 index 0000000000..59e16a011d --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml @@ -0,0 +1,7 @@ +- type: advertisementsPack + id: ChangAds + advertisements: + - advertisement-chang-1 + - advertisement-chang-2 + - advertisement-chang-3 + - advertisement-chang-4 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml new file mode 100644 index 0000000000..6b7c3756f9 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml @@ -0,0 +1,13 @@ +- type: vendingMachineInventory + id: ChangInventory + name: Mr. Chang + animationDuration: 2.1 + spriteName: cigs + startingInventory: + FoodCondimentPacketSoy: 5 + FoodSnackCookieFortune: 5 + DrinkRamen: 3 + DrinkHellRamen: 3 + FoodSnackChowMein: 3 + FoodSnackDanDanNoodles: 3 +# rice? \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index fd7994f563..4ae08470c6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -189,6 +189,73 @@ color: white - type: Food trash: FoodPacketSyndiTrash + +- type: entity + name: chow mein + parent: FoodSnackBase + id: FoodSnackChowMein + description: A salty fried noodle snack. Looks like they forgot the vegetables. + components: + - type: Sprite + state: chinese1 + - type: Item + color: red + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 # Room for extra condiments + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Soysauce + Quantity: 2 + - type: Food + trash: FoodPacketChowMeinTrash + +- type: entity + name: dan dan noodles + parent: FoodSnackBase + id: FoodSnackDanDanNoodles + description: A spicy Sichuan noodle snack. The chili oil slick pools on top. + components: + - type: Sprite + state: chinese2 + - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 # Room for extra condiments + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: CapsaicinOil + Quantity: 2 + - ReagentId: Soysauce + Quantity: 2 + - type: Food + trash: FoodPacketDanDanTrash + +- type: entity + name: fortune cookie + parent: FoodSnackBase + id: FoodSnackCookieFortune + description: A boring cardboard tasting snack with a fortune inside. Surprise! You're boring too. + components: + - type: Sprite + state: cookie_fortune + - type: SolutionContainerManager + solutions: + food: + maxVol: 1 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - type: Item + sprite: Objects/Consumable/Food/snacks.rsi + HeldPrefix: packet + size: 1 + - type: Food + trash: FoodCookieFortune - type: entity name: nutribrick @@ -399,6 +466,40 @@ - type: Item color: white +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodPacketChowMeinTrash + name: empty chow mein box + components: + - type: Sprite + state: chinese1 + - type: Item + color: red + +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodPacketDanDanTrash + name: empty dan dan box + components: + - type: Sprite + state: chinese2 + - type: Item + color: white + +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodCookieFortune + name: cookie fortune + description: "The fortune reads: The end is near...and it's all your fault." + components: + - type: Sprite + state: fortune + - type: Item + color: white + - type: entity noSpawn: true parent: FoodPacketTrash diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index aad7d8d8c8..abad938b39 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -806,6 +806,40 @@ energy: 1.6 color: "#326e3f" +- type: entity + parent: VendingMachine + id: VendingMachineChang + name: Mr. Chang + description: A self-serving Chinese food machine, for all your Chinese food needs. + components: + - type: VendingMachine + pack: ChangInventory + - type: Advertise + pack: ChangAds + - type: Speech + - type: Sprite + sprite: Structures/Machines/VendingMachines/changs.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - texture: Structures/Machines/VendingMachines/maintenance_panel.png + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + broken: true + - type: WiresVisualizer + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#ffe599" + +# job clothing + - type: entity parent: VendingMachine id: VendingMachineHydrobe diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml index aca470909b..8b55870946 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml @@ -61,6 +61,13 @@ desc: A salty soy-based flavoring. physicalDesc: salty color: saddlebrown + metabolisms: + Food: + effects: + - !type:SatiateHunger + factor: 0.5 + - !type:SatiateThirst + factor: -0.5 # high salt content - type: reagent id: TableSalt diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese1.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese1.png new file mode 100644 index 0000000000..b806e1d439 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese2.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese2.png new file mode 100644 index 0000000000..6f294c9d9b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese3.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese3.png new file mode 100644 index 0000000000..75479ce529 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese4.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese4.png new file mode 100644 index 0000000000..2764d959ee Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chinese4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cookie_fortune.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cookie_fortune.png new file mode 100644 index 0000000000..62ae9097e7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cookie_fortune.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/fortune.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/fortune.png new file mode 100644 index 0000000000..d3f5e56d4f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/fortune.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 5bc79c8af0..d2fa0235ad 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", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide", "size": { "x": 32, "y": 32 @@ -28,6 +28,18 @@ { "name": "cheesiehonkers-trash" }, + { + "name": "chinese1" + }, + { + "name": "chinese2" + }, + { + "name": "chinese3" + }, + { + "name": "chinese4" + }, { "name": "chips" }, @@ -51,6 +63,9 @@ "name": "chocolatebar-inhand-left", "directions": 4 }, + { + "name": "cookie_fortune" + }, { "name": "energybar" }, @@ -141,6 +156,9 @@ }, { "name": "tatortot" + }, + { + "name": "fortune" } ] } diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/broken.png new file mode 100644 index 0000000000..506d3b065e Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json new file mode 100644 index 0000000000..1da3cf0661 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e, modified by Peptide", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/normal-unshaded.png new file mode 100644 index 0000000000..e338b4c745 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/off.png new file mode 100644 index 0000000000..01de7afea4 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/panel.png new file mode 100644 index 0000000000..d0677806d6 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/panel.png differ