Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Better slices #27807

Merged
merged 9 commits into from
Jan 25, 2025
Merged

[FIX] Better slices #27807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b56a34d
Slices have a base class /food/slice
Drsmail Jan 2, 2025
607e91d
Refactor
Drsmail Jan 3, 2025
18ae6d9
Small fix
Drsmail Jan 3, 2025
2082a4c
Adds default reagent for empy slices
Drsmail Jan 3, 2025
2dedaa1
Looks good
Drsmail Jan 3, 2025
9fb71c7
adds_list_reagents
Drsmail Jan 3, 2025
27a72bb
"Reverted snake_case_remap files to state from original commit
Drsmail Jan 9, 2025
0e5fc93
Merge branch 'master' into Better-slices
Drsmail Jan 11, 2025
7f3a39b
I don't know how to resolve merge conflicts :)
Drsmail Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,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,
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -6703,12 +6703,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
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -1069,7 +1069,7 @@
pixel_x = 8;
pixel_y = 8
},
/obj/item/food/birthdaycakeslice,
/obj/item/food/sliced/birthday_cake,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/generic/centcomm.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4226,7 +4226,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
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/stations/boxstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/stations/cerestation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32603,9 +32603,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,
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/stations/deltastation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86121,9 +86121,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,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/stations/emeraldstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/stations/metastation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/granters/action_granters/summon_cheese.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Drsmail marked this conversation as resolved.
Show resolved Hide resolved
summon_amt = 9
aoe_range = 1
summon_ignore_prev_spawn_points = TRUE
2 changes: 1 addition & 1 deletion code/game/objects/items/toys.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Drsmail marked this conversation as resolved.
Show resolved Hide resolved
food.name = "stale bread"
food.desc = "Looks like your captors care for their prisoners as much as their bread."
food.trash = null
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food_and_drinks/food/customizables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading