cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 23:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

getmore chocolate (and others) (#22932)

Browse Source 
replaces some old irl chocolates with lore chocolates (mostly GetMore)

- GetMore Chocolate, replacing Hersheys/Hearsay
- GetMore Nuts, replacing the Crispy Crunch(?)/Crunchy Crisp
- GetMore Bubbles, replacing the Aero/Spacewind
- GetMore Kelp, new
- Readies, new

- basic recolour/redesc of the tau ceti bar
- basic recolour/redesc of 100k credits bar into Idris' colours

<img width="880" height="104" alt="Capture"
src="https://github.com/user-attachments/assets/7a3bb3b5-bd9f-4a92-84fb-0951f8228e95"
/>


also removes non-vegan chocolates from the vegan MRE
This commit is contained in:
c#min7
2026-07-29 16:33:38 +00:00
committed by GitHub
parent 0a738fd73a
commit bb52dfdb80
9 changed files with 346 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/trash.dm
+28
View File
@@ -411,6 +411,34 @@
name = "cookie wrapper"
icon_state = "foysnack_trash"
/obj/item/trash/readies
name = "readies wrapper"
icon_state = "readies_trash"
/obj/item/trash/getmore
name = "getmore chocolate wrapper"
icon_state = "getmore_wrapper"
/obj/item/trash/getmore_nuts
name = "getmore chocolate wrapper"
icon_state = "getmore_wrapper2"
/obj/item/trash/getmore_bubbles
name = "getmore chocolate wrapper"
icon_state = "getmore_wrapper3"
/obj/item/trash/getmore_kelp
name = "getmore chocolate wrapper"
icon_state = "getmore_wrapper4"
/obj/item/trash/cetibar
name = "tau ceti bar wrapper"
icon_state = "cetibar_wrapper"
/obj/item/trash/idrisbar
name = "one hundred thousand bar wrapper"
icon_state = "idrisbar_wrapper"
/obj/item/trash/papad
name = "empty papad box"
icon_state = "papad_trash"
code/game/objects/items/weapons/storage/boxes.dm
+11 -10
View File
@@ -1075,16 +1075,17 @@
/obj/item/storage/box/large/candy/fill()
var/list/assorted_list = list(
/obj/item/reagent_containers/food/snacks/cb01 = 1,
/obj/item/reagent_containers/food/snacks/cb02 = 1,
/obj/item/reagent_containers/food/snacks/cb03 = 1,
/obj/item/reagent_containers/food/snacks/cb04 = 1,
/obj/item/reagent_containers/food/snacks/cb05 = 1,
/obj/item/reagent_containers/food/snacks/cb06 = 1,
/obj/item/reagent_containers/food/snacks/cb07 = 1,
/obj/item/reagent_containers/food/snacks/cb08 = 1,
/obj/item/reagent_containers/food/snacks/cb09 = 1,
/obj/item/reagent_containers/food/snacks/cb10 = 1
/obj/item/reagent_containers/food/snacks/chocolate_bar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/nuts = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/kelp = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar = 1
)
for(var/i in 1 to 24)
code/game/objects/random/food.dm
+30 -21
View File
@@ -36,22 +36,23 @@
icon_state = "mre_desert"
spawnlist = list(
/obj/item/reagent_containers/food/snacks/candy,
/obj/item/reagent_containers/food/snacks/cb01,
/obj/item/reagent_containers/food/snacks/cb02,
/obj/item/reagent_containers/food/snacks/cb03,
/obj/item/reagent_containers/food/snacks/cb04,
/obj/item/reagent_containers/food/snacks/cb05,
/obj/item/reagent_containers/food/snacks/cb06,
/obj/item/reagent_containers/food/snacks/cb07,
/obj/item/reagent_containers/food/snacks/cb08,
/obj/item/reagent_containers/food/snacks/cb09,
/obj/item/reagent_containers/food/snacks/cb10,
/obj/item/reagent_containers/food/snacks/proteinbar,
/obj/item/reagent_containers/food/snacks/donut/normal,
/obj/item/reagent_containers/food/snacks/donut/cherryjelly,
/obj/item/reagent_containers/food/snacks/chocolatebar,
/obj/item/reagent_containers/food/snacks/cookie,
/obj/item/reagent_containers/food/snacks/poppypretzel,
/obj/item/reagent_containers/food/snacks/chocolate_bar,
/obj/item/reagent_containers/food/snacks/chocolate_bar/nuts,
/obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles,
/obj/item/reagent_containers/food/snacks/chocolate_bar/kelp,
/obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar,
/obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar,
/obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar = 1,
/obj/item/storage/box/fancy/gum
)
@@ -60,17 +61,6 @@
desc = "This is a random vegan dessert for MREs."
spawnlist = list(
/obj/item/reagent_containers/food/snacks/candy,
/obj/item/reagent_containers/food/snacks/cb01,
/obj/item/reagent_containers/food/snacks/cb02,
/obj/item/reagent_containers/food/snacks/cb03,
/obj/item/reagent_containers/food/snacks/cb04,
/obj/item/reagent_containers/food/snacks/cb05,
/obj/item/reagent_containers/food/snacks/cb06,
/obj/item/reagent_containers/food/snacks/cb07,
/obj/item/reagent_containers/food/snacks/cb08,
/obj/item/reagent_containers/food/snacks/cb09,
/obj/item/reagent_containers/food/snacks/cb10,
/obj/item/reagent_containers/food/snacks/chocolatebar,
/obj/item/reagent_containers/food/snacks/donut/cherryjelly,
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
)
@@ -278,3 +268,22 @@
spawnlist = list(
/obj/structure/reagent_dispensers/cookingoil
)
/obj/random/chocolate
name = "random chocolate"
desc = "This is a random chocolate."
icon_state = "mre_desert"
spawnlist = list(
/obj/item/reagent_containers/food/snacks/chocolate_bar,
/obj/item/reagent_containers/food/snacks/chocolate_bar/nuts,
/obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles,
/obj/item/reagent_containers/food/snacks/chocolate_bar/kelp,
/obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar,
/obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar,
/obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar = 1,
/obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar = 1,
/obj/item/storage/box/fancy/readies
)