New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds a new candy , chocolate bar, to the vending machine. #27086

Open

Kaelthorian wants to merge 14 commits into ParadiseSS13:master from Kaelthorian:OmniForge-Solutions

+12 −0

Kaelthorian commented Oct 13, 2024 •

edited

Loading

What Does This PR Do

Adds a new candy , chocolate bar, to the vending machine.

Why It's Good For The Game

Food variation.

Testing

Log in the game , go to the nearest vending getmore machine , buy one chocolate bar.

Declaration

I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
add: Added a new candy , chocolate bar to the vends getmore.
/:cl:


          Adds a new candy , chocolate bar, to the vending machine.

6c095aa

This comment was marked as resolved.

Sign in to view

ParadiseSS13-Bot added the On Hold label


          Update candy.dm

81779cf

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>

ParadiseSS13-Bot added -Status: Awaiting type assignment Sprites labels


          Merge branch 'master' into OmniForge-Solutions

13320ec

Henri215 reviewed

View reviewed changes

Member

Henri215 left a comment

Changelog has a typo.

Pretty interesting PR, nice job so far 😃

code/modules/food_and_drinks/food/foods/candy.dm Outdated Show resolved Hide resolved

code/modules/food_and_drinks/food/foods/candy.dm Outdated Show resolved Hide resolved

code/game/machinery/vendors/generic_vendors.dm Outdated Show resolved Hide resolved

code/modules/food_and_drinks/food/foods/candy.dm Outdated Show resolved Hide resolved

Henri215 added Feature Requires Wiki Update labels

Kaelthorian added 2 commits

October 14, 2024 11:24


          Update candy.dm

bc1d55b

No more Omniforge corp , better for lore this way.

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>


          Update candy.dm

1f55771

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>

ParadiseSS13-Bot added -Status: Awaiting approval and removed -Status: Awaiting type assignment labels

Henri215 reviewed

View reviewed changes

Member

Henri215 left a comment

In MY opinion it would be better if the name wasnt generic, since you describe it as luxury, ask people over the discord for cool names or even corporations.

code/modules/food_and_drinks/food/foods/candy.dm Outdated Show resolved Hide resolved

Member

S34NW commented Oct 14, 2024

Your PR has been put on hold as your GitHub account is not linked to a Paradise forums account.

Please link your account at https://www.paradisestation.org/forum/custom/link_github_account.php

Headcoders may ignore this in specific circumstances (Minor fix PR, trusted contributor from another codebase, anything at their discretion)

Account now linked

S34NW removed the On Hold label

RTProductions and others added 4 commits

October 14, 2024 19:08


          Fixing the choco icon name.

5667a7a


          Renamed the chocolate bar to Delux Chocolate-bar and changed the icon…

b01179c

… to something more chocolate like. (CO)


          Name Change

960a47c


          Merge branch 'master' into OmniForge-Solutions

a93b6ed

Henri215 reviewed

View reviewed changes

code/modules/food_and_drinks/food/foods/candy.dm Outdated Show resolved Hide resolved


          Update candy.dm

fdaf9ec

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>

Fordoxia reviewed

View reviewed changes

code/modules/food_and_drinks/food/foods/candy.dm Outdated Show resolved Hide resolved

RTProductions added 3 commits

October 14, 2024 21:05


          Moved the obj from candy to junkfood.

71cd07d


          Merge branch 'OmniForge-Solutions' of https://github.com/Kaelthorian/…

3c11400

…Paradise into OmniForge-Solutions


          Change fix

86f5b00

Henri215 requested a review from Fordoxia

October 15, 2024 21:08

Henri215 reviewed

View reviewed changes

code/modules/food_and_drinks/food/foods/candy.dm Outdated Show resolved Hide resolved


          Update code/modules/food_and_drinks/food/foods/candy.dm

9d83d08

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

-Status: Awaiting approval Feature Requires Wiki Update Sprites