Kaelthorian c044ff1216 Adds a new candy , chocolate bar, to the vending machine. (#27086) ...

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

* Update candy.dm

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

* Update candy.dm

No more Omniforge corp , better for lore this way.

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

* Update candy.dm

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

* Fixing the choco icon name.

* Renamed the chocolate bar to Delux Chocolate-bar and changed the icon to something more chocolate like. (CO)

* Name Change

* Update candy.dm

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

* Moved the obj from candy to junkfood.

* Change fix

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

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

* Update code/modules/food_and_drinks/food/foods/junkfood.dm

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

* Fixing names and icons.

* Update generic_vendors.dm

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

* icon update

---------

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

2024-11-23 14:19:45 +00:00

..

admin

Energy field generators Refactor/Tweak (#26919)

2024-11-13 13:23:41 +00:00

antagonists

Recounts rise_number and related variables every once in a while (#27393)

2024-11-23 13:51:53 +00:00

arcade

Adds CI for missing icon_states (#27063)

2024-11-14 17:58:06 +00:00

assembly

refactor/ci: enforce mapload in Initialize args (#26878)

2024-10-23 19:07:46 +00:00

asset_cache

Fully adpots previously ported bottle sprite and fixes reagent overlays (#26962)

2024-11-18 23:53:17 +00:00

atmospherics

Fixes a bunch of runtimes (#27363)

2024-11-15 11:22:09 +00:00

awaymissions

fix (#27420)

2024-11-22 13:10:44 +00:00

buildmode

Administration tool: Build mode offer tool to quickly offer large amount of mobs. (#26712)

2024-09-19 10:46:53 +00:00

client

Impliments a new voting system for weekends and wednesday: Hybrid FPTP weighted random from preferences (#26879)

2024-11-14 17:57:58 +00:00

clothing

Fixes HIDEJUMPSUIT and HIDEGLOVES invis flags Edit: Now with HIDEEARS!!! (#27232)

2024-11-18 23:54:51 +00:00

countdown

…

crafting

[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)

2024-11-13 13:02:29 +00:00

customitems

Adds CI for missing icon_states (#27063)

2024-11-14 17:58:06 +00:00

detective_work

[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)

2024-11-13 13:02:29 +00:00

economy

A few description grammar fixes (#27134)

2024-11-10 13:38:28 +00:00

emoji

…

error_handler

…

events

Adds CI for missing icon_states (#27063)

2024-11-14 17:58:06 +00:00

fish

[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)

2024-11-13 13:02:29 +00:00

flufftext

…

food_and_drinks

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

2024-11-23 14:19:45 +00:00

games

Adds CI for missing icon_states (#27063)

2024-11-14 17:58:06 +00:00

hallucinations

[LORE] Replaces most uses of "Russian" with "Soviet" (#26822)

2024-10-10 09:57:42 +00:00

holiday

…

hydroponics

Fixes #26844 - Labeled condiment bottle loses its label when contents change (#26897)

2024-11-21 02:57:01 +00:00

input

Prevent sleeps in key handling from blocking SSinput (#26761)

2024-09-29 10:54:31 +00:00

instruments

Adding and wiring some new guitar sounds. (#27184)

2024-11-22 13:54:01 +00:00

lavaland

tweak: slightly reduce spawn rate of boulders on blocked burrows (#27117)

2024-11-03 13:28:13 +00:00

library

refactor/ci: enforce mapload in Initialize args (#26878)

2024-10-23 19:07:46 +00:00

lighting

Fixes machines not registering on new area's powernet when it is created (#26985)

2024-10-12 17:08:52 +00:00

mapping

Revert "init (#27394)" (#27429)

2024-11-22 19:27:53 +00:00

maptext_alerts

dmdoc: Some cleanups. (#27242)

2024-11-13 13:37:37 +00:00

martial_arts

[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)

2024-11-13 13:02:29 +00:00

maze_generation

Removes an unneeded proc (#26997)

2024-10-08 16:51:30 +00:00

mining

Adds plasmaman envirosuits to departments (#27255)

2024-11-22 18:13:35 +00:00

mob

refactor: /New -> /Initialize: simple animals (#27265)

2024-11-21 05:05:03 +00:00

mod

Fixes HIDEJUMPSUIT and HIDEGLOVES invis flags Edit: Now with HIDEEARS!!! (#27232)

2024-11-18 23:54:51 +00:00

newscaster

Fixes Newscaster Treatment of Wallets (#27121)

2024-10-22 09:47:12 +00:00

ninja

[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)

2024-11-13 13:02:29 +00:00

paperwork

Adds CI for missing icon_states (#27063)

2024-11-14 17:58:06 +00:00

pda

add: minesweeper PDA game (#26860)

2024-11-20 16:40:57 +00:00

persistence

…

point

…

power

Particle beam now consistently imparts the singularity with energy and only does so once (#27415)

2024-11-22 13:11:38 +00:00

procedural_mapping

…

projectiles

[s] no, bad, no good, icky (#27413)

2024-11-20 21:29:12 +00:00

reagents

Fully adpots previously ported bottle sprite and fixes reagent overlays (#26962)

2024-11-18 23:53:17 +00:00

recycling

[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)

2024-11-13 13:02:29 +00:00

redis

Dev team chat (#26669)

2024-09-03 16:49:45 +00:00

research

Revert "Singulo engine buff (#26929)" (#27360)

2024-11-14 20:11:53 +00:00

response_team

…

ruins

Adds CI for missing icon_states (#27063)

2024-11-14 17:58:06 +00:00

security_levels

Move global access procs to the mapping subsystem (#26664)

2024-09-12 16:58:31 +00:00

server_commands

…

shuttle

refactor: Elementize decals. (#27104)

2024-11-19 18:16:56 +00:00

space_management

Removes all locate() calls in block() (#25772)

2024-06-28 20:33:38 +00:00

station_goals

A few description grammar fixes (#27134)

2024-11-10 13:38:28 +00:00

supply

Revert "Singulo engine buff (#26929)" (#27360)

2024-11-14 20:11:53 +00:00

surgery

Adds CI for missing icon_states (#27063)

2024-11-14 17:58:06 +00:00

telesci

[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)

2024-11-13 13:02:29 +00:00

tgs

…

tgui

dmdoc: Some cleanups. (#27242)

2024-11-13 13:37:37 +00:00

tgui_input/say_modal

Dev team chat (#26669)

2024-09-03 16:49:45 +00:00

tooltip

…

unit_tests

Adds CI for missing icon_states (#27063)

2024-11-14 17:58:06 +00:00

vehicle

Adds CI for missing icon_states (#27063)

2024-11-14 17:58:06 +00:00

virology

…

vote

Moves all Voting Messages to OOC Chat Tab + Updates OOC Chat Selector (#26544)

2024-08-20 10:41:35 +00:00

world_topic

dmdoc: Some cleanups. (#27242)

2024-11-13 13:37:37 +00:00