From c084a4fcb8743456c754cf14d9f14794a605bca5 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 28 Nov 2024 17:50:54 -0300 Subject: [PATCH 1/8] Add painkillers and antidepressant pills + canisters (#2260) * Add the pills + canisters * less evil YAML * Merge conflict * Revert "True merge conflict?" * Whitespace --------- Co-authored-by: Milon --- .../Objects/Specific/Medical/healing.yml | 248 ++++++++++++++++++ 1 file changed, 248 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml index f5afd0ed946..bd0bfd5f580 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml @@ -28,3 +28,251 @@ contents: - id: PillSoretizone amount: 5 + +- type: entity + parent: Pill + id: PillSerenitol + suffix: Serenitol 10u + components: + - type: Sprite + state: pill10 + - type: Pill + pillType: 9 + - type: Label + currentLabel: serenitol 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Serenitol + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterSerenitol + suffix: Serenitol 10u, 5 + components: + - type: Label + currentLabel: serenitol 10u + - type: StorageFill + contents: + - id: PillSerenitol + amount: 5 + +- type: entity + parent: Pill + id: PillNeurozenium + suffix: Neurozenium 10u + components: + - type: Sprite + state: pill8 + - type: Pill + pillType: 7 + - type: Label + currentLabel: neurozenium 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Neurozenium + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterNeurozenium + suffix: Neurozenium 10u, 5 + components: + - type: Label + currentLabel: neurozenium 10u + - type: StorageFill + contents: + - id: PillNeurozenium + amount: 5 + +- type: entity + parent: Pill + id: PillEquilibrazine + suffix: Equilibrazine 5u + components: + - type: Sprite + state: pill2 + - type: Pill + pillType: 1 + - type: Label + currentLabel: equilibrazine 5u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Equilibrazine + Quantity: 5 + +- type: entity + parent: PillCanister + id: PillCanisterEquilibrazine + suffix: Equilibrazine 5u, 5 + components: + - type: Label + currentLabel: equilibrazine 5u + - type: StorageFill + contents: + - id: PillEquilibrazine + amount: 5 + +- type: entity + parent: Pill + id: PillBlissifylovene + suffix: Blissifylovene 5u + components: + - type: Sprite + state: pill7 + - type: Pill + pillType: 6 + - type: Label + currentLabel: blissifylovene 5u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Blissifylovene + Quantity: 5 + +- type: entity + parent: PillCanister + id: PillCanisterBlissifylovene + suffix: Blissifylovene 5u, 5 + components: + - type: Label + currentLabel: blissifylovene 5u + - type: StorageFill + contents: + - id: PillBlissifylovene + amount: 5 + +- type: entity + parent: Pill + id: PillCalmafluxine + suffix: Calmafluxine 10u + components: + - type: Sprite + state: pill15 + - type: Pill + pillType: 14 + - type: Label + currentLabel: calmafluxine 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Calmafluxine + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterCalmafluxine + suffix: Calmafluxine 10u, 5 + components: + - type: Label + currentLabel: calmafluxine 10u + - type: StorageFill + contents: + - id: PillCalmafluxine + amount: 5 + +- type: entity + parent: Pill + id: PillTranquinase + suffix: Tranquinase 10u + components: + - type: Sprite + state: pill16 + - type: Pill + pillType: 15 + - type: Label + currentLabel: tranquinase 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Tranquinase + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterTranquinase + suffix: Tranquinase 10u, 5 + components: + - type: Label + currentLabel: tranquinase 10u + - type: StorageFill + contents: + - id: PillTranquinase + amount: 5 + +- type: entity + parent: Pill + id: PillStubantazine + suffix: Stubantazine 10u + components: + - type: Sprite + state: pill3 + - type: Pill + pillType: 2 + - type: Label + currentLabel: stubantazine 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Stubantazine + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterStubantazine + suffix: Stubantazine 10u, 5 + components: + - type: Label + currentLabel: stubantazine 10u + - type: StorageFill + contents: + - id: PillStubantazine + amount: 5 + +- type: entity + parent: Pill + id: PillAgonolexyne + suffix: agonolexyne 5u + components: + - type: Sprite + state: pill20 + - type: Pill + pillType: 19 + - type: Label + currentLabel: agonolexyne 5u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Agonolexyne + Quantity: 5 + +- type: entity + parent: PillCanister + id: PillCanisterAgonolexyne + suffix: Agonolexyne 5u, 5 + components: + - type: Label + currentLabel: agonolexyne 5u + - type: StorageFill + contents: + - id: PillAgonolexyne + amount: 5 From 5daceb220a7fa168b30de84c440c043ad921e4ab Mon Sep 17 00:00:00 2001 From: Kr8art Date: Fri, 29 Nov 2024 02:27:57 +0100 Subject: [PATCH 2/8] Add sustenance vendor restock (#2307) Co-authored-by: Milon --- .../catalog/fills/crates/vending-crates.ftl | 5 ++++- .../DeltaV/Catalog/Cargo/cargo_vending.yml | 10 ++++++++++ .../DeltaV/Catalog/Fills/Crates/vending.yml | 10 +++++++++- .../Service/vending_machine_restock.yml | 16 ++++++++++++++++ .../vending_machine_restock.rsi/meta.json | 5 ++++- .../refill_sustenance.png | Bin 0 -> 1765 bytes 6 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_sustenance.png diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl index c85296a6497..c962f83e877 100644 --- a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl @@ -1,2 +1,5 @@ ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate - .desc = Contains a restock box for the Pride-O-Mat. \ No newline at end of file + .desc = Contains a restock box for the Pride-O-Mat. + +ent-CrateVendingMachineRestockSustenanceFilled = Sustenance vendor restock crate + .desc = Contains a restock box for the sustenance vendor. diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml index 343ec4d5333..65b07de0c87 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml @@ -7,3 +7,13 @@ cost: 1100 category: Service group: market + +- type: cargoProduct + id: CrateVendingMachineRestockSustenance + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockSustenanceFilled + cost: 750 + category: Service + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml index 985b0443e2b..11883c41332 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml @@ -4,4 +4,12 @@ components: - type: StorageFill contents: - - id: VendingMachineRestockPride \ No newline at end of file + - id: VendingMachineRestockPride + +- type: entity + id: CrateVendingMachineRestockSustenanceFilled + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: VendingMachineRestockSustenance diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml index febf8d2765a..281b590e7e4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -23,3 +23,19 @@ - state: green_bit shader: unshaded - state: refill_pride + +- type: entity + parent: BaseVendingMachineRestockDeltaV + id: VendingMachineRestockSustenance + name: Sustenance vendor restock box + description: Prisoners have to eat too. Nobody said they had to eat well. + components: + - type: VendingMachineRestock + canRestock: + - SustenanceInventory + - type: Sprite + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_sustenance diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json index b4d6a7706ca..caefa7f4992 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_pride made by Dorragon for Delta-V", + "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_pride made by Dorragon for Delta-V. refill_sustenance made by Kr8 for Delta-V", "size": { "x": 32, "y": 32 @@ -23,6 +23,9 @@ }, { "name": "refill_pride" + }, + { + "name": "refill_sustenance" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_sustenance.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_sustenance.png new file mode 100644 index 0000000000000000000000000000000000000000..237ff98de11b0580bcb383757ea242e09cb205d9 GIT binary patch literal 1765 zcmbVNTWB0r7@k}LW_b_F!n(~^A?akh!0Wv(g($YC`D}52SJLU7TSpMMX30YcxG=Vl3s9OcFxRv z=lj0@GXK0WJ@xd#{=t4h5DrdGWM}yqM8_R{{6DDI|Kz9r-o*2PARM?iI=Y1SRtE$j z_LY;L59f2wAi~OVY%!C@Yh{n41z~8o=3%l(LtxT^<7UJ^&V4EZ$I6JuwH(ZOW3=c@ z)O|WvpURW^A~7s+_(?ESL!6*YLkw!=k{h5}Mr`mRzK(9oB4|Lu#f&%_34;0DG#Fz( z1x8$v2!txojkulAlGG+gfeO`xtSB-xBt=C@h*TZ4ej=CiEgQ{dkF~`3RYoj^p@(F- zTCK*bi8%8MvSJv93{_cGC617SWjDk%$qkOQ8L~7WzT<@sb3w$2O;!mrBDdO%q3m^N z-Jq2xo-w(GJz0svD5eI`A|0Gp@k@Z9Ed z9gRJ`l*=87ARJ%fVYCvmCpyS4dsLpK0jv0gjxTYWN1|vvH0DzrGC$8)sa>h*wq>Ad zaSc3r+;J^d4IbOEfo5??Ga|2AQc@I2G4i}>P(^C`38)|lo6sDy9D8{;R88j<4JkU( zQoEqMXDl4zTY@cuZ046S57;T=0+l_tAc9UB(HJW+p9^z$iH3_@4o$j2h+RS_vl)@c z9CsWGVMB-5)>TPMDTYM#q$y!NjU}5TNkUIqS`yOs{wyPvsIt-iW|v!xaE^afP0dKE znr%xKwx~qXNg^4xYDz{5Q$0;n)HL-r+q1sIUo>3W$r`z`I3uwzHf#k-+z*u$EvZQ+ zv_rmqf%iF)b_~X`aeXIMm4^H)5lwx@0jCwP`>$V} z5zM*sUE&Y3uU`80_u2t*;N?%ygO$(D^c*`3H-uLPgwxkfo;vaI;~z#JqRH{8>_<;6 GocIS{Yd5$6 literal 0 HcmV?d00001 From 5656686207973f952cc9dc876df410f38c686a5e Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 29 Nov 2024 02:28:16 +0100 Subject: [PATCH 3/8] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index a9d7ef4c038..e0213fb2f49 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DebugOk - changes: - - message: You should be able to exit cryo even after leaving now, meaning it just - keeps your body safe? - type: Tweak - id: 215 - time: '2024-01-31T07:41:58.0000000+00:00' - author: DebugOk changes: - message: Prisoners will no longer spawn in cryopods instead of in the brig. @@ -3779,3 +3772,11 @@ id: 714 time: '2024-11-28T19:36:26.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2309 +- author: Kr8art + changes: + - message: Added a restock for the sustenance vendor to end the ongoing involuntary + hunger strikes in perma. + type: Add + id: 715 + time: '2024-11-29T01:27:57.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2307 From 8c6f15c4cc471c775aa79f941a3c6e273eb020cf Mon Sep 17 00:00:00 2001 From: Emily <182209267+Emily9031@users.noreply.github.com> Date: Thu, 28 Nov 2024 23:35:23 -0700 Subject: [PATCH 4/8] Delta V Species Gasps (#2313) Adds gasps to felinids, harpies, vulpkanins, and rodentia. --- .../DeltaV/SoundCollections/harpy.yml | 8 +++++++ .../DeltaV/Voice/speech_emote_sounds.yml | 24 +++++++++++++++++-- .../Nyanotrasen/Voice/speech_emote_sounds.yml | 8 +++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/SoundCollections/harpy.yml diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml new file mode 100644 index 00000000000..926903fbb3e --- /dev/null +++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml @@ -0,0 +1,8 @@ +- type: soundCollection + id: HarpyGasp + files: + - /Audio/Effects/Gasp/gasp_male1.ogg + - /Audio/Effects/Gasp/gasp_male2.ogg + - /Audio/Effects/Gasp/gasp_female1.ogg + - /Audio/Effects/Gasp/gasp_female2.ogg + - /Audio/Effects/Gasp/gasp_female3.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 7fafa0538d7..02a332544d0 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -64,6 +64,10 @@ # collection: BikeHorn Weh: collection: Weh + Gasp: + collection: HarpyGasp + DefaultDeathgasp: + collection: DeathGasp - type: emoteSounds id: MaleVulpkanin @@ -104,6 +108,10 @@ collection: VulpkaninHowls Awoo: collection: VulpkaninHowls + Gasp: + collection: MaleGasp + DefaultDeathgasp: + collection: MaleDeathGasp - type: emoteSounds id: FemaleVulpkanin @@ -144,6 +152,10 @@ collection: VulpkaninHowls Awoo: collection: VulpkaninHowls + Gasp: + collection: FemaleGasp + DefaultDeathgasp: + collection: FemaleDeathGasp - type: emoteSounds id: MobDog @@ -190,8 +202,12 @@ collection: Whistles Weh: collection: Weh - Squeak: + Squeak: path: /Audio/Animals/mouse_squeak.ogg + Gasp: + collection: MaleGasp + DefaultDeathgasp: + collection: MaleDeathGasp - type: emoteSounds id: FemaleRodentia @@ -220,5 +236,9 @@ collection: Whistles Weh: collection: Weh - Squeak: + Squeak: path: /Audio/Animals/mouse_squeak.ogg + Gasp: + collection: FemaleGasp + DefaultDeathgasp: + collection: FemaleDeathGasp diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml index b752e94020f..95371745564 100644 --- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml @@ -36,6 +36,10 @@ collection: FelinidGrowls Purr: collection: FelinidPurrs + Gasp: + collection: MaleGasp + DefaultDeathgasp: + collection: MaleDeathGasp - type: emoteSounds id: FemaleFelinid @@ -74,3 +78,7 @@ collection: FelinidGrowls Purr: collection: FelinidPurrs + Gasp: + collection: FemaleGasp + DefaultDeathgasp: + collection: FemaleDeathGasp From d4d22c97ac6b2ce2dfc0f4fc6bb4134316efba84 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 29 Nov 2024 07:35:43 +0100 Subject: [PATCH 5/8] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index e0213fb2f49..9ee80291afa 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: DebugOk - changes: - - message: Prisoners will no longer spawn in cryopods instead of in the brig. - type: Fix - id: 216 - time: '2024-01-31T09:42:57.0000000+00:00' - author: leonardo-dabepis changes: - message: Made HCV cocktail less immediately lethal (damnation!!!) @@ -3780,3 +3774,10 @@ id: 715 time: '2024-11-29T01:27:57.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2307 +- author: Emily9031 + changes: + - message: Felinids, vulpkanin, harpies, and rodentia now have gasping sounds. + type: Fix + id: 716 + time: '2024-11-29T06:35:24.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2313 From 14e0c3f785424d89b869b6eb057d47b90f7c8fa4 Mon Sep 17 00:00:00 2001 From: DisposableCrewmember42 Date: Fri, 29 Nov 2024 09:51:20 +0000 Subject: [PATCH 6/8] feat: HydroCo - Beverage Powders (#2210) * feat: Powdered drinks orderable by Logi * tweak: Lower amounts per crate * chore: fix copy-paste mistake * feat: Add HydroCo to StockTrade App * tweak: Lemon, Lime and Pineapple Juice powders now deal slight Caustic damage * i18n: Powdered watermelon juice does not include water * feat: If eating straight powdered beverage, cough and vomit * tweak: change powder tastes * tweak: Add spoons to HydroCo crates * tweak: Add HydroCo consumption notice to crates * refactor: consistent naming * refactor: BasePowderBeverage now abstract, inherit physicalDesc * refactor: mark ReagentTinBase as abstract * tweak: Rephrase HydroCo Notice * refactor: Move name and description to prototype * tweak: Juice crate now comes in one of four editions * feat: powdered tomato juice * refactor: rename reagent ftl for consistendcy * tweak: use tomato powder in crate fill * fix: copy-paste mistake * feat: hydroco trial mails * tweak: 2 soy, 2 regular milk in dairy crate * tweak: lower price for juice crate * tweak: recolor tomato powder * tweak: use one of each edition, no themed crates; plastic spoons instead of metal * feat: soy milk powder and orange juice powder in sustenance vendor * tweak: reword hydroco mail message * tweak: rearrange papers to play nicer with word-wrap * tweak: add new-line in case somebody drags the paper wider * tweak: reintroduce random tin, condense juice fill tables * refactor: amount defaults to 1 * Add Changelog Entry for Teach Lesson (#2225) * meow * meow * Update DeltaVChangelog.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * refactor: add missing newline * refactor: respect yaml property ordering convention * refactor: more yaml conventions --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Signed-off-by: DisposableCrewmember42 Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: Milon --- .../en-US/deltav/cargo/stocks-comapnies.ftl | 1 + .../meta/consumable/drink/powdered_drinks.ftl | 41 +++ .../Inventories/sustenance.yml | 2 + .../DeltaV/Catalog/Cargo/cargo_food.yml | 20 ++ .../DeltaV/Catalog/Fills/Crates/food.yml | 82 +++++ .../Consumable/Drinks/powdered_drinks.yml | 339 ++++++++++++++++++ .../DeltaV/Entities/Objects/Misc/paper.yml | 61 ++++ .../Entities/Objects/Specific/Mail/mail.yml | 34 ++ .../DeltaV/Entities/Stations/base.yml | 3 + .../Consumable/Drink/powdered_drinks.yml | 191 ++++++++++ .../Recipes/Cooking/powdered_drinks.yml | 167 +++++++++ .../Drinks/powdered_drinks.rsi/icon-open.png | Bin 0 -> 4829 bytes .../powdered_drinks.rsi/icon-order-dairy.png | Bin 0 -> 4597 bytes .../powdered_drinks.rsi/icon-order-juices.png | Bin 0 -> 4625 bytes .../Drinks/powdered_drinks.rsi/icon.png | Bin 0 -> 4540 bytes .../Drinks/powdered_drinks.rsi/meta.json | 26 ++ .../powdered_drinks.rsi/overlay-container.png | Bin 0 -> 715 bytes 17 files changed, 967 insertions(+) create mode 100644 Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml create mode 100644 Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml create mode 100644 Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png diff --git a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl index 69ef7330a56..09067ec1d57 100644 --- a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl +++ b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl @@ -4,3 +4,4 @@ stock-trading-company-gorlex = Gorlex [GRX] stock-trading-company-interdyne = Interdyne Pharmaceuticals [INTP] stock-trading-company-fishinc = Fish Inc. [FIN] stock-trading-company-donk = Donk Co. [DONK] +stock-trading-company-hydroco = HydroCo [HYD] diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl new file mode 100644 index 00000000000..aaed484c664 --- /dev/null +++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl @@ -0,0 +1,41 @@ +reagent-name-powdered-milk = powdered milk +reagent-desc-powdered-milk = A powder-based milk substitute that can be reconstituted with water. + +reagent-name-powdered-milk-soy = powdered soy milk +reagent-desc-powdered-milk-soy = A powder-based dairy-free milk substitute that can be reconstituted with water. + +reagent-name-powdered-juice-orange = powdered orange juice +reagent-desc-powdered-juice-orange = A powder-based orange juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-lime = powdered lime juice +reagent-desc-powdered-juice-lime = A powder-based lime juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-lemon = powdered lemon juice +reagent-desc-powdered-juice-lemon = A powder-based lemon juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-pineapple = powdered pineapple juice +reagent-desc-powdered-juice-pineapple = A powder-based pineapple juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-banana = powdered banana juice +reagent-desc-powdered-juice-banana = A powder-based banana juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-berry = powdered berry juice +reagent-desc-powdered-juice-berry = A powder-based berry juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-watermelon = powdered melon juice +reagent-desc-powdered-juice-watermelon = A powder-based watermelon juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-grape = powdered grape juice +reagent-desc-powdered-juice-grape = A powder-based grape juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-apple = powdered apple juice +reagent-desc-powdered-juice-apple = A powder-based apple juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-cherry = powdered cherry juice +reagent-desc-powdered-juice-cherry = A powder-based cherry juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-carrot = powdered carrot juice +reagent-desc-powdered-juice-carrot = A powder-based carrot juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-tomato = powdered tomato juice +reagent-desc-powdered-juice-tomato = A powder-based tomato juice substitute that can be reconstituted with water. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml index 9fa3499e15c..7722f001a3b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -5,6 +5,8 @@ FoodSnackNutribrick: 5 FoodSnackMREBrownie: 5 FoodCondimentPacketKetchup: 5 + ReagentTinPowderedMilkSoy: 2 + ReagentTinPowderedJuiceOrange: 1 emaggedInventory: KitchenKnife: 2 SpaceMedipen: 3 diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml index abd64d33efe..f8645aa058a 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml @@ -37,3 +37,23 @@ cost: 3333 category: Food group: market + +- type: cargoProduct + id: FoodHydroCoDairy + icon: + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + state: icon-order-dairy + product: CrateHydroCoDairy + cost: 1500 + category: Food + group: market + +- type: cargoProduct + id: FoodHydroCoJuice + icon: + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + state: icon-order-juices + product: CrateHydroCoJuice + cost: 1500 + category: Food + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml index 067a9ed9777..fc4a8424f08 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml @@ -40,3 +40,85 @@ contents: - id: FoodPieBananaCream amount: 13 + +- type: entity + parent: CratePlastic + id: CrateHydroCoDairy + name: HydroCo Dairy crate + description: A shipment of powdered dairy products from HydroCo. Contains powdered milk and soy milk. + components: + - type: StorageFill + contents: + - id: PaperCrateHydroCoConsumption + - id: SpoonPlastic + amount: 2 + - id: ReagentTinPowderedMilk + amount: 2 + - id: ReagentTinPowderedMilkSoy + amount: 2 + +- type: entity + parent: CratePlastic + id: CrateHydroCoJuice + name: HydroCo Juice crate + description: A variety pack of powdered juice products from HydroCo. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: FillHydroCoJuiceMix + - !type:NestedSelector + tableId: FillHydroCoJuiceRandomTin + prob: 0.15 + - id: SpoonPlastic + amount: !type:ConstantNumberSelector + value: 2 + - id: PaperCrateHydroCoConsumption + +- type: entityTable + id: FillHydroCoJuiceMix + table: !type:AllSelector + children: + # Citrus + - !type:GroupSelector + children: + - id: ReagentTinPowderedJuiceOrange + - id: ReagentTinPowderedJuiceLime + - id: ReagentTinPowderedJuiceLemon + # Berry + - !type:GroupSelector + children: + - id: ReagentTinPowderedJuiceBerry + - id: ReagentTinPowderedJuiceGrape + - id: ReagentTinPowderedJuiceCherry + # Tropical + - !type:GroupSelector + children: + - id: ReagentTinPowderedJuicePineapple + - id: ReagentTinPowderedJuiceBanana + - id: ReagentTinPowderedJuiceWatermelon + # Garden + - !type:GroupSelector + children: + - id: ReagentTinPowderedJuiceApple + - id: ReagentTinPowderedJuiceCarrot + - id: ReagentTinPowderedJuiceTomato + +- type: entityTable + id: FillHydroCoJuiceRandomTin + table: !type:GroupSelector + children: + - id: ReagentTinPowderedJuiceLemon + - id: ReagentTinPowderedJuiceLime + - id: ReagentTinPowderedJuiceOrange + - id: ReagentTinPowderedJuicePineapple + - id: ReagentTinPowderedJuiceBanana + - id: ReagentTinPowderedJuiceWatermelon + - id: ReagentTinPowderedJuiceBerry + - id: ReagentTinPowderedJuiceGrape + - id: ReagentTinPowderedJuiceCherry + - id: ReagentTinPowderedJuiceApple + - id: ReagentTinPowderedJuiceCarrot + - id: ReagentTinPowderedJuiceTomato diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml new file mode 100644 index 00000000000..3e242a07f2a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml @@ -0,0 +1,339 @@ +- type: entity + abstract: true + parent: ReagentContainerBase + id: ReagentTinBase + components: + - type: Openable + openableByHand: false + sound: + path: /Audio/Items/can_open3.ogg + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon-open"} + False: {state: "icon"} + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 6 + behaviors: + - !type:OpenBehavior + - type: Item + sprite: Objects/Consumable/Food/snacks.rsi + heldPrefix: packet + size: Normal + - type: DamageOnLand + damage: + types: + Blunt: 3 + - type: DamageOtherOnHit + damage: + types: + Blunt: 3 + - type: Damageable + damageContainer: Inorganic + - type: StaticPrice + price: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceOrange + name: tin of powdered orange juice + description: A container of powdered orange juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFC420" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceOrange + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedMilk + name: tin of powdered milk + description: A container of powdered milk manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the milk. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FAFAFA" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedMilk + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedMilkSoy + name: tin of powdered soy milk + description: A container of powdered soy milk manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the milk. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFFCE3" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedMilkSoy + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceLime + name: tin of powdered lime juice + description: A container of powdered lime juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#B4FF64" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceLime + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceLemon + name: tin of powdered lemon juice + description: A container of powdered lemon juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFFC69" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceLemon + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuicePineapple + name: tin of powdered pineapple juice + description: A container of powdered pineapple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFD644" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuicePineapple + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceBanana + name: tin of powdered banana juice + description: A container of powdered banana juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFFEBF" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceBanana + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceBerry + name: tin of powdered berry juice + description: A container of powdered berry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#D366FF" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceBerry + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceWatermelon + name: tin of powdered melon juice + description: A container of powdered watermelon juice manufactured by HydroCo. NOTE - Melon only; water not included, sold separately. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFBCDB" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceWatermelon + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceGrape + name: tin of powdered grape juice + description: A container of powdered grape juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#E57DFF" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceGrape + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceApple + name: tin of powdered apple juice + description: A container of powdered apple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFC67E" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceApple + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceCherry + name: tin of powdered cherry juice + description: A container of powdered cherry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#A9536C" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceCherry + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceCarrot + name: tin of powdered carrot juice + description: A container of powdered carrot juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFA06B" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceCarrot + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceTomato + name: tin of powdered tomato juice + description: A container of powdered tomato juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#D85553" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceTomato + Quantity: 50 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index 96fe66f08b4..2682f83ab88 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -30,3 +30,64 @@ id: PaperFugitiveReport name: fugitive report description: An arrest warrant for a space fugitive sent from GALPOL. + +- type: entity + parent: Paper + id: PaperCrateHydroCoConsumption + name: HydroCo Notice + categories: [ HideSpawnMenu ] + components: + - type: Paper + stampState: paper_stamp-generic + stampedBy: + - stampedColor: '#8F99D6FF' + stampedName: HydroCo + content: |2 + + [head=1]HydroCo - Hydrate Tastefully[/head] + + [bold]Consumption Notice[/bold] + HydroCo reminds all customers that powdered products + are NOT meant for direct consumption. Attempting to eat + the powder directly is a choking hazard and may result + in severe discomfort. + + Always mix with water according to package instructions + before consuming. + + Thank you for choosing HydroCo! + Enjoy your drinks! + +- type: entity + parent: Paper + id: PaperMailHydroCoTrial + name: HydroCo Trial Message + categories: [ HideSpawnMenu ] + components: + - type: Paper + stampState: paper_stamp-generic + stampedBy: + - stampedColor: '#8F99D6FF' + stampedName: HydroCo + content: |2 + + [head=1]HydroCo - Hydrate Tastefully[/head] + + [bold]Dear Recipient,[/bold] + you have been selected among thousands of potential + beneficiaries to receive a full-size trial tin of HydroCo + powdered juice! + + We think you will enjoy the flavor and hope to see you + as a returning customer. + + [bold]Consumption Notice[/bold] + HydroCo reminds all customers that powdered products + are NOT meant for direct consumption. Attempting to eat + the powder directly is a choking hazard and may result in + severe discomfort. + + Always mix with water according to package instructions + before consuming. + + Enjoy your drinks! diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml index 3d5d66fc2a2..2fa02ebc002 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml @@ -1698,3 +1698,37 @@ orGroup: Coat - id: ClothingOuterWinterCoatPlaid orGroup: Coat + +- type: entity + parent: BaseMail + id: MailHydroCoPowderJuice + suffix: HydroCo powder juice + components: + - type: Mail + contents: + - id: ReagentTinPowderedJuiceLemon + orGroup: Juice + - id: ReagentTinPowderedJuiceLime + orGroup: Juice + - id: ReagentTinPowderedJuicePineapple + orGroup: Juice + - id: ReagentTinPowderedJuiceBanana + orGroup: Juice + - id: ReagentTinPowderedJuiceBerry + orGroup: Juice + - id: ReagentTinPowderedJuiceWatermelon + orGroup: Juice + - id: ReagentTinPowderedJuiceGrape + orGroup: Juice + - id: ReagentTinPowderedJuiceApple + orGroup: Juice + - id: ReagentTinPowderedJuiceCherry + orGroup: Juice + - id: ReagentTinPowderedJuiceCarrot + orGroup: Juice + - id: ReagentTinPowderedJuiceTomato + orGroup: Juice + - id: SpoonPlastic + amount: 1 + - id: PaperMailHydroCoTrial + amount: 1 diff --git a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml index fe31706b262..89f420f1573 100644 --- a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml +++ b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml @@ -19,3 +19,6 @@ - displayName: stock-trading-company-donk basePrice: 90 currentPrice: 90 + - displayName: stock-trading-company-hydroco + basePrice: 30 + currentPrice: 30 diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml new file mode 100644 index 00000000000..13cd6bfe11d --- /dev/null +++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml @@ -0,0 +1,191 @@ +- type: reagent + id: BasePowderedBeverage + abstract: true + physicalDesc: reagent-physical-desc-powdery + flavor: terrible + metabolisms: + Poison: + effects: + - !type:Emote + emote: Cough + showInChat: true + probability: 0.33 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 15 + +- type: reagent + parent: BasePowderedBeverage + id: PowderedMilk + name: reagent-name-powdered-milk + group: Foods + desc: reagent-desc-powdered-milk + flavor: sweet + color: "#FAFAFA" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedMilkSoy + name: reagent-name-powdered-milk-soy + group: Foods + desc: reagent-desc-powdered-milk-soy + flavor: soy + color: "#FFFCE3" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceOrange + name: reagent-name-powdered-juice-orange + group: Foods + desc: reagent-desc-powdered-juice-orange + flavor: sour + color: "#FFC420" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceLime + name: reagent-name-powdered-juice-lime + group: Foods + desc: reagent-desc-powdered-juice-lime + flavor: sour + color: "#B4FF64" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 0.5 + - !type:Emote + emote: Cough + showInChat: true + probability: 0.33 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 15 + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceLemon + name: reagent-name-powdered-juice-lemon + group: Foods + desc: reagent-desc-powdered-juice-lemon + flavor: sour + color: "#FFFC69" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 0.5 + - !type:Emote + emote: Cough + showInChat: true + probability: 0.33 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 15 + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuicePineapple + name: reagent-name-powdered-juice-pineapple + group: Foods + desc: reagent-desc-powdered-juice-pineapple + flavor: sour + color: "#FFD644" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 0.5 + - !type:Emote + emote: Cough + showInChat: true + probability: 0.33 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 15 + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceBanana + name: reagent-name-powdered-juice-banana + group: Foods + desc: reagent-desc-powdered-juice-banana + flavor: terrible + color: "#FFFEBF" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceBerry + name: reagent-name-powdered-juice-berry + group: Foods + desc: reagent-desc-powdered-juice-berry + flavor: bitter + color: "#D366FF" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceWatermelon + name: reagent-name-powdered-juice-watermelon + group: Foods + desc: reagent-desc-powdered-juice-watermelon + flavor: terrible + color: "#FFBCDB" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceGrape + name: reagent-name-powdered-juice-grape + group: Foods + desc: reagent-desc-powdered-juice-grape + flavor: sour + color: "#E57DFF" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceApple + name: reagent-name-powdered-juice-apple + group: Foods + desc: reagent-desc-powdered-juice-apple + flavor: sour + color: "#FFC67E" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceCherry + name: reagent-name-powdered-juice-cherry + group: Foods + desc: reagent-desc-powdered-juice-cherry + flavor: sour + color: "#A9536C" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceCarrot + name: reagent-name-powdered-juice-carrot + group: Foods + desc: reagent-desc-powdered-juice-carrot + flavor: bitter + color: "#FFA06B" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceTomato + name: reagent-name-powdered-juice-tomato + group: Foods + desc: reagent-desc-powdered-juice-tomato + flavor: bitter + color: "#D85553" diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml new file mode 100644 index 00000000000..262c40afce2 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml @@ -0,0 +1,167 @@ +- type: reaction + id: ReconstitutePowderedMilk + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedMilk: + amount: 1 + products: + Milk: 2 + +- type: reaction + id: ReconstitutePowderedMilkSoy + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedMilkSoy: + amount: 1 + products: + MilkSoy: 2 + +- type: reaction + id: ReconstitutePowderedJuiceOrange + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceOrange: + amount: 1 + products: + JuiceOrange: 2 + +- type: reaction + id: ReconstitutePowderedJuiceLemon + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceLemon: + amount: 1 + products: + JuiceLemon: 2 + +- type: reaction + id: ReconstitutePowderedJuiceLime + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceLime: + amount: 1 + products: + JuiceLime: 2 + +- type: reaction + id: ReconstitutePowderedJuicePineapple + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuicePineapple: + amount: 1 + products: + JuicePineapple: 2 + +- type: reaction + id: ReconstitutePowderedJuiceBanana + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceBanana: + amount: 1 + products: + JuiceBanana: 2 + +- type: reaction + id: ReconstitutePowderedJuiceWatermelon + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceWatermelon: + amount: 1 + products: + JuiceWatermelon: 2 + +- type: reaction + id: ReconstitutePowderedJuiceBerry + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceBerry: + amount: 1 + products: + JuiceBerry: 2 + +- type: reaction + id: ReconstitutePowderedJuiceGrape + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceGrape: + amount: 1 + products: + JuiceGrape: 2 + +- type: reaction + id: ReconstitutePowderedJuiceApple + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceApple: + amount: 1 + products: + JuiceApple: 2 + +- type: reaction + id: ReconstitutePowderedJuiceCherry + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceCherry: + amount: 1 + products: + JuiceCherry: 2 + +- type: reaction + id: ReconstitutePowderedJuiceCarrot + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceCarrot: + amount: 1 + products: + JuiceCarrot: 2 + +- type: reaction + id: ReconstitutePowderedJuiceTomato + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceTomato: + amount: 1 + products: + JuiceTomato: 2 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..ddccc536a65e4df94fa862a7db2770c9efebf9b4 GIT binary patch literal 4829 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png new file mode 100644 index 0000000000000000000000000000000000000000..f83b746104f5ba404cd36df3bc72714b90053f4e GIT binary patch literal 4597 zcmeHKdsGzH8J|TSD~J*Uk%y7Vnlvhz-JN}~57@|Kk=??YEmB;F24-hwVPIeG46x8b ze33}-Q4F?1w$(&E5>iZ+6dNEKAwFo*NRCa7VhBYIISJuWwKYg;?+owLoYTWO&40}9 zo%_vqzwdXy`@7%$cBj&~J~_}o+#iCVK)p_z26~und|z;&7S8kG`rSZ|n2>9LylTRR^+9=FP$1|%ph#~49(^OkCnk8yCF5@g-Vp5l zqkmF;P<}{}UAn!oqAO|?^@exVe~? zKWY5h{BBj|HDl%RO8k|EpPgCTf2zHtswu0n>7SbK0y=zbWbHSyw)dx9SgyZ&71{p96mb;8WTFXDge z)%cR_#mMfWZ@l@j3pQq5%r5Y1I&@T_&Klr{-tZNkh^cGy+cXG$^7LlOlga*Fcb8SY z{~)Yv!-~)|KBIrT(R2NQvJ5))*PoC2DwW`Lh$1qN{NK{;0EG(7^9j;svs#2*$ zVu?s1L4XB9m)IH1jo9gxEW|j5mZWhP3WLs8}e1g_2tcOhyn0i7GKfW>%sIM#v?IRIXCW#25-XGY3WB>U9p64FlUr*|1zv zO>cbF%DO{!(r73ri$*=umKz=0%I^O z#*hGXstl)3mf$_gbe+^wKadKRXbEP)F*%~ZPzl&SaKq#Z z3nG@tQI&-RxkikWG=)w(EKD)xBI9!bkAN$Xp4<- z5A)mOf;FGKb8JaV!2a96JU6!USC@x*WuFZ`Wjbnl^VX7QkazA$eQ#6_UW~ldUQu)H zxa^VRRr%si@9)yLc4prGvghxf7<%Xb^s-540RM2``DicuQD2Ud%A`K zokis>68htJvzIkqKu*}}M)(JhybyKnwJ&or9~*s-2ld|haN!5C!AMJXA?FLE*W9&A)+$$L=l-FD@yo{zzMMEA?PsMDw<`{)?^E R*TIfK`lR*R6A3xn{{zifRV@Gj literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png new file mode 100644 index 0000000000000000000000000000000000000000..050af5368b90bbc8e65a5309ecdbe879d05a20db GIT binary patch literal 4625 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 literal 0 HcmV?d00001 From 1507ff2bf6dc11a5864fa193456c0eb2da179760 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:51:40 +0100 Subject: [PATCH 7/8] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 9ee80291afa..92d13e00464 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: leonardo-dabepis - changes: - - message: Made HCV cocktail less immediately lethal (damnation!!!) - type: Tweak - id: 217 - time: '2024-01-31T10:34:16.0000000+00:00' - author: Adrian16199 changes: - message: Shoukou has received the cryopods. @@ -3781,3 +3775,12 @@ id: 716 time: '2024-11-29T06:35:24.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2313 +- author: DisposableCrewmember42 + changes: + - message: NanoTrasen has established business relations with HydroCo! You can now + order powdered milk and juice via your Logistics department and bet on the growth + of the HYD stock. + type: Add + id: 717 + time: '2024-11-29T09:51:20.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2210 From 6ad7f7e768afaf1dd80f5eac3cdf7e98d391dd41 Mon Sep 17 00:00:00 2001 From: Milon Date: Fri, 29 Nov 2024 10:55:23 +0100 Subject: [PATCH 8/8] Update RobustToolbox to v237.2.0 (#2317) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 32bca7cfd41..92b0e7f1a85 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 32bca7cfd417edcad9a60c2b1703eba8675f56af +Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66