cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes food not a subtype of reagent holders (#23379)

Browse Source 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-01-21 19:00:02 +00:00
committed by GitHub
co-authored by Ryan Henri215
parent 22fbd9aced
commit db578cdc6f
276 changed files with 10289 additions and 10287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/granters/action_granters/summon_cheese.dm
+2 -2
View File
@@ -22,7 +22,7 @@
/obj/item/book/granter/spell/summon_cheese/recoil(mob/living/user)
to_chat(user, "<span class='warning'>[src] turns into a wedge of cheese!</span>")
var/obj/item/reagent_containers/food/snacks/cheesewedge/presliced/book_cheese = new
var/obj/item/food/snacks/cheesewedge/presliced/book_cheese = new
user.drop_item()
user.put_in_hands(book_cheese)
qdel(src)
@@ -35,7 +35,7 @@
overlay = null
action_icon_state = "cheese_wedge"
action_background_icon_state = "bg_spell"
summon_type = list(/obj/item/reagent_containers/food/snacks/cheesewedge/presliced)
summon_type = list(/obj/item/food/snacks/cheesewedge/presliced)
summon_amt = 9
aoe_range = 1
summon_ignore_prev_spawn_points = TRUE
code/game/objects/items/mixing_bowl.dm
+7 -7
View File
@@ -39,7 +39,7 @@
return add_item(S, user)
else
return add_item(I, user)
else if(is_type_in_list(I, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/drinks, /obj/item/reagent_containers/food/condiment)))
else if(is_type_in_list(I, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/drinks, /obj/item/reagent_containers/condiment)))
if(!I.reagents)
return 1
for(var/datum/reagent/R in I.reagents.reagent_list)
@@ -68,20 +68,20 @@
var/list/items_measures_p = new
for(var/obj/O in contents)
var/display_name = O.name
if(istype(O,/obj/item/reagent_containers/food/snacks/egg))
if(istype(O,/obj/item/food/snacks/egg))
items_measures[display_name] = "egg"
items_measures_p[display_name] = "eggs"
if(istype(O,/obj/item/reagent_containers/food/snacks/tofu))
if(istype(O,/obj/item/food/snacks/tofu))
items_measures[display_name] = "tofu chunk"
items_measures_p[display_name] = "tofu chunks"
if(istype(O,/obj/item/reagent_containers/food/snacks/meat)) //any meat
if(istype(O,/obj/item/food/snacks/meat)) //any meat
items_measures[display_name] = "slab of meat"
items_measures_p[display_name] = "slabs of meat"
if(istype(O,/obj/item/reagent_containers/food/snacks/donkpocket))
if(istype(O,/obj/item/food/snacks/donkpocket))
display_name = "Turnovers"
items_measures[display_name] = "turnover"
items_measures_p[display_name] = "turnovers"
if(istype(O,/obj/item/reagent_containers/food/snacks/carpmeat))
if(istype(O,/obj/item/food/snacks/carpmeat))
items_measures[display_name] = "fillet of meat"
items_measures_p[display_name] = "fillets of meat"
items_counts[display_name]++
@@ -165,7 +165,7 @@
if(id)
amount += reagents.get_reagent_amount(id)
reagents.clear_reagents()
var/obj/item/reagent_containers/food/snacks/badrecipe/mysteryfood = new(get_turf(source))
var/obj/item/food/snacks/badrecipe/mysteryfood = new(get_turf(source))
mysteryfood.reagents.add_reagent("carbon", amount)
mysteryfood.reagents.add_reagent("????", amount / 10)
make_dirty(75)
code/game/objects/items/random_items.dm
+2 -2
View File
@@ -25,11 +25,11 @@
new T(loc)
qdel(src)
/obj/item/reagent_containers/food/drinks/bottle/random_drink
/obj/item/reagent_containers/drinks/bottle/random_drink
name = "unlabelled drink"
icon = 'icons/obj/drinks.dmi'
/obj/item/reagent_containers/food/drinks/bottle/random_drink/Initialize(mapload)
/obj/item/reagent_containers/drinks/bottle/random_drink/Initialize(mapload)
. = ..()
var/list/possible_drinks = GLOB.drinks.Copy()
if(prob(50))
code/game/objects/items/toys.dm
+3 -3
View File
@@ -68,7 +68,7 @@
return
/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass))
if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/drinks/drinkingglass))
if(O.reagents)
if(O.reagents.total_volume < 1)
to_chat(user, "[O] is empty.")
@@ -781,8 +781,8 @@
item_state = "plushie_ipc"
/obj/item/toy/plushie/ipcplushie/attackby(obj/item/B, mob/user, params)
if(istype(B, /obj/item/reagent_containers/food/snacks/breadslice))
new /obj/item/reagent_containers/food/snacks/toast(get_turf(loc))
if(istype(B, /obj/item/food/snacks/breadslice))
new /obj/item/food/snacks/toast(get_turf(loc))
to_chat(user, "<span class='notice'> You insert bread into the toaster. </span>")
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
qdel(B)
code/game/objects/items/weapons/RSF.dm
+5 -5
View File
@@ -22,15 +22,15 @@
to_chat(user, "<span class='notice'>Choose an item to dispense!</span>")
else
to_chat(user, "<span class='notice'>You are currently dispensing a [initial(currently_dispensing.name)].</span>")
var/static/list/rsf_items = list("Drinking Glass" = /obj/item/reagent_containers/food/drinks/drinkingglass,
var/static/list/rsf_items = list("Drinking Glass" = /obj/item/reagent_containers/drinks/drinkingglass,
"Paper" = /obj/item/paper,
"Pen" = /obj/item/pen,
"Dice Pack" = /obj/item/storage/bag/dice,
"Cigarette" = /obj/item/clothing/mask/cigarette,
"Newdles" = /obj/item/reagent_containers/food/snacks/chinese/newdles,
"Donut" = /obj/item/reagent_containers/food/snacks/donut,
"Chicken Soup" = /obj/item/reagent_containers/food/drinks/chicken_soup,
"Tofu Burger" = /obj/item/reagent_containers/food/snacks/burger/tofu)
"Newdles" = /obj/item/food/snacks/chinese/newdles,
"Donut" = /obj/item/food/snacks/donut,
"Chicken Soup" = /obj/item/reagent_containers/drinks/chicken_soup,
"Tofu Burger" = /obj/item/food/snacks/burger/tofu)
var/static/list/rsf_icons = list("Drinking Glass" = image(icon = 'icons/obj/drinks.dmi', icon_state = "glass_empty"),
"Paper" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper"),
"Pen" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "pen"),
code/game/objects/items/weapons/cigs.dm
+2 -2
View File
@@ -534,8 +534,8 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/rollingpaper/afterattack(atom/target, mob/user, proximity)
if(!proximity)
return
if(istype(target, /obj/item/reagent_containers/food/snacks/grown))
var/obj/item/reagent_containers/food/snacks/grown/O = target
if(istype(target, /obj/item/food/snacks/grown))
var/obj/item/food/snacks/grown/O = target
if(O.dry)
user.unEquip(target, 1)
user.unEquip(src, 1)
code/game/objects/items/weapons/dice.dm
+1 -1
View File
@@ -225,7 +225,7 @@
if(11)
//Cookie
T.visible_message("<span class='userdanger'>A cookie appears out of thin air!</span>")
var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location())
var/obj/item/food/snacks/cookie/C = new(drop_location())
create_smoke(2)
C.name = "Cookie of Fate"
if(12)
code/game/objects/items/weapons/gift_wrappaper.dm
+2 -2
View File
@@ -79,8 +79,8 @@
/obj/random/mech,
/obj/item/toy/spinningtoy,
/obj/item/toy/sword,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
/obj/item/food/snacks/grown/ambrosia/deus,
/obj/item/food/snacks/grown/ambrosia/vulgaris,
/obj/item/paicard,
/obj/item/instrument/violin,
/obj/item/instrument/guitar,
code/game/objects/items/weapons/grenades/chem_grenade.dm
+2 -2
View File
@@ -324,8 +324,8 @@
desc = "A custom made large grenade. It affects a larger area."
icon_state = "large_grenade"
bomb_state = "largebomb"
allowed_containers = list(/obj/item/reagent_containers/glass,/obj/item/reagent_containers/food/condiment,
/obj/item/reagent_containers/food/drinks)
allowed_containers = list(/obj/item/reagent_containers/glass,/obj/item/reagent_containers/condiment,
/obj/item/reagent_containers/drinks)
origin_tech = "combat=3;engineering=3"
affected_area = 5
ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades.
code/game/objects/items/weapons/grenades/clusterbuster.dm
+1 -1
View File
@@ -141,7 +141,7 @@
/obj/item/grenade/clusterbuster/booze
name = "\improper Booze Grenade"
payload = /obj/item/reagent_containers/food/drinks/bottle/random_drink
payload = /obj/item/reagent_containers/drinks/bottle/random_drink
/obj/item/grenade/clusterbuster/honk
name = "\improper Mega Honk Grenade"
code/game/objects/items/weapons/grenades/ghettobomb.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/obj/item/grenade/iedcasing/CheckParts(list/parts_list)
..()
var/obj/item/reagent_containers/food/drinks/cans/can = locate() in contents
var/obj/item/reagent_containers/drinks/cans/can = locate() in contents
if(can)
can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED
can.pixel_y = 0
code/game/objects/items/weapons/kitchen.dm
+1 -1
View File
@@ -57,7 +57,7 @@
return ..()
if(length(contents))
var/obj/item/reagent_containers/food/snacks/toEat = contents[1]
var/obj/item/food/snacks/toEat = contents[1]
if(istype(toEat))
if(C.eat(toEat, user))
toEat.On_Consume(C, user)
code/game/objects/items/weapons/storage/backpack.dm
+12 -12
View File
@@ -116,12 +116,12 @@
new /obj/item/radio/headset/headset_service(src)
new /obj/item/pda/clown(src)
new /obj/item/storage/box/survival(src)
new /obj/item/reagent_containers/food/snacks/grown/banana(src)
new /obj/item/food/snacks/grown/banana(src)
new /obj/item/stamp/clown(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/storage/fancy/crayons(src)
new /obj/item/reagent_containers/spray/waterflower(src)
new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(src)
new /obj/item/instrument/bikehorn(src)
new /obj/item/bikehorn(src)
new /obj/item/dnainjector/comic(src)
@@ -717,7 +717,7 @@
/obj/item/organ/internal/heart/cursed/wizard = 1,
/obj/item/organ/internal/vocal_cords/colossus/wizard = 2,
/obj/item/warp_cube/red = 1,
/obj/item/reagent_containers/food/drinks/everfull = 2,
/obj/item/reagent_containers/drinks/everfull = 2,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard = 2,
/obj/item/immortality_talisman = 1 ) //spells recharge when invincible
var/obj/item/pickeda = pick(list_a)
@@ -749,7 +749,7 @@
value += 1
if(8)
if(prob(25))
new /obj/item/reagent_containers/food/snacks/grown/nymph_pod(src)
new /obj/item/food/snacks/grown/nymph_pod(src)
new /obj/item/slimepotion/sentience(src)
else
new /obj/item/paicard(src) //Still useful, not a point useful.
@@ -757,10 +757,10 @@
//Treat / potion. Free.
var/obj/item/pickedt = pick(
/obj/item/storage/box/syndidonkpockets, // Healing + speed
/obj/item/reagent_containers/food/drinks/bottle/dragonsbreath, // Killing
/obj/item/reagent_containers/food/drinks/bottle/immortality, // Super healing for 20 seconds
/obj/item/reagent_containers/food/snacks/meatsteak/stimulating, //Healing + stun immunity
/obj/item/reagent_containers/food/snacks/plum_pie ) // Great healing over long period of time
/obj/item/reagent_containers/drinks/bottle/dragonsbreath, // Killing
/obj/item/reagent_containers/drinks/bottle/immortality, // Super healing for 20 seconds
/obj/item/food/snacks/meatsteak/stimulating, //Healing + stun immunity
/obj/item/food/snacks/plum_pie ) // Great healing over long period of time
new pickedt(src)
@@ -774,7 +774,7 @@
#undef NANNY_MAX_VALUE
#undef NANNY_MIN_VALUE
/obj/item/reagent_containers/food/drinks/bottle/dragonsbreath
/obj/item/reagent_containers/drinks/bottle/dragonsbreath
name = "flask of dragons breath"
desc = "Not recommended for wizardly consumption. Recommended for mundane consumption!"
icon_state = "holyflask"
@@ -782,7 +782,7 @@
volume = 100
list_reagents = list("dragonsbreath" = 80, "hell_water" = 20)
/obj/item/reagent_containers/food/drinks/bottle/immortality
/obj/item/reagent_containers/drinks/bottle/immortality
name = "drop of immortality"
desc = "Drinking this will make you immortal. For a moment or two, at least."
icon_state = "holyflask"
@@ -790,13 +790,13 @@
volume = 5
list_reagents = list("adminordrazine" = 5)
/obj/item/reagent_containers/food/snacks/meatsteak/stimulating
/obj/item/food/snacks/meatsteak/stimulating
name = "stimulating steak"
desc = "Stimulate your senses."
list_reagents = list("nutriment" = 5, "stimulants" = 25)
bitesize = 100
/obj/item/reagent_containers/food/snacks/plum_pie
/obj/item/food/snacks/plum_pie
name = "perfect plum pie"
desc = "The Jack Horner brand of pie. 2 big thumbs up."
icon = 'icons/obj/food/bakedgoods.dmi'
code/game/objects/items/weapons/storage/bags.dm
+4 -4
View File
@@ -206,7 +206,7 @@
max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
max_w_class = WEIGHT_CLASS_NORMAL
w_class = WEIGHT_CLASS_TINY
can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/grown/ash_flora,/obj/item/reagent_containers/food/snacks/honeycomb)
can_hold = list(/obj/item/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/food/snacks/grown/ash_flora,/obj/item/food/snacks/honeycomb)
resistance_flags = FLAMMABLE
/obj/item/storage/bag/plants/portaseeder
@@ -497,7 +497,7 @@
/obj/item/storage/bag/tray/cookies_tray
var/cookie = /obj/item/reagent_containers/food/snacks/cookie
var/cookie = /obj/item/food/snacks/cookie
/obj/item/storage/bag/tray/cookies_tray/populate_contents() // By Azule Utama, thank you a lot!
for(var/i in 1 to 6)
@@ -506,7 +506,7 @@
update_icon(UPDATE_OVERLAYS)
/obj/item/storage/bag/tray/cookies_tray/sugarcookie
cookie = /obj/item/reagent_containers/food/snacks/sugarcookie
cookie = /obj/item/food/snacks/sugarcookie
/*
* Chemistry bag
@@ -537,7 +537,7 @@
storage_slots = 25
max_combined_w_class = 200
w_class = WEIGHT_CLASS_TINY
can_hold = list(/obj/item/slime_extract, /obj/item/reagent_containers/food/snacks/monkeycube,
can_hold = list(/obj/item/slime_extract, /obj/item/food/snacks/monkeycube,
/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/iv_bag,
/obj/item/reagent_containers/hypospray/autoinjector/epinephrine)
code/game/objects/items/weapons/storage/belt.dm
+12 -12
View File
@@ -278,7 +278,7 @@
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_box,
/obj/item/reagent_containers/food/snacks/donut,
/obj/item/food/snacks/donut,
/obj/item/kitchen/knife/combat,
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
@@ -329,7 +329,7 @@
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_box,
/obj/item/reagent_containers/food/snacks/donut,
/obj/item/food/snacks/donut,
/obj/item/kitchen/knife/combat,
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
@@ -420,7 +420,7 @@
can_hold = list(
/obj/item/grenade,
/obj/item/lighter,
/obj/item/reagent_containers/food/drinks/bottle/molotov
/obj/item/reagent_containers/drinks/bottle/molotov
)
/obj/item/storage/belt/grenade/full/populate_contents()
@@ -919,7 +919,7 @@
/obj/item/stack/sheet/bone,
/obj/item/lighter,
/obj/item/storage/fancy/cigarettes,
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/reagent_containers/drinks/bottle,
/obj/item/stack/medical,
/obj/item/kitchen/knife,
/obj/item/reagent_containers/hypospray,
@@ -930,7 +930,7 @@
/obj/item/reagent_containers/pill,
/obj/item/storage/pill_bottle,
/obj/item/stack/ore,
/obj/item/reagent_containers/food/drinks,
/obj/item/reagent_containers/drinks,
/obj/item/organ/internal/regenerative_core,
/obj/item/wormhole_jaunter,
/obj/item/storage/bag/plants,
@@ -968,11 +968,11 @@
/obj/item/kitchen/cutter,
/obj/item/assembly/mousetrap,
/obj/item/reagent_containers/spray/pestspray,
/obj/item/reagent_containers/food/drinks/flask,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/reagent_containers/food/drinks/cans,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/reagent_containers/food/snacks,
/obj/item/reagent_containers/food/condiment,
/obj/item/reagent_containers/drinks/flask,
/obj/item/reagent_containers/drinks/drinkingglass,
/obj/item/reagent_containers/drinks/bottle,
/obj/item/reagent_containers/drinks/cans,
/obj/item/reagent_containers/drinks/shaker,
/obj/item/food/snacks,
/obj/item/reagent_containers/condiment,
/obj/item/reagent_containers/glass/beaker)
code/game/objects/items/weapons/storage/bible.dm
+2 -2
View File
@@ -58,8 +58,8 @@
icon_state ="bible"
/obj/item/storage/bible/booze/populate_contents()
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/stack/spacecash(src)
new /obj/item/stack/spacecash(src)
new /obj/item/stack/spacecash(src)
code/game/objects/items/weapons/storage/boxes.dm
+19 -19
View File
@@ -302,7 +302,7 @@
/obj/item/storage/box/cups/populate_contents()
for(var/I in 1 to 7)
new /obj/item/reagent_containers/food/drinks/sillycup(src)
new /obj/item/reagent_containers/drinks/sillycup(src)
/obj/item/storage/box/drinkingglasses
name = "box of drinking glasses"
@@ -310,7 +310,7 @@
/obj/item/storage/box/drinkingglasses/populate_contents()
for(var/I in 1 to 6)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/drinks/drinkingglass(src)
/obj/item/storage/box/condimentbottles
name = "box of condiment bottles"
@@ -318,7 +318,7 @@
/obj/item/storage/box/condimentbottles/populate_contents()
for(var/I in 1 to 6)
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/condiment(src)
/obj/item/storage/box/mousetraps
name = "box of Pest-B-Gon mousetraps"
@@ -424,9 +424,9 @@
desc = "A box intended for experienced chefs."
/obj/item/storage/box/chef_rare_ingredients_kit/populate_contents()
new /obj/item/reagent_containers/food/condiment/soysauce(src)
new /obj/item/reagent_containers/food/condiment/enzyme(src)
new /obj/item/reagent_containers/food/condiment/pack/hotsauce(src)
new /obj/item/reagent_containers/condiment/soysauce(src)
new /obj/item/reagent_containers/condiment/enzyme(src)
new /obj/item/reagent_containers/condiment/pack/hotsauce(src)
new /obj/item/kitchen/knife/butcher(src)
var/list/reagent_list = list("msg", "triple_citrus", "salglu_solution", "nutriment", "gravy", "honey", "vitfro")
for(var/reag in reagent_list)
@@ -490,8 +490,8 @@
desc = "Drymate brand monkey cubes. Just add water!"
icon_state = "monkey_box"
storage_slots = 7
can_hold = list(/obj/item/reagent_containers/food/snacks/monkeycube)
var/monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
can_hold = list(/obj/item/food/snacks/monkeycube)
var/monkey_cube_type = /obj/item/food/snacks/monkeycube
/obj/item/storage/box/monkeycubes/populate_contents()
for(var/I in 1 to 5)
@@ -499,31 +499,31 @@
/obj/item/storage/box/monkeycubes/syndicate
desc = "Waffle Co. brand monkey cubes. Just add water and a dash of subterfuge!"
monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/syndicate
monkey_cube_type = /obj/item/food/snacks/monkeycube/syndicate
/obj/item/storage/box/monkeycubes/farwacubes
name = "farwa cube box"
desc = "Drymate brand farwa cubes. Just add water!"
icon_state = "farwa_box"
monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
monkey_cube_type = /obj/item/food/snacks/monkeycube/farwacube
/obj/item/storage/box/monkeycubes/stokcubes
name = "stok cube box"
desc = "Drymate brand stok cubes. Just add water!"
icon_state = "stok_box"
monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
monkey_cube_type = /obj/item/food/snacks/monkeycube/stokcube
/obj/item/storage/box/monkeycubes/neaeracubes
name = "neaera cube box"
desc = "Drymate brand neaera cubes. Just add water!"
icon_state = "neaera_box"
monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
monkey_cube_type = /obj/item/food/snacks/monkeycube/neaeracube
/obj/item/storage/box/monkeycubes/wolpincubes
name = "wolpin cube box"
desc = "Drymate brand wolpin cubes. Just add water!"
icon_state = "wolpin_box"
monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
monkey_cube_type = /obj/item/food/snacks/monkeycube/wolpincube
///////////////////
/* Medical Boxes */
@@ -864,14 +864,14 @@
icon_state = "donk_box"
storage_slots = 6
can_hold = list(
/obj/item/reagent_containers/food/snacks/donkpocket,
/obj/item/reagent_containers/food/snacks/warmdonkpocket,
/obj/item/reagent_containers/food/snacks/warmdonkpocket_weak,
/obj/item/reagent_containers/food/snacks/syndidonkpocket)
/obj/item/food/snacks/donkpocket,
/obj/item/food/snacks/warmdonkpocket,
/obj/item/food/snacks/warmdonkpocket_weak,
/obj/item/food/snacks/syndidonkpocket)
/obj/item/storage/box/donkpockets/populate_contents()
for(var/I in 1 to 6)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/food/snacks/donkpocket(src)
/obj/item/storage/box/donkpockets/empty/populate_contents()
return
@@ -883,7 +883,7 @@
/obj/item/storage/box/syndidonkpockets/populate_contents()
for(var/I in 1 to 6)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/food/snacks/syndidonkpocket(src)
////////////////
/* Misc Boxes */
code/game/objects/items/weapons/storage/fancy.dm
+5 -5
View File
@@ -41,7 +41,7 @@
icon_type = "donut"
icon_state = "donutbox"
storage_slots = 6
can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
can_hold = list(/obj/item/food/snacks/donut)
icon_type = "donut"
foldable = /obj/item/stack/sheet/cardboard
foldable_amt = 1
@@ -49,7 +49,7 @@
/obj/item/storage/fancy/donut_box/update_overlays()
. = ..()
for(var/I = 1 to length(contents))
var/obj/item/reagent_containers/food/snacks/donut/donut = contents[I]
var/obj/item/food/snacks/donut/donut = contents[I]
var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "[(I - 1)]donut[donut.donut_sprite_type]")
. += new_donut_icon
@@ -58,7 +58,7 @@
/obj/item/storage/fancy/donut_box/populate_contents()
for(var/I in 1 to storage_slots)
new /obj/item/reagent_containers/food/snacks/donut(src)
new /obj/item/food/snacks/donut(src)
update_icon(UPDATE_OVERLAYS)
/obj/item/storage/fancy/donut_box/empty/populate_contents()
@@ -82,11 +82,11 @@
item_state = "eggbox"
name = "egg box"
storage_slots = 12
can_hold = list(/obj/item/reagent_containers/food/snacks/egg)
can_hold = list(/obj/item/food/snacks/egg)
/obj/item/storage/fancy/egg_box/populate_contents()
for(var/I in 1 to storage_slots)
new /obj/item/reagent_containers/food/snacks/egg(src)
new /obj/item/food/snacks/egg(src)
/*
* Candle Box
code/game/objects/items/weapons/storage/uplink_kits.dm
+3 -3
View File
@@ -68,7 +68,7 @@
/obj/item/storage/box/syndie_kit/emp, // 10TC
/obj/item/clothing/glasses/hud/security/chameleon, // 10TC
/obj/item/encryptionkey/syndicate, // 10TC
/obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail, // 0TC
/obj/item/reagent_containers/drinks/drinkingglass/alliescocktail, // 0TC
/obj/item/storage/box/syndie_kit/pen_bomb, // 30 TC
/obj/item/CQC_manual) // 13TC
@@ -310,9 +310,9 @@
name = "combat bakery kit"
/obj/item/storage/box/syndie_kit/combat_baking/populate_contents()
new /obj/item/reagent_containers/food/snacks/baguette/combat(src)
new /obj/item/food/snacks/baguette/combat(src)
for(var/i in 1 to 2)
new /obj/item/reagent_containers/food/snacks/croissant/throwing(src)
new /obj/item/food/snacks/croissant/throwing(src)
new /obj/item/book/granter/crafting_recipe/combat_baking(src)
/obj/item/storage/box/syndie_kit/atmosn2ogrenades