cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +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/modules/reagents/chemistry/machinery/reagentgrinder.dm
+41 -41
View File
@@ -32,21 +32,21 @@
/obj/item/stack/sheet/saltpetre_crystal = list("saltpetre" = 8),
// Blender Stuff
/obj/item/food/snacks/grown/tomato = list("ketchup" = 0),
/obj/item/food/snacks/grown/wheat = list("flour" = -5),
/obj/item/food/snacks/grown/oat = list("flour" = -5),
/obj/item/food/snacks/grown/cherries = list("cherryjelly" = 0),
/obj/item/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
/obj/item/food/snacks/egg = list("egg" = -5),
/obj/item/food/snacks/grown/rice = list("rice" = -5),
/obj/item/food/snacks/grown/olive = list("olivepaste" = 0, "sodiumchloride" = 0),
/obj/item/food/snacks/grown/peanuts = list("peanutbutter" = 0),
/obj/item/food/grown/tomato = list("ketchup" = 0),
/obj/item/food/grown/wheat = list("flour" = -5),
/obj/item/food/grown/oat = list("flour" = -5),
/obj/item/food/grown/cherries = list("cherryjelly" = 0),
/obj/item/food/grown/bluecherries = list("bluecherryjelly" = 0),
/obj/item/food/egg = list("egg" = -5),
/obj/item/food/grown/rice = list("rice" = -5),
/obj/item/food/grown/olive = list("olivepaste" = 0, "sodiumchloride" = 0),
/obj/item/food/grown/peanuts = list("peanutbutter" = 0),
// Grinder stuff, but only if dry
/obj/item/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
/obj/item/food/snacks/grown/coffee = list("coffeepowder" = 0),
/obj/item/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
/obj/item/food/snacks/grown/tea = list("teapowder" = 0),
/obj/item/food/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
/obj/item/food/grown/coffee = list("coffeepowder" = 0),
/obj/item/food/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
/obj/item/food/grown/tea = list("teapowder" = 0),
// All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
/obj/item/slime_extract = list(),
@@ -59,32 +59,32 @@
var/list/juice_items = list (
// Juicer Stuff
/obj/item/food/snacks/grown/soybeans = list("soymilk" = 0),
/obj/item/food/snacks/grown/corn = list("corn_starch" = 0),
/obj/item/food/snacks/grown/tomato = list("tomatojuice" = 0),
/obj/item/food/snacks/grown/carrot = list("carrotjuice" = 0),
/obj/item/food/snacks/grown/berries = list("berryjuice" = 0),
/obj/item/food/snacks/grown/banana = list("banana" = 0),
/obj/item/food/snacks/grown/potato = list("potato" = 0),
/obj/item/food/snacks/grown/citrus/lemon = list("lemonjuice" = 0),
/obj/item/food/snacks/grown/citrus/orange = list("orangejuice" = 0),
/obj/item/food/snacks/grown/citrus/lime = list("limejuice" = 0),
/obj/item/food/snacks/grown/watermelon = list("watermelonjuice" = 0),
/obj/item/food/snacks/watermelonslice = list("watermelonjuice" = 0),
/obj/item/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0),
/obj/item/food/snacks/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), // Order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice
/obj/item/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0),
/obj/item/food/snacks/grown/apple = list("applejuice" = 0),
/obj/item/food/snacks/grown/grapes = list("grapejuice" = 0),
/obj/item/food/snacks/grown/pineapple = list("pineapplejuice" = 0)
/obj/item/food/grown/soybeans = list("soymilk" = 0),
/obj/item/food/grown/corn = list("corn_starch" = 0),
/obj/item/food/grown/tomato = list("tomatojuice" = 0),
/obj/item/food/grown/carrot = list("carrotjuice" = 0),
/obj/item/food/grown/berries = list("berryjuice" = 0),
/obj/item/food/grown/banana = list("banana" = 0),
/obj/item/food/grown/potato = list("potato" = 0),
/obj/item/food/grown/citrus/lemon = list("lemonjuice" = 0),
/obj/item/food/grown/citrus/orange = list("orangejuice" = 0),
/obj/item/food/grown/citrus/lime = list("limejuice" = 0),
/obj/item/food/grown/watermelon = list("watermelonjuice" = 0),
/obj/item/food/watermelonslice = list("watermelonjuice" = 0),
/obj/item/food/grown/berries/poison = list("poisonberryjuice" = 0),
/obj/item/food/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), // Order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice
/obj/item/food/grown/pumpkin = list("pumpkinjuice" = 0),
/obj/item/food/grown/apple = list("applejuice" = 0),
/obj/item/food/grown/grapes = list("grapejuice" = 0),
/obj/item/food/grown/pineapple = list("pineapplejuice" = 0)
)
var/list/dried_items = list(
// Grinder stuff, but only if dry,
/obj/item/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
/obj/item/food/snacks/grown/coffee = list("coffeepowder" = 0),
/obj/item/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
/obj/item/food/snacks/grown/tea = list("teapowder" = 0)
/obj/item/food/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
/obj/item/food/grown/coffee = list("coffeepowder" = 0),
/obj/item/food/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
/obj/item/food/grown/tea = list("teapowder" = 0)
)
var/list/holdingitems = list()
@@ -178,8 +178,8 @@
return TRUE // No afterattack
if(is_type_in_list(I, dried_items))
if(istype(I, /obj/item/food/snacks/grown))
var/obj/item/food/snacks/grown/G = I
if(istype(I, /obj/item/food/grown))
var/obj/item/food/grown/G = I
if(!G.dry)
to_chat(user, "<span class='warning'>You must dry that first!</span>")
return FALSE
@@ -356,7 +356,7 @@
if(istype(O, i))
return blend_items[i]
/obj/machinery/reagentgrinder/proc/get_special_juice(obj/item/food/snacks/O)
/obj/machinery/reagentgrinder/proc/get_special_juice(obj/item/food/O)
for(var/i in juice_items)
if(istype(O, i))
return juice_items[i]
@@ -369,7 +369,7 @@
else
return round(O.seed.potency)
/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/food/snacks/grown/O)
/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/food/grown/O)
if(!istype(O) || !O.seed)
return 5
else if(O.seed.potency == -1)
@@ -399,7 +399,7 @@
SStgui.update_uis(src)
// Snacks
for(var/obj/item/food/snacks/O in holdingitems)
for(var/obj/item/food/O in holdingitems)
var/list/special_juice = get_special_juice(O)
if(!length(special_juice))
continue // Ignore food that doesn't juice into anything
@@ -434,7 +434,7 @@
SStgui.update_uis(src)
// Snacks and Plants
for(var/obj/item/food/snacks/O in holdingitems)
for(var/obj/item/food/O in holdingitems)
var/list/special_blend = get_special_blend(O)
for(var/r_id in special_blend)
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
code/modules/reagents/chemistry/reagents/food_reagents.dm
+5 -5
View File
@@ -567,7 +567,7 @@
/datum/reagent/consumable/chocolate/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/food/snacks/choc_pile(T)
new /obj/item/food/choc_pile(T)
/datum/reagent/consumable/mugwort
name = "Mugwort"
@@ -635,7 +635,7 @@
/datum/reagent/consumable/cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/food/snacks/cheesewedge(T)
new /obj/item/food/cheesewedge(T)
/datum/reagent/consumable/fake_cheese
name = "Cheese substitute"
@@ -677,7 +677,7 @@
/datum/reagent/consumable/weird_cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/food/snacks/weirdcheesewedge(T)
new /obj/item/food/weirdcheesewedge(T)
/datum/reagent/consumable/beans
name = "Refried beans"
@@ -905,11 +905,11 @@
/datum/reagent/ectoplasm/reaction_turf(turf/T, volume)
if(volume >= 10 && !isspaceturf(T))
new /obj/item/food/snacks/ectoplasm(T)
new /obj/item/food/ectoplasm(T)
/datum/reagent/consumable/bread/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/food/snacks/breadslice(T)
new /obj/item/food/breadslice(T)
/datum/reagent/soap
name = "Soap"
code/modules/reagents/chemistry/recipes/food_reactions.dm
+8 -8
View File
@@ -10,7 +10,7 @@
/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/food/snacks/tofu(location)
new /obj/item/food/tofu(location)
/datum/chemical_reaction/chocolate_bar
name = "Chocolate Bar"
@@ -22,7 +22,7 @@
/datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/food/snacks/chocolatebar(location)
new /obj/item/food/chocolatebar(location)
/datum/chemical_reaction/chocolate_bar2
name = "Chocolate Bar"
@@ -34,7 +34,7 @@
/datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/food/snacks/chocolatebar(location)
new /obj/item/food/chocolatebar(location)
/datum/chemical_reaction/soysauce
name = "Soy Sauce"
@@ -75,7 +75,7 @@
/datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/food/snacks/sliceable/cheesewheel(location)
new /obj/item/food/sliceable/cheesewheel(location)
/datum/chemical_reaction/syntiflesh
name = "Syntiflesh"
@@ -87,7 +87,7 @@
/datum/chemical_reaction/syntiflesh/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/food/snacks/meat/syntiflesh(location)
new /obj/item/food/meat/syntiflesh(location)
/datum/chemical_reaction/hot_ramen
name = "Hot Ramen"
@@ -114,7 +114,7 @@
/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
new /obj/item/food/snacks/dough(location)
new /obj/item/food/dough(location)
///Cookies by Ume
@@ -129,7 +129,7 @@
/datum/chemical_reaction/cookiedough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
new /obj/item/food/snacks/cookiedough(location)
new /obj/item/food/cookiedough(location)
/datum/chemical_reaction/corn_syrup
@@ -183,7 +183,7 @@
/datum/chemical_reaction/weird_cheese/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
new /obj/item/food/snacks/weirdcheesewedge(location)
new /obj/item/food/weirdcheesewedge(location)
/datum/chemical_reaction/hydrogenated_soybeanoil
name = "Partially hydrogenated space-soybean oil"
code/modules/reagents/chemistry/recipes/others.dm
+1 -1
View File
@@ -260,7 +260,7 @@
/datum/chemical_reaction/meatification/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/food/snacks/meat/slab/meatproduct(location)
new /obj/item/food/meat/slab/meatproduct(location)
/datum/chemical_reaction/lye
name = "lye"
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+30 -30
View File
@@ -38,7 +38,7 @@
/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
for(var/i = 1, i <= 3, i++)
var/obj/item/food/snacks/monkeycube/M = new /obj/item/food/snacks/monkeycube
var/obj/item/food/monkeycube/M = new /obj/item/food/monkeycube
M.forceMove(get_turf(holder.my_atom))
//Green
@@ -149,37 +149,37 @@
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/list/blocked = list(
/obj/item/food/snacks,
/obj/item/food/snacks/breadslice,
/obj/item/food/snacks/sliceable,
/obj/item/food/snacks/sliceable/pizza,
/obj/item/food/snacks/margheritapizzaslice,
/obj/item/food/snacks/meatpizzaslice,
/obj/item/food/snacks/mushroompizzaslice,
/obj/item/food/snacks/vegetablepizzaslice,
/obj/item/food/snacks/cheesepizzaslice,
/obj/item/food/snacks/garlicpizzaslice,
/obj/item/food/snacks/donkpocketpizzaslice,
/obj/item/food/snacks/dankpizzaslice,
/obj/item/food/snacks/macpizzaslice,
/obj/item/food/snacks/firecrackerpizzaslice,
/obj/item/food/snacks/pestopizzaslice,
/obj/item/food/snacks/pepperonipizzaslice,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat/slab,
/obj/item/food/snacks/grown,
/obj/item/food/snacks/grown/shell,
/obj/item/food/snacks/grown/mushroom,
/obj/item/food/snacks/deepfryholder,
/obj/item/food/snacks/chinese,
/obj/item/food/snacks/human,
/obj/item/food/snacks/monstermeat,
/obj/item/food/snacks/meatsteak/stimulating,
/obj/item/food/snacks/egg/watcher
/obj/item/food,
/obj/item/food/breadslice,
/obj/item/food/sliceable,
/obj/item/food/sliceable/pizza,
/obj/item/food/margheritapizzaslice,
/obj/item/food/meatpizzaslice,
/obj/item/food/mushroompizzaslice,
/obj/item/food/vegetablepizzaslice,
/obj/item/food/cheesepizzaslice,
/obj/item/food/garlicpizzaslice,
/obj/item/food/donkpocketpizzaslice,
/obj/item/food/dankpizzaslice,
/obj/item/food/macpizzaslice,
/obj/item/food/firecrackerpizzaslice,
/obj/item/food/pestopizzaslice,
/obj/item/food/pepperonipizzaslice,
/obj/item/food/meat,
/obj/item/food/meat/slab,
/obj/item/food/grown,
/obj/item/food/grown/shell,
/obj/item/food/grown/mushroom,
/obj/item/food/deepfryholder,
/obj/item/food/chinese,
/obj/item/food/human,
/obj/item/food/monstermeat,
/obj/item/food/meatsteak/stimulating,
/obj/item/food/egg/watcher
)
blocked |= typesof(/obj/item/food/snacks/customizable)
blocked |= typesof(/obj/item/food/customizable)
var/list/borks = typesof(/obj/item/food/snacks) - blocked
var/list/borks = typesof(/obj/item/food) - blocked
// BORK BORK BORK
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)