Skip to content
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
wants to merge 14 commits into
base: master
Choose a base branch
from
+12 −0
Open

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6c095aa
Adds a new candy , chocolate bar, to the vending machine.
RTProductions Oct 13, 2024
81779cf
Update candy.dm
Kaelthorian Oct 13, 2024
13320ec
Merge branch 'master' into OmniForge-Solutions
Kaelthorian Oct 14, 2024
bc1d55b
Update candy.dm
Kaelthorian Oct 14, 2024
1f55771
Update candy.dm
Kaelthorian Oct 14, 2024
5667a7a
Fixing the choco icon name.
RTProductions Oct 14, 2024
b01179c
Renamed the chocolate bar to Delux Chocolate-bar and changed the icon…
RTProductions Oct 14, 2024
960a47c
Name Change
RTProductions Oct 14, 2024
a93b6ed
Merge branch 'master' into OmniForge-Solutions
Kaelthorian Oct 14, 2024
fdaf9ec
Update candy.dm
Kaelthorian Oct 14, 2024
71cd07d
Moved the obj from candy to junkfood.
RTProductions Oct 15, 2024
3c11400
Merge branch 'OmniForge-Solutions' of https://github.com/Kaelthorian/…
RTProductions Oct 15, 2024
86f5b00
Change fix
RTProductions Oct 15, 2024
9d83d08
Update code/modules/food_and_drinks/food/foods/candy.dm
Kaelthorian Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/game/machinery/vendors/generic_vendors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,7 @@
/obj/item/food/spacetwinkie = 6,
/obj/item/food/cheesiehonkers = 6,
/obj/item/food/tastybread = 6,
/obj/item/food/candy/chocolate_bar = 6,
Kaelthorian marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/food/stroopwafel = 2)

contraband = list(/obj/item/food/syndicake = 6)
Expand All @@ -943,6 +944,7 @@
/obj/item/food/spacetwinkie = 64,
/obj/item/food/cheesiehonkers = 64,
/obj/item/food/tastybread = 80,
/obj/item/food/candy/chocolate_bar = 100,
/obj/item/food/stroopwafel = 100,
/obj/item/food/syndicake = 175) //syndicakes are genuinely kind of powerful

Expand Down
13 changes: 13 additions & 0 deletions code/modules/food_and_drinks/food/foods/candy.dm
View file
Open in desktop
Kaelthorian marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -644,3 +644,16 @@
icon_state = "toolerone"
filling_color = "#7D5F46"
goal_difficulty = FOOD_GOAL_NORMAL

Kaelthorian marked this conversation as resolved.
Show resolved Hide resolved
// ***********************************************************
// OmniForge Solutions - Candy
Kaelthorian marked this conversation as resolved.
Show resolved Hide resolved
// ***********************************************************

/obj/item/food/candy/chocolate_bar
name = "Chocolate bar - OFS"
Kaelthorian marked this conversation as resolved.
Show resolved Hide resolved
desc = "Crafted from premium cacao and infused with quantum nutrients, this luxury chocolate bar is wrapped in nanofoil for ultimate freshness. Experience the essence of culinary supremacy with every bite."
icon_state = "choco_OFS"
Kaelthorian marked this conversation as resolved.
Show resolved Hide resolved
filling_color = "#7D5F46"
list_reagents = list("chocolate" = 5, "sugar" = 10)
tastes = list("chocolate" = 3)
Kaelthorian marked this conversation as resolved.
Show resolved Hide resolved
Kaelthorian marked this conversation as resolved.
Show resolved Hide resolved
goal_difficulty = FOOD_GOAL_NORMAL
Binary file modified icons/obj/food/candy.dmi
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions paradise.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,6 @@
#include "code\game\area\areas\ruins\lavaland_areas.dm"
#include "code\game\area\areas\ruins\space_areas.dm"
#include "code\game\area\areas\ruins\syndicate_space_base_areas.dm"
#include "code\game\area\ss13_areas\station_area.dm"
#include "code\game\area\ss13_areas\ai_areas.dm"
#include "code\game\area\ss13_areas\command_areas.dm"
#include "code\game\area\ss13_areas\engineering_areas.dm"
Expand All @@ -709,6 +708,7 @@
#include "code\game\area\ss13_areas\science_areas.dm"
#include "code\game\area\ss13_areas\security_areas.dm"
#include "code\game\area\ss13_areas\service_areas.dm"
#include "code\game\area\ss13_areas\station_area.dm"
#include "code\game\area\ss13_areas\supply_areas.dm"
#include "code\game\dna\dna2.dm"
#include "code\game\dna\dna2_domutcheck.dm"
Expand Down Expand Up @@ -2399,8 +2399,8 @@
#include "code\modules\mob\living\simple_animal\hostile\mushroom.dm"
#include "code\modules\mob\living\simple_animal\hostile\netherworld.dm"
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
#include "code\modules\mob\living\simple_animal\hostile\soviet.dm"
#include "code\modules\mob\living\simple_animal\hostile\skeleton_mob.dm"
#include "code\modules\mob\living\simple_animal\hostile\soviet.dm"
#include "code\modules\mob\living\simple_animal\hostile\syndicate_mobs.dm"
#include "code\modules\mob\living\simple_animal\hostile\tree.dm"
#include "code\modules\mob\living\simple_animal\hostile\venus_human_trap.dm"
Expand Down