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

[FIX] Better slices (#27807)

Browse Source 
* Slices have a base class /food/slice

* Refactor

* Small fix

* Adds default reagent for empy slices

* Looks good

* adds_list_reagents

* "Reverted snake_case_remap files to state from original commit

* I don't know how to resolve merge conflicts :)

---------

Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
This commit is contained in:
Drsmail
2025-01-25 22:36:04 +03:00
committed by GitHub
parent 99d18c8513
commit 754a868650
40 changed files with 431 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+1 -1
View File
@@ -70,7 +70,7 @@
/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/sliced/watermelon = 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),
code/modules/reagents/chemistry/reagents/food_reagents.dm
+2 -2
View File
@@ -635,7 +635,7 @@
/datum/reagent/consumable/cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/food/cheesewedge/presliced(T)
new /obj/item/food/sliced/cheesewedge/presliced(T)
/datum/reagent/consumable/fake_cheese
name = "Cheese substitute"
@@ -925,7 +925,7 @@
/datum/reagent/consumable/bread/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/food/breadslice(T)
new /obj/item/food/sliced/bread(T)
/datum/reagent/soap
name = "Soap"
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+13 -13
View File
@@ -150,21 +150,21 @@
var/list/blocked = list(
/obj/item/food,
/obj/item/food/breadslice,
/obj/item/food/sliced/bread,
/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/sliced/margherita_pizza,
/obj/item/food/sliced/meat_pizza,
/obj/item/food/sliced/mushroom_pizza,
/obj/item/food/sliced/vegetable_pizza,
/obj/item/food/sliced/cheese_pizza,
/obj/item/food/garlic_pizza,
/obj/item/food/sliced/donk_pocket_pizza,
/obj/item/food/sliced/dank_pizza,
/obj/item/food/sliced/mac_pizza,
/obj/item/food/sliced/fire_cracker_pizza,
/obj/item/food/sliced/pesto_pizza,
/obj/item/food/sliced/pepperoni_pizza,
/obj/item/food/meat,
/obj/item/food/meat/slab,
/obj/item/food/grown,