[MIRROR] Fixes a little inconsistency with the peanut butter banana sandwich and makes sandwiches subtypes of the generic sandwhich. [MDB IGNORE] (#21555)

* Fixes a little inconsistency with the peanut butter banana sandwich and makes sandwiches subtypes of the generic sandwhich. (#75750) ## About The Pull Request The peanut butter banana sandwich is presented ingame as grilled when it doesn't require a griddle to make. Also, I'm taking the opportunity to repath the sandwich types, since they all share the same weight class, food flags and icons file. ## Why It's Good For The Game This will fix #74585. ## Changelog 🆑 fix: The peanut butter banana sandwich is no longer presented as grilled when it doesn't require a griddle to make. /🆑 * Fixes a little inconsistency with the peanut butter banana sandwich and makes sandwiches subtypes of the generic sandwhich. * updatepaths --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
2026-07-21 04:57:57 +01:00 · 2023-06-07 16:27:10 +02:00
parent 6a16c301d5
commit dd82caf052
11 changed files with 2478 additions and 2498 deletions
@@ -801,7 +801,7 @@
 	pixel_x = -3;
 	pixel_y = 6
 	},
-/obj/item/food/grilled_cheese_sandwich{
+/obj/item/food/sandwich/cheese/grilled{
 	pixel_x = 10;
 	pixel_y = 5
 	},
@@ -5717,15 +5717,6 @@
 /mob/living/simple_animal/hostile/asteroid/lobstrosity,
 /turf/open/misc/asteroid/airless,
 /area/station/engineering/supermatter/room)
-"cwt" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/folder/red,
-/obj/machinery/door/window/brigdoor/left/directional/north{
-	req_access = list("security")
-	},
-/turf/open/floor/iron/textured_large,
-/area/station/security/checkpoint/customs)
 "cwC" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
@@ -7378,6 +7369,16 @@
 /obj/effect/turf_decal/tile/blue,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
+"dcO" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "outerbrig";
+	name = "Brig Cells"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/turf/open/floor/iron/textured_half,
+/area/station/security/brig)
 "ddd" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -7869,6 +7870,21 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/disposal/incinerator)
+"dmS" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/mining/glass{
+	name = "Cargo Office"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/stairs{
+	dir = 4
+	},
+/area/station/cargo/office)
 "dmT" = (
 /obj/machinery/camera/directional/north{
 	c_tag = "Xenobiology - Cell 2";
@@ -13485,12 +13501,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
-"frP" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/brigdoor/right/directional/north,
-/turf/open/floor/iron/textured_large,
-/area/station/security/checkpoint/customs)
 "fsf" = (
 /obj/structure/table/reinforced/titaniumglass,
 /obj/structure/railing{
@@ -19571,19 +19581,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/small,
 /area/station/hallway/primary/fore)
-"hsA" = (
-/obj/structure/disposalpipe/segment{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/white{
-	dir = 9
-	},
-/obj/machinery/door/airlock/medical/glass,
-/obj/effect/mapping_helpers/airlock/access/all/medical/coroner,
-/turf/open/floor/iron/small,
-/area/station/medical/morgue)
 "hsC" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -22005,6 +22002,17 @@
 /obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/science/lower)
+"ikD" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/window/spawner/directional/east,
+/obj/structure/window/spawner/directional/north,
+/mob/living/basic/chick/permanent{
+	name = "Morgan"
+	},
+/turf/open/floor/grass,
+/area/station/cargo/storage)
 "ikH" = (
 /obj/structure/table/bronze,
 /obj/machinery/computer/security/wooden_tv{
@@ -22460,6 +22468,15 @@
 	dir = 1
 	},
 /area/station/command/gateway)
+"isR" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/machinery/door/airlock/security{
+	name = "Courtroom"
+	},
+/obj/effect/mapping_helpers/airlock/access/any/security/court,
+/turf/open/floor/plating,
+/area/station/security/courtroom)
 "isV" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25248,6 +25265,12 @@
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating/rust,
 /area/station/maintenance/fore/lesser)
