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

Removes the empty type of /snacks (#26010)

Browse Source 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-07-29 14:46:04 +00:00
committed by GitHub
parent 2e2569f1db
commit 098b13bb33
222 changed files with 3300 additions and 3347 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/food/snacks/cheesewedge/presliced/book_cheese = new
var/obj/item/food/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/food/snacks/cheesewedge/presliced)
summon_type = list(/obj/item/food/cheesewedge/presliced)
summon_amt = 9
aoe_range = 1
summon_ignore_prev_spawn_points = TRUE
code/game/objects/items/mixing_bowl.dm
+6 -6
View File
@@ -68,20 +68,20 @@
var/list/items_measures_p = list()
for(var/obj/O in contents)
var/display_name = O.name
if(istype(O,/obj/item/food/snacks/egg))
if(istype(O,/obj/item/food/egg))
items_measures[display_name] = "egg"
items_measures_p[display_name] = "eggs"
if(istype(O,/obj/item/food/snacks/tofu))
if(istype(O,/obj/item/food/tofu))
items_measures[display_name] = "tofu chunk"
items_measures_p[display_name] = "tofu chunks"
if(istype(O,/obj/item/food/snacks/meat)) //any meat
if(istype(O,/obj/item/food/meat)) //any meat
items_measures[display_name] = "slab of meat"
items_measures_p[display_name] = "slabs of meat"
if(istype(O,/obj/item/food/snacks/donkpocket))
if(istype(O,/obj/item/food/donkpocket))
display_name = "Turnovers"
items_measures[display_name] = "turnover"
items_measures_p[display_name] = "turnovers"
if(istype(O,/obj/item/food/snacks/carpmeat))
if(istype(O,/obj/item/food/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/food/snacks/badrecipe/mysteryfood = new(get_turf(source))
var/obj/item/food/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/toys.dm
+2 -2
View File
@@ -785,8 +785,8 @@
item_state = "plushie_ipc"
/obj/item/toy/plushie/ipcplushie/attackby(obj/item/B, mob/user, params)
if(istype(B, /obj/item/food/snacks/breadslice))
new /obj/item/food/snacks/toast(get_turf(loc))
if(istype(B, /obj/item/food/breadslice))
new /obj/item/food/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
+3 -3
View File
@@ -27,10 +27,10 @@
"Pen" = /obj/item/pen,
"Dice Pack" = /obj/item/storage/bag/dice,
"Cigarette" = /obj/item/clothing/mask/cigarette,
"Newdles" = /obj/item/food/snacks/chinese/newdles,
"Donut" = /obj/item/food/snacks/donut,
"Newdles" = /obj/item/food/chinese/newdles,
"Donut" = /obj/item/food/donut,
"Chicken Soup" = /obj/item/reagent_containers/drinks/chicken_soup,
"Tofu Burger" = /obj/item/food/snacks/burger/tofu)
"Tofu Burger" = /obj/item/food/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
+4 -4
View File
@@ -522,8 +522,8 @@ LIGHTERS ARE IN LIGHTERS.DM
// Refill or light the pipe
/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/food/snacks/grown))
var/obj/item/food/snacks/grown/O = I
if(istype(I, /obj/item/food/grown))
var/obj/item/food/grown/O = I
if(O.dry)
if(reagents.total_volume == reagents.maximum_volume)
to_chat(user, "<span class='warning'>[src] is full!</span>")
@@ -568,10 +568,10 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/rollingpaper/afterattack(atom/target, mob/user, proximity)
if(!proximity)
return
if(!istype(target, /obj/item/food/snacks/grown))
if(!istype(target, /obj/item/food/grown))
return ..()
var/obj/item/food/snacks/grown/plant = target
var/obj/item/food/grown/plant = target
if(!plant.dry)
to_chat(user, "<span class='warning'>You need to dry this first!</span>")
return
code/game/objects/items/weapons/dice.dm
+1 -1
View File
@@ -226,7 +226,7 @@
if(11)
//Cookie
T.visible_message("<span class='userdanger'>A cookie appears out of thin air!</span>")
var/obj/item/food/snacks/cookie/C = new(drop_location())
var/obj/item/food/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/food/snacks/grown/ambrosia/deus,
/obj/item/food/snacks/grown/ambrosia/vulgaris,
/obj/item/food/grown/ambrosia/deus,
/obj/item/food/grown/ambrosia/vulgaris,
/obj/item/paicard,
/obj/item/instrument/violin,
/obj/item/instrument/guitar,
code/game/objects/items/weapons/kitchen.dm
+1 -1
View File
@@ -57,7 +57,7 @@
return ..()
if(length(contents))
var/obj/item/food/snacks/toEat = contents[1]
var/obj/item/food/toEat = contents[1]
if(istype(toEat))
if(C.eat(toEat, user))
toEat.On_Consume(C, user)
code/game/objects/items/weapons/storage/backpack.dm
+6 -6
View File
@@ -116,7 +116,7 @@
new /obj/item/radio/headset/headset_service(src)
new /obj/item/pda/clown(src)
new /obj/item/storage/box/survival(src)
new /obj/item/food/snacks/grown/banana(src)
new /obj/item/food/grown/banana(src)
new /obj/item/stamp/clown(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/storage/fancy/crayons(src)
@@ -752,7 +752,7 @@
value += 1
if(8)
if(prob(25))
new /obj/item/food/snacks/grown/nymph_pod(src)
new /obj/item/food/grown/nymph_pod(src)
new /obj/item/slimepotion/sentience(src)
else
new /obj/item/paicard(src) //Still useful, not a point useful.
@@ -762,8 +762,8 @@
/obj/item/storage/box/syndidonkpockets, // Healing + speed
/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
/obj/item/food/meatsteak/stimulating, //Healing + stun immunity
/obj/item/food/plum_pie ) // Great healing over long period of time
new pickedt(src)
@@ -793,13 +793,13 @@
volume = 5
list_reagents = list("adminordrazine" = 5)
/obj/item/food/snacks/meatsteak/stimulating
/obj/item/food/meatsteak/stimulating
name = "stimulating steak"
desc = "Stimulate your senses."
list_reagents = list("nutriment" = 5, "stimulants" = 25)
bitesize = 100
/obj/item/food/snacks/plum_pie
/obj/item/food/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
+6 -6
View File
@@ -209,10 +209,10 @@
can_hold = list(
/obj/item/seeds,
/obj/item/unsorted_seeds,
/obj/item/food/snacks/grown,
/obj/item/food/grown,
/obj/item/grown,
/obj/item/food/snacks/grown/ash_flora,
/obj/item/food/snacks/honeycomb)
/obj/item/food/grown/ash_flora,
/obj/item/food/honeycomb)
cant_hold = list(/obj/item/grown/bananapeel/traitorpeel)
resistance_flags = FLAMMABLE
@@ -398,7 +398,7 @@
return ..()
/obj/item/storage/bag/tray/cookies_tray
var/cookie = /obj/item/food/snacks/cookie
var/cookie = /obj/item/food/cookie
/obj/item/storage/bag/tray/cookies_tray/populate_contents() // By Azule Utama, thank you a lot!
for(var/i in 1 to 6)
@@ -407,7 +407,7 @@
update_icon(UPDATE_OVERLAYS)
/obj/item/storage/bag/tray/cookies_tray/sugarcookie
cookie = /obj/item/food/snacks/sugarcookie
cookie = /obj/item/food/sugarcookie
////////////////////////////////////////
// MARK: Chemistry bag
@@ -437,7 +437,7 @@
storage_slots = 25
max_combined_w_class = 200
w_class = WEIGHT_CLASS_TINY
can_hold = list(/obj/item/slime_extract, /obj/item/food/snacks/monkeycube,
can_hold = list(/obj/item/slime_extract, /obj/item/food/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
+3 -3
View File
@@ -300,7 +300,7 @@
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_box,
/obj/item/food/snacks/donut,
/obj/item/food/donut,
/obj/item/kitchen/knife/combat,
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
@@ -353,7 +353,7 @@
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_box,
/obj/item/food/snacks/donut,
/obj/item/food/donut,
/obj/item/kitchen/knife/combat,
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
@@ -1007,6 +1007,6 @@
/obj/item/reagent_containers/drinks/bottle,
/obj/item/reagent_containers/drinks/cans,
/obj/item/reagent_containers/drinks/shaker,
/obj/item/food/snacks,
/obj/item/food,
/obj/item/reagent_containers/condiment,
/obj/item/reagent_containers/glass/beaker)
code/game/objects/items/weapons/storage/boxes.dm
+14 -14
View File
@@ -349,8 +349,8 @@
desc = "Drymate brand monkey cubes. Just add water!"
icon_state = "monkey_box"
storage_slots = 7
can_hold = list(/obj/item/food/snacks/monkeycube)
var/monkey_cube_type = /obj/item/food/snacks/monkeycube
can_hold = list(/obj/item/food/monkeycube)
var/monkey_cube_type = /obj/item/food/monkeycube
/obj/item/storage/box/monkeycubes/populate_contents()
for(var/I in 1 to 5)
@@ -358,37 +358,37 @@
/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/food/snacks/monkeycube/syndicate
monkey_cube_type = /obj/item/food/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/food/snacks/monkeycube/farwacube
monkey_cube_type = /obj/item/food/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/food/snacks/monkeycube/stokcube
monkey_cube_type = /obj/item/food/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/food/snacks/monkeycube/neaeracube
monkey_cube_type = /obj/item/food/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/food/snacks/monkeycube/wolpincube
monkey_cube_type = /obj/item/food/monkeycube/wolpincube
/obj/item/storage/box/monkeycubes/nian_worme_cubes
name = "nian worme cube box"
desc = "Nian Trade Guild brand worme cubes. Just add water!"
icon_state = "nian_worme_box"
monkey_cube_type = /obj/item/food/snacks/monkeycube/nian_wormecube
monkey_cube_type = /obj/item/food/monkeycube/nian_wormecube
///////////////////
/* Medical Boxes */
@@ -749,14 +749,14 @@
icon_state = "donk_box"
storage_slots = 6
can_hold = list(
/obj/item/food/snacks/donkpocket,
/obj/item/food/snacks/warmdonkpocket,
/obj/item/food/snacks/warmdonkpocket_weak,
/obj/item/food/snacks/syndidonkpocket)
/obj/item/food/donkpocket,
/obj/item/food/warmdonkpocket,
/obj/item/food/warmdonkpocket_weak,
/obj/item/food/syndidonkpocket)
/obj/item/storage/box/donkpockets/populate_contents()
for(var/I in 1 to 6)
new /obj/item/food/snacks/donkpocket(src)
new /obj/item/food/donkpocket(src)
/obj/item/storage/box/donkpockets/empty/populate_contents()
return
@@ -768,7 +768,7 @@
/obj/item/storage/box/syndidonkpockets/populate_contents()
for(var/I in 1 to 6)
new /obj/item/food/snacks/syndidonkpocket(src)
new /obj/item/food/syndidonkpocket(src)
////////////////
/* Misc Boxes */
code/game/objects/items/weapons/storage/fancy.dm
+5 -5
View File
@@ -42,14 +42,14 @@
icon_type = "donut"
icon_state = "donutbox"
storage_slots = 6
can_hold = list(/obj/item/food/snacks/donut)
can_hold = list(/obj/item/food/donut)
foldable = /obj/item/stack/sheet/cardboard
foldable_amt = 1
/obj/item/storage/fancy/donut_box/update_overlays()
. = ..()
for(var/I = 1 to length(contents))
var/obj/item/food/snacks/donut/donut = contents[I]
var/obj/item/food/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/food/snacks/donut(src)
new /obj/item/food/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/food/snacks/egg)
can_hold = list(/obj/item/food/egg)
/obj/item/storage/fancy/egg_box/populate_contents()
for(var/I in 1 to storage_slots)
new /obj/item/food/snacks/egg(src)
new /obj/item/food/egg(src)
/*
* Candle Box
code/game/objects/items/weapons/storage/uplink_kits.dm
+2 -2
View File
@@ -406,9 +406,9 @@
name = "combat bakery kit"
/obj/item/storage/box/syndie_kit/combat_baking/populate_contents()
new /obj/item/food/snacks/baguette/combat(src)
new /obj/item/food/baguette/combat(src)
for(var/i in 1 to 2)
new /obj/item/food/snacks/croissant/throwing(src)
new /obj/item/food/croissant/throwing(src)
new /obj/item/book/granter/crafting_recipe/combat_baking(src)
/obj/item/storage/box/syndie_kit/atmosn2ogrenades