[FIX] Better slices (#27807)

* 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 <[email protected]>
ParadiseSS13 · Jan 25, 2025 · 754a868 · 754a868
1 parent 99d18c8
commit 754a868
Show file tree

Hide file tree

Showing 40 changed files with 431 additions and 356 deletions.
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -33,7 +33,7 @@
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "j" = (
-/obj/item/food/mushroompizzaslice,
+/obj/item/food/sliced/mushroom_pizza,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/powered/pizza_party)
@@ -144,13 +144,13 @@
 /area/ruin/powered/pizza_party)
 "D" = (
 /obj/structure/table/wood,
-/obj/item/food/margheritapizzaslice,
+/obj/item/food/sliced/margherita_pizza,
 /obj/item/trash/plate,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "E" = (
 /obj/structure/table/wood,
-/obj/item/food/meatpizzaslice,
+/obj/item/food/sliced/meat_pizza,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "F" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
@@ -593,7 +593,7 @@
 /turf/simulated/wall/r_wall,
 /area/space/nearstation)
 "Nw" = (
-/obj/item/food/xenomeatbreadslice{
+/obj/item/food/sliced/xeno_meat_bread{
 	name = "green mold bread slice"
 	},
 /turf/simulated/floor/plating/airless,

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
@@ -2001,7 +2001,7 @@
 	},
 /area/ruin/space/moonbase19)
 "gy" = (
-/obj/item/food/xenomeatbreadslice{
+/obj/item/food/sliced/xeno_meat_bread{
 	pixel_y = 5
 	},
 /obj/item/reagent_containers/drinks/coffee{
@@ -6702,12 +6702,12 @@
 	},
 /area/ruin/space/moonbase19)
 "yR" = (
-/obj/item/food/xenomeatbreadslice,
-/obj/item/food/xenomeatbreadslice{
+/obj/item/food/sliced/xeno_meat_bread,
+/obj/item/food/sliced/xeno_meat_bread{
 	pixel_y = 7;
 	pixel_x = 6
 	},
-/obj/item/food/xenomeatbreadslice{
+/obj/item/food/sliced/xeno_meat_bread{
 	pixel_y = 9;
 	pixel_x = -5
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
@@ -371,11 +371,11 @@
 /area/ruin/space/syndicakefactory)
 "qd" = (
 /obj/structure/table/glass/reinforced/plastitanium,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice{
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread{
 	pixel_y = 4
 	},
-/obj/item/food/breadslice{
+/obj/item/food/sliced/bread{
 	pixel_y = 8
 	},
 /obj/machinery/light/small{
@@ -1076,7 +1076,7 @@
 	pixel_x = 8;
 	pixel_y = 8
 	},
-/obj/item/food/birthdaycakeslice,
+/obj/item/food/sliced/birthday_cake,
 /turf/simulated/floor/plasteel{
 	icon_state = "floorgrime"
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
@@ -224,8 +224,8 @@
 /area/ruin/space/wreck_cargoship)
 "jm" = (
 /obj/item/toy/plushie/ipcplushie,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice,
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread,
 /obj/item/paper/crumpled{
 	name = "unintelligible scribbles";
 	info = "toast... i must... the plushie..."

diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
@@ -4248,7 +4248,7 @@
 /area/centcom/suppy)
 "nY" = (
 /obj/structure/table/wood,
-/obj/item/food/mushroompizzaslice{
+/obj/item/food/sliced/mushroom_pizza{
 	pixel_x = -5;
 	pixel_y = 5
 	},

diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
@@ -79699,9 +79699,9 @@
 /area/station/science/test_chamber)
 "tWD" = (
 /obj/structure/closet/crate,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice,
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread,
 /obj/item/food/grown/potato,
 /obj/item/food/grown/potato,
 /obj/item/food/grown/onion,

diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
@@ -32622,9 +32622,9 @@
 /area/station/security/permabrig)
 "flp" = (
 /obj/structure/closet/crate,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice,
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread,
 /obj/item/food/grown/potato,
 /obj/item/food/grown/potato,
 /obj/item/food/grown/onion,

diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
@@ -86137,9 +86137,9 @@
 /area/station/hallway/secondary/entry/south)
 "urY" = (
 /obj/structure/closet/crate,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice,
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread,
 /obj/item/food/grown/potato,
 /obj/item/food/grown/potato,
 /obj/item/food/grown/onion,

diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
@@ -38788,7 +38788,7 @@
 /obj/item/food/grown/pumpkin{
 	pixel_y = 14
 	},
-/obj/item/food/pumpkinpieslice,
+/obj/item/food/sliced/pumpkinpie,
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
 "hGX" = (

diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
@@ -58468,7 +58468,7 @@
 	pixel_x = -4;
 	pixel_y = 8
 	},
-/obj/item/food/carrotcakeslice{
+/obj/item/food/sliced/carrot_cake{
 	pixel_x = 8;
 	pixel_y = -2
 	},
@@ -69866,9 +69866,9 @@
 "qvp" = (
 /obj/structure/closet/crate,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice,
-/obj/item/food/breadslice,
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread,
+/obj/item/food/sliced/bread,
 /obj/item/food/grown/potato,
 /obj/item/food/grown/potato,
 /obj/item/food/grown/onion,

diff --git a/code/game/objects/items/granters/action_granters/summon_cheese.dm b/code/game/objects/items/granters/action_granters/summon_cheese.dm
@@ -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/cheesewedge/presliced/book_cheese = new
+	var/obj/item/food/sliced/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/cheesewedge/presliced)
+	summon_type = list(/obj/item/food/sliced/cheesewedge/presliced)
 	summon_amt = 9
 	aoe_range = 1
 	summon_ignore_prev_spawn_points = TRUE
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
@@ -830,7 +830,7 @@
 /obj/item/toy/plushie/ipcplushie/attack_by(obj/item/attacking, mob/user, params)
 	if(..())
 		return FINISH_ATTACK
-	if(istype(attacking, /obj/item/food/breadslice))
+	if(istype(attacking, /obj/item/food/sliced/bread))
 		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)

diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
@@ -423,7 +423,7 @@
 	M.update_icons()
 
 	// Supply them with some chow. How generous is the Syndicate?
-	var/obj/item/food/breadslice/food = new(get_turf(M))
+	var/obj/item/food/sliced/bread/food = new(get_turf(M)) // TODO 545
 	food.name = "stale bread"
 	food.desc = "Looks like your captors care for their prisoners as much as their bread."
 	food.trash = null

diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
@@ -6,7 +6,7 @@ do {\
 	qdel(src);\
 } while(FALSE)
 
-/obj/item/food/breadslice/attackby__legacy__attackchain(obj/item/W, mob/user, params)
+/obj/item/food/sliced/bread/attackby__legacy__attackchain(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/food) && !(W.flags & NODROP))
 		MAKE_CUSTOM_FOOD(W, user, /obj/item/food/customizable/sandwich)
 		return