+"jrO" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/brigdoor/right/directional/north,
+/turf/open/floor/iron/textured_large,
+/area/station/security/checkpoint/customs)
 "jrT" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25974,6 +25997,19 @@
 	},
 /turf/open/floor/iron,
 /area/station/security)
+"jGh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "kitchenshutters";
+	name = "Kitchen Shutters"
+	},
+/obj/item/plate,
+/obj/item/food/sandwich/peanut_butter_jelly,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/kitchen)
 "jGA" = (
 /obj/structure/chair/sofa/bench/right{
 	dir = 4
@@ -26228,21 +26264,6 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron,
 /area/station/science/xenobiology)
-"jKu" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/mining/glass{
-	name = "Cargo Office"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/supply/general,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/stairs{
-	dir = 4
-	},
-/area/station/cargo/office)
 "jKJ" = (
 /obj/machinery/door/window/right/directional/north,
 /turf/open/floor/iron,
@@ -30034,6 +30055,14 @@
 /obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
+"lcc" = (
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/machinery/door/airlock/security{
+	name = "Courtroom"
+	},
+/obj/effect/mapping_helpers/airlock/access/any/security/court,
+/turf/open/floor/plating,
+/area/station/maintenance/central/lesser)
 "lce" = (
 /obj/machinery/atmospherics/pipe/smart/simple/general/visible{
 	dir = 9
@@ -31608,6 +31637,17 @@
 /obj/structure/falsewall,
 /turf/open/floor/plating,
 /area/station/maintenance/aft)
+"lCS" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/door/airlock/maintenance{
+	name = "Vacant Office Maintenance"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/coroner,
+/turf/open/floor/plating,
+/area/station/medical/morgue)
 "lCV" = (
 /obj/structure/urinal/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -34256,6 +34296,18 @@
 /obj/item/kirbyplants/fullysynthetic,
 /turf/open/floor/iron,
 /area/station/security/processing)
+"myK" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "outerbrig";
+	name = "Brig Cells"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/turf/open/floor/iron/textured_half,
+/area/station/security/brig)
 "myM" = (
 /obj/structure/window/spawner/directional/north,
 /obj/structure/window/spawner/directional/south,
@@ -36063,6 +36115,15 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
 /area/station/commons/dorms)
+"ngx" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/item/folder/red,
+/obj/machinery/door/window/brigdoor/left/directional/north{
+	req_access = list("security")
+	},
+/turf/open/floor/iron/textured_large,
+/area/station/security/checkpoint/customs)
 "ngL" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -37141,6 +37202,19 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/white,
 /area/station/commons/dorms)
+"nAX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+	name = "Courtroom"
+	},
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/effect/mapping_helpers/airlock/access/any/security/court,
+/turf/open/floor/iron/dark/textured_half{
+	dir = 1
+	},
+/area/station/security/courtroom)
 "nBo" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/disposalpipe/segment{
@@ -38677,19 +38751,6 @@
 	},
 /turf/open/floor/iron/smooth_large,
 /area/station/maintenance/department/medical/central)
-"ofv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 4;
-	id = "kitchenshutters";
-	name = "Kitchen Shutters"
-	},
-/obj/item/plate,
-/obj/item/food/peanut_butter_jelly_sandwich,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/kitchen)
 "ofG" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -39836,16 +39897,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/station/maintenance/hallway/abandoned_command)
-"oAY" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig Cells"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron/textured_half,
-/area/station/security/brig)
 "oBm" = (
 /obj/structure/chair/sofa/bench/left,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -42565,17 +42616,6 @@
 "pyt" = (
 /turf/open/floor/plating,
 /area/station/service/library/abandoned)
-"pyI" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/door/airlock/maintenance{
-	name = "Vacant Office Maintenance"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/medical/coroner,
-/turf/open/floor/plating,
-/area/station/medical/morgue)
 "pyS" = (
 /obj/structure/chair/sofa/left/maroon,
 /obj/effect/landmark/start/assistant,
@@ -45601,17 +45641,6 @@
 	},
 /turf/open/floor/iron/dark/small,
 /area/station/maintenance/aft)
