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

Adds 10 Chocolate Bars (#5347)

Browse Source
This commit is contained in:
BurgerLUA
2018-10-04 23:36:55 +03:00
committed by Erki
parent 83619ee5c3
commit ab3400e5ef
5 changed files with 236 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending_types.dm
+22 -2
View File
@@ -167,7 +167,17 @@
/obj/item/weapon/reagent_containers/food/snacks/meatsnack = 2,
/obj/item/weapon/reagent_containers/food/snacks/maps = 2,
/obj/item/weapon/reagent_containers/food/snacks/nathisnack = 2,
/obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 4
/obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb01 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb02 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb03 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb04 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb05 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb06 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb07 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb08 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb09 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb10 = 4
)
contraband = list(
/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6,
@@ -186,7 +196,17 @@
/obj/item/weapon/reagent_containers/food/snacks/meatsnack = 22,
/obj/item/weapon/reagent_containers/food/snacks/maps = 23,
/obj/item/weapon/reagent_containers/food/snacks/nathisnack = 24,
/obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 60
/obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 60,
/obj/item/weapon/reagent_containers/food/snacks/cb01 = 10,
/obj/item/weapon/reagent_containers/food/snacks/cb02 = 12,
/obj/item/weapon/reagent_containers/food/snacks/cb03 = 14,
/obj/item/weapon/reagent_containers/food/snacks/cb04 = 12,
/obj/item/weapon/reagent_containers/food/snacks/cb05 = 13,
/obj/item/weapon/reagent_containers/food/snacks/cb06 = 14,
/obj/item/weapon/reagent_containers/food/snacks/cb07 = 12,
/obj/item/weapon/reagent_containers/food/snacks/cb08 = 14,
/obj/item/weapon/reagent_containers/food/snacks/cb09 = 12,
/obj/item/weapon/reagent_containers/food/snacks/cb10 = 11
)
/obj/machinery/vending/cola
code/game/objects/items/weapons/storage/boxes.dm
+26
View File
@@ -1044,3 +1044,29 @@
for(var/i in 1 to 12)
new /obj/random_produce(src)
make_exact_fit()
/obj/item/weapon/storage/box/candy
name = "candy box"
desc = "A large box of assorted small candy."
icon_state = "largebox"
/obj/item/weapon/storage/box/candy/fill()
var/list/assorted_list = list(
/obj/item/weapon/reagent_containers/food/snacks/cb01 = 1,
/obj/item/weapon/reagent_containers/food/snacks/cb02 = 1,
/obj/item/weapon/reagent_containers/food/snacks/cb03 = 1,
/obj/item/weapon/reagent_containers/food/snacks/cb04 = 1,
/obj/item/weapon/reagent_containers/food/snacks/cb05 = 1,
/obj/item/weapon/reagent_containers/food/snacks/cb06 = 1,
/obj/item/weapon/reagent_containers/food/snacks/cb07 = 1,
/obj/item/weapon/reagent_containers/food/snacks/cb08 = 1,
/obj/item/weapon/reagent_containers/food/snacks/cb09 = 1,
/obj/item/weapon/reagent_containers/food/snacks/cb10 = 1
)
for(var/i in 1 to 24)
var/chosen_candy = pickweight(assorted_list)
new chosen_candy(src)
make_exact_fit()