-"quI" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 4;
-	id = "kitchenshutters";
-	name = "Kitchen Shutters"
-	},
-/obj/item/plate,
-/obj/item/food/peanut_butter_jelly_sandwich,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/kitchen)
 "quQ" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 4
@@ -50139,19 +50168,6 @@
 	dir = 1
 	},
 /area/station/hallway/secondary/exit/departure_lounge)
-"rRf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Courtroom"
-	},
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
-/obj/effect/mapping_helpers/airlock/access/any/security/court,
-/turf/open/floor/iron/dark/textured_half{
-	dir = 1
-	},
-/area/station/security/courtroom)
 "rRn" = (
 /obj/structure/lattice,
 /obj/structure/window/reinforced/spawner/directional/west,
@@ -50256,6 +50272,19 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/lawoffice)
+"rSt" = (
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/white{
+	dir = 9
+	},
+/obj/machinery/door/airlock/medical/glass,
+/obj/effect/mapping_helpers/airlock/access/all/medical/coroner,
+/turf/open/floor/iron/small,
+/area/station/medical/morgue)
 "rSw" = (
 /obj/machinery/vending/cigarette,
 /obj/effect/turf_decal/stripes/line{
@@ -51642,14 +51671,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/smooth,
 /area/station/hallway/secondary/command)
-"spg" = (
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
-/obj/machinery/door/airlock/security{
-	name = "Courtroom"
-	},
-/obj/effect/mapping_helpers/airlock/access/any/security/court,
-/turf/open/floor/plating,
-/area/station/maintenance/central/lesser)
 "spi" = (
 /obj/structure/chair{
 	pixel_y = -2
@@ -62054,17 +62075,6 @@
 /obj/effect/landmark/start/clown,
 /turf/open/floor/iron/smooth,
 /area/station/service/greenroom)
-"vGk" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/window/spawner/directional/east,
-/obj/structure/window/spawner/directional/north,
-/mob/living/basic/chick/permanent{
-	name = "Morgan"
-	},
-/turf/open/floor/grass,
-/area/station/cargo/storage)
 "vGp" = (
 /obj/structure/table/wood,
 /obj/machinery/light/small/red/dim/directional/south,
@@ -65210,6 +65220,17 @@
 "wCR" = (
 /turf/closed/wall,
 /area/station/cargo/boutique)
+"wCV" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "kitchenshutters";
+	name = "Kitchen Shutters"
+	},
+/obj/item/plate,
+/obj/item/food/sandwich/peanut_butter_jelly,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/kitchen)
 "wCX" = (
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -65686,15 +65707,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
-"wLm" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
-/obj/machinery/door/airlock/security{
-	name = "Courtroom"
-	},
-/obj/effect/mapping_helpers/airlock/access/any/security/court,
-/turf/open/floor/plating,
-/area/station/security/courtroom)
 "wLA" = (
 /obj/machinery/holopad,
 /turf/open/floor/wood,
@@ -70862,18 +70874,6 @@
 	dir = 8
 	},
 /area/station/hallway/secondary/entry)
-"ybJ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig Cells"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron/textured_half,
-/area/station/security/brig)
 "ybL" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -86183,7 +86183,7 @@ slY
 slY
 rST
 sgL
-vGk
+ikD
 kYZ
 msy
 vLP
@@ -90296,7 +90296,7 @@ iqq
 xPX
 wnd
 wnd
-jKu
+dmS
 jWZ
 xRV
 kuq
@@ -90592,7 +90592,7 @@ gvn
 toY
 eAX
 lbO
-ybJ
+myK
 fbe
 wTX
 wTX
@@ -90849,7 +90849,7 @@ eUg
 fBT
 nGe
 naG
-oAY
+dcO
 ykZ
 onX
 xDa
@@ -95972,9 +95972,9 @@ cNF
 jVM
 qpX
 qHm
-quI
+wCV
 rJl
-ofv
+jGh
 vUG
 xmt
 ffX
@@ -102655,7 +102655,7 @@ oeH
 wua
 jWy
 jWy
-rRf
+nAX
 jWy
 jWy
 jWy
@@ -103430,7 +103430,7 @@ rRW
 snK
 wat
 tae
-wLm
+isR
 xvh
 xsb
 xPN
@@ -104198,7 +104198,7 @@ wua
 wua
 wua
 qUt
-spg
+lcc
 wua
 wua
 wua
@@ -106031,14 +106031,14 @@ kHo
 ldq
 rkI
 qoj
-hsA
+rSt
 wRU
 kFY
 kFY
 uNe
 fVG
 eJe
-cwt
+ngx
 nwN
 ufn
 dMM
@@ -106295,7 +106295,7 @@ kFY
 hrC
 gHl
 elT
-frP
+jrO
 wEf
 uub
 uub
@@ -107317,7 +107317,7 @@ kdn
 lxa
 ldq
 ldq
-pyI
+lCS
 ldq
 ldq
 wDG
@@ -318,7 +318,7 @@
 /turf/open/floor/holofloor/beach/water,
 /area/shuttle/escape/luxury)
 "nC" = (
-/obj/item/food/grilled_cheese_sandwich{
+/obj/item/food/sandwich/cheese/grilled{
 	pixel_y = 11
 	},
 /obj/structure/table/wood/fancy/black,
@@ -961,7 +961,7 @@
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "Oe" = (
-/obj/item/food/notasandwich{
+/obj/item/food/sandwich/notasandwich{
 	pixel_y = 11
 	},
 /obj/structure/table/wood/fancy/black,
@@ -13,28 +13,9 @@
 	food_flags = FOOD_FINGER_FOOD
 	w_class = WEIGHT_CLASS_SMALL

-/obj/item/food/grilled_cheese_sandwich
-	name = "grilled cheese sandwich"
-	desc = "A warm, melty sandwich that goes perfectly with tomato soup."
-	icon = 'icons/obj/food/burgerbread.dmi'
-	icon_state = "toastedsandwich"
-	food_reagents = list(
-		/datum/reagent/consumable/nutriment = 6,
-		/datum/reagent/consumable/nutriment/protein = 5,
-		/datum/reagent/consumable/nutriment/vitamin = 1,
-		/datum/reagent/carbon = 4,
-	)
-	tastes = list("toast" = 2, "cheese" = 3, "butter" = 1)
-	foodtypes = GRAIN
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL
-	burns_on_grill = TRUE
-
-/obj/item/food/cheese_sandwich
+/obj/item/food/sandwich/cheese
 	name = "cheese sandwich"
 	desc = "A light snack for a warm day. ...but what if you grilled it?"
-	icon = 'icons/obj/food/burgerbread.dmi'
-	icon_state = "sandwich"
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 7,
 		/datum/reagent/consumable/nutriment/protein = 3,
@@ -42,36 +23,45 @@
 	)
 	tastes = list("bread" = 1, "cheese" = 1)
 	foodtypes = GRAIN | DAIRY
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL
 	venue_value = FOOD_PRICE_NORMAL

-/obj/item/food/cheese_sandwich/make_grillable()
-	AddComponent(/datum/component/grillable, /obj/item/food/grilled_cheese_sandwich, rand(30 SECONDS, 60 SECONDS), TRUE)
+/obj/item/food/sandwich/cheese/make_grillable()
+	if(burns_on_grill)
+		return ..()
+	AddComponent(/datum/component/grillable, /obj/item/food/sandwich/cheese/grilled, rand(30 SECONDS, 60 SECONDS), TRUE)

-/obj/item/food/jellysandwich
+/obj/item/food/sandwich/cheese/grilled
+	name = "grilled cheese sandwich"
+	desc = "A warm, melty sandwich that goes perfectly with tomato soup."
+	icon_state = "toastedsandwich"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 6,
+		/datum/reagent/consumable/nutriment/protein = 5,
+		/datum/reagent/consumable/nutriment/vitamin = 1,
+		/datum/reagent/carbon = 4,
+	)
+	foodtypes = GRAIN | DAIRY
+	burns_on_grill = TRUE
+
+/obj/item/food/sandwich/jelly
 	name = "jelly sandwich"
 	desc = "You wish you had some peanut butter to go with this..."
-	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "jellysandwich"
 	bite_consumption = 3
 	tastes = list("bread" = 1, "jelly" = 1)
 	foodtypes = GRAIN
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL

-/obj/item/food/jellysandwich/slime
+/obj/item/food/sandwich/jelly/slime
 	food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/slimejelly = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
 	foodtypes = GRAIN | TOXIC

-/obj/item/food/jellysandwich/cherry
+/obj/item/food/sandwich/jelly/cherry
 	food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/cherryjelly = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
 	foodtypes = GRAIN | FRUIT | SUGAR

-/obj/item/food/notasandwich
+/obj/item/food/sandwich/notasandwich
 	name = "not-a-sandwich"
 	desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
-	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "notasandwich"
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 6,
@@ -79,8 +69,6 @@
 	)
 	tastes = list("nothing suspicious" = 1)
 	foodtypes = GRAIN | GROSS
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL

 /obj/item/food/griddle_toast
 	name = "griddle toast"
@@ -180,10 +168,9 @@
 	w_class = WEIGHT_CLASS_SMALL
 	venue_value = FOOD_PRICE_NORMAL

-/obj/item/food/blt
+/obj/item/food/sandwich/blt
 	name = "\improper BLT"
 	desc = "A classic bacon, lettuce, and tomato sandwich."
-	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "blt"
 	bite_consumption = 4
 	food_reagents = list(
@@ -193,13 +180,10 @@
 	)
 	tastes = list("bacon" = 3, "lettuce" = 2, "tomato" = 2, "bread" = 2)
 	foodtypes = GRAIN | MEAT | VEGETABLES | BREAKFAST
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL

-/obj/item/food/peanut_butter_jelly_sandwich
+/obj/item/food/sandwich/peanut_butter_jelly
 	name = "peanut butter and jelly sandwich"
 	desc = "A classic PB&J sandwich, just like your mom used to make."
-	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "peanut_butter_jelly_sandwich"
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 2,
@@ -208,13 +192,10 @@
 	)
 	tastes = list("peanut butter" = 1, "jelly" = 1, "bread" = 2)
 	foodtypes = GRAIN | FRUIT | NUTS
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL

-/obj/item/food/peanut_butter_banana_sandwich
+/obj/item/food/sandwich/peanut_butter_banana
 	name = "peanut butter and banana sandwich"
-	desc = "A grilled peanut butter sandwich with banana slices mixed in, a good high protein treat."
-	icon = 'icons/obj/food/burgerbread.dmi'
+	desc = "A peanut butter sandwich with banana slices mixed in, a good high protein treat."
 	icon_state = "peanut_butter_banana_sandwich"
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 2,
@@ -224,13 +205,10 @@
 	)
 	tastes = list("peanut butter" = 1, "banana" = 1, "bread" = 2)
 	foodtypes = GRAIN | FRUIT | NUTS
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL

-/obj/item/food/philly_cheesesteak
+/obj/item/food/sandwich/philly_cheesesteak
 	name = "Philly cheesesteak"
 	desc = "A popular sandwich made of sliced meat, onions, melted cheese in a long hoagie roll. Mouthwatering doesn't even begin to describe it."
-	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "philly_cheesesteak"
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 10,
@@ -239,13 +217,10 @@
 	)
 	tastes = list("bread" = 1, "juicy meat" = 1, "melted cheese" = 1, "onions" = 1)
 	foodtypes = GRAIN | MEAT | DAIRY | VEGETABLES
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL

-/obj/item/food/toast_sandwich
+/obj/item/food/sandwich/toast_sandwich
 	name = "toast sandwich"
 	desc = "A piece of buttered toast between two slices of bread. Why would you make this?"
-	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "toast_sandwich"
 	bite_consumption = 3
 	food_reagents = list(
@@ -254,13 +229,10 @@
 	)
 	tastes = list("bread" = 2, "Britain" = 1, "butter" = 1, "toast" = 1)
 	foodtypes = GRAIN
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL

-/obj/item/food/death_sandwich
+/obj/item/food/sandwich/death
 	name = "death sandwich"
 	desc = "Eat it right, or you die!"
-	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "death_sandwich"
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 8,
@@ -269,21 +241,19 @@
 	)
 	tastes = list("bread" = 1, "meat" = 1, "tomato sauce" = 1, "death" = 1)
 	foodtypes = GRAIN | MEAT
-	food_flags = FOOD_FINGER_FOOD
-	w_class = WEIGHT_CLASS_SMALL
 	eat_time = 4 SECONDS // Makes it harder to force-feed this to people as a weapon, as funny as that is.

-/obj/item/food/death_sandwich/Initialize(mapload)
+/obj/item/food/sandwich/death/Initialize(mapload)
 	. = ..()
 	obj_flags &= ~UNIQUE_RENAME // You shouldn't be able to disguise this on account of how it kills you

 ///Override for checkliked callback
-/obj/item/food/death_sandwich/make_edible()
+/obj/item/food/sandwich/death/make_edible()
 	. = ..()
 	AddComponent(/datum/component/edible, check_liked = CALLBACK(src, PROC_REF(check_liked)))

 ///Eat it right, or you die.
-/obj/item/food/death_sandwich/proc/check_liked(fraction, mob/living/carbon/human/consumer)
+/obj/item/food/sandwich/death/proc/check_liked(fraction, mob/living/carbon/human/consumer)
 	/// Closest thing to a mullet we have
 	if(consumer.hairstyle == "Gelled Back" && istype(consumer.get_item_by_slot(ITEM_SLOT_ICLOTHING), /obj/item/clothing/under/rank/civilian/cookjorts))
 		return FOOD_LIKED
@@ -291,7 +261,7 @@
 	balloon_alert(consumer, "ate it wrong!")
 	consumer.ForceContractDisease(new/datum/disease/death_sandwich_poisoning())

-/obj/item/food/death_sandwich/suicide_act(mob/living/user)
+/obj/item/food/sandwich/death/suicide_act(mob/living/user)
 	user.visible_message(span_suicide("[user] starts to shove [src] down [user.p_their()] throat the wrong way. It looks like [user.p_theyre()] trying to commit suicide!"))
 	qdel(src)
 	user.gib(TRUE, TRUE, TRUE)
@@ -418,8 +418,8 @@
 	category = CAT_BREAD

 /datum/crafting_recipe/food/grill/grilled_cheese_sandwich
-	reqs = list(/obj/item/food/cheese_sandwich = 1)
-	result = /obj/item/food/grilled_cheese_sandwich
+	reqs = list(/obj/item/food/sandwich/cheese = 1)
+	result = /obj/item/food/sandwich/cheese/grilled
 	category = CAT_BREAD

 /datum/crafting_recipe/food/grill/moonfish
@@ -22,7 +22,7 @@
 		/obj/item/food/breadslice/plain = 2,
 		/obj/item/food/cheese/wedge = 2
 	)
-	result = /obj/item/food/cheese_sandwich
+	result = /obj/item/food/sandwich/cheese
 	category = CAT_SANDWICH

 /datum/crafting_recipe/food/slimesandwich
@@ -31,7 +31,7 @@
 		/datum/reagent/toxin/slimejelly = 5,
 		/obj/item/food/breadslice/plain = 2,
 	)
-	result = /obj/item/food/jellysandwich/slime
+	result = /obj/item/food/sandwich/jelly/slime
 	category = CAT_SANDWICH

 /datum/crafting_recipe/food/cherrysandwich
@@ -40,7 +40,7 @@
 		/datum/reagent/consumable/cherryjelly = 5,
 		/obj/item/food/breadslice/plain = 2,
 	)
-	result = /obj/item/food/jellysandwich/cherry
+	result = /obj/item/food/sandwich/jelly/cherry
 	category = CAT_SANDWICH

 /datum/crafting_recipe/food/notasandwich
@@ -49,7 +49,7 @@
 		/obj/item/food/breadslice/plain = 2,
 		/obj/item/clothing/mask/fakemoustache = 1
 	)
-	result = /obj/item/food/notasandwich
+	result = /obj/item/food/sandwich/notasandwich
 	category = CAT_SANDWICH

 /datum/crafting_recipe/food/hotdog
@@ -82,7 +82,7 @@
 		/obj/item/food/grown/cabbage = 1,
 		/obj/item/food/grown/tomato = 1
 	)
-	result = /obj/item/food/blt
+	result = /obj/item/food/sandwich/blt
 	category = CAT_SANDWICH

 /datum/crafting_recipe/food/peanut_butter_jelly_sandwich
@@ -92,7 +92,7 @@
 		/datum/reagent/consumable/peanut_butter = 5,
 		/datum/reagent/consumable/cherryjelly = 5
 	)
-	result = /obj/item/food/peanut_butter_jelly_sandwich
+	result = /obj/item/food/sandwich/peanut_butter_jelly
 	category = CAT_SANDWICH

 /datum/crafting_recipe/food/peanut_butter_banana_sandwich
@@ -102,7 +102,7 @@
 		/datum/reagent/consumable/peanut_butter = 5,
 		/obj/item/food/grown/banana = 1
 	)
-	result = /obj/item/food/peanut_butter_banana_sandwich
+	result = /obj/item/food/sandwich/peanut_butter_banana
 	category = CAT_SANDWICH

 /datum/crafting_recipe/food/philly_cheesesteak
@@ -113,7 +113,7 @@
 		/obj/item/food/cheese/wedge = 1,
 		/obj/item/food/grown/onion = 1,
 	)
-	result = /obj/item/food/philly_cheesesteak
+	result = /obj/item/food/sandwich/philly_cheesesteak
 	category = CAT_SANDWICH

 /datum/crafting_recipe/food/death_sandwich
@@ -125,7 +125,7 @@
 		/obj/item/food/meatball = 4,
 		/obj/item/food/grown/tomato = 1,
 	)
-	result = /obj/item/food/death_sandwich
+	result = /obj/item/food/sandwich/death
 	category = CAT_SANDWICH

 /datum/crafting_recipe/food/toast_sandwich
@@ -134,5 +134,5 @@
 		/obj/item/food/breadslice/plain = 2,
 		/obj/item/food/butteredtoast = 1,
 	)
-	result = /obj/item/food/toast_sandwich
+	result = /obj/item/food/sandwich/toast_sandwich
 	category = CAT_SANDWICH
@@ -393,7 +393,7 @@
 			/obj/item/food/benedict = 5,
 			/obj/item/food/fishandchips = 10,
 			/obj/item/food/full_english = 2,
-			/obj/item/food/grilled_cheese_sandwich = 5,
+			/obj/item/food/sandwich/cheese/grilled = 5,
 			/obj/item/food/pie/meatpie = 5,
 			/obj/item/food/salad/ricepudding = 5,
 		),
@@ -0,0 +1,10 @@
+/obj/item/food/cheese_sandwich : /obj/item/food/sandwich/cheese{@OLD}
+/obj/item/food/grilled_cheese_sandwich : /obj/item/food/sandwich/cheese/grilled{@OLD}
+/obj/item/food/jellysandwich/@SUBTYPES : /obj/item/food/sandwich/jelly/@SUBTYPES{@OLD}
+/obj/item/food/notasandwich : /obj/item/food/sandwich/notasandwich{@OLD}
+/obj/item/food/blt : /obj/item/food/sandwich/blt{@OLD}
+/obj/item/food/peanut_butter_jelly_sandwich : /obj/item/food/sandwich/peanut_butter_jelly{@OLD}
+/obj/item/food/peanut_butter_banana_sandwich : /obj/item/food/sandwich/peanut_banana_banana{@OLD}
+/obj/item/food/philly_cheesesteak : /obj/item/food/sandwich/philly_cheesesteak{@OLD}
+/obj/item/food/toast_sandwich : /obj/item/food/sandwich/toast_sandwich{@OLD}
+/obj/item/food/death_sandwich : /obj/item/food/sandwich/death{@OLD}