Porting and adapting food sprites from other repos (plus a couple original resprites) (#85759)

This commit is contained in:
Ghom
2024-08-18 16:07:35 -04:00
committed by GitHub
parent f61ba8b818
commit e5761e0bfc
15 changed files with 4 additions and 25 deletions
@@ -300,7 +300,6 @@
/area/ruin/pizzeria)
"kr" = (
/obj/structure/table,
/obj/item/trash/waffles,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
@@ -491,9 +491,6 @@
/area/ruin/space/has_grav/garbagetruck/foodwaste)
"xf" = (
/obj/item/trash/tray,
/obj/item/trash/waffles,
/obj/item/trash/waffles,
/obj/item/trash/waffles,
/obj/item/food/grown/mushroom/plumphelmet,
/obj/structure/closet/crate/trashcart,
/mob/living/basic/mouse/rat,
+1 -6
View File
@@ -1909,11 +1909,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/awaymission/snowdin/post/messhall)
"ht" = (
/obj/structure/table,
/obj/item/trash/waffles,
/turf/open/floor/iron/cafeteria,
/area/awaymission/snowdin/post/messhall)
"hu" = (
/obj/structure/chair{
dir = 8
@@ -25007,7 +25002,7 @@ Kd
ex
fJ
gA
ht
hq
hW
iH
jz
@@ -5756,7 +5756,6 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/item/trash/waffles,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"bGm" = (
@@ -13715,7 +13715,6 @@
"eTu" = (
/obj/effect/turf_decal/tile/neutral,
/obj/structure/table,
/obj/item/trash/waffles,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"eTZ" = (
-2
View File
@@ -12,7 +12,6 @@
interaction_flags_click = ALLOW_SILICON_REACH
/// List of dishes the drive can hold
var/static/list/collectable_items = list(
/obj/item/trash/waffles,
/obj/item/broken_bottle,
/obj/item/kitchen/fork,
/obj/item/plate,
@@ -24,7 +23,6 @@
)
/// List of items the drive detects as trash
var/static/list/disposable_items = list(
/obj/item/trash/waffles,
/obj/item/broken_bottle,
/obj/item/plate_shard,
/obj/item/shard,
@@ -89,7 +89,6 @@
/obj/item/trash/cnds = 1,
/obj/item/trash/syndi_cakes = 1,
/obj/item/trash/shrimp_chips = 1,
/obj/item/trash/waffles = 1,
/obj/item/trash/tray = 1,
)
+2 -2
View File
@@ -353,7 +353,7 @@
/obj/item/food/meat/rawbacon
name = "raw piece of bacon"
desc = "A raw piece of bacon."
icon_state = "baconb"
icon_state = "bacon"
bite_consumption = 2
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 2,
@@ -369,7 +369,7 @@
/obj/item/food/meat/bacon
name = "piece of bacon"
desc = "A delicious piece of bacon."
icon_state = "baconcookedb"
icon_state = "baconcooked"
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 2,
/datum/reagent/consumable/nutriment/vitamin = 1,
-4
View File
@@ -67,7 +67,6 @@
name = "waffles"
desc = "Mmm, waffles."
icon_state = "waffles"
trash_type = /obj/item/trash/waffles
food_reagents = list(
/datum/reagent/consumable/nutriment = 8,
/datum/reagent/consumable/nutriment/vitamin = 2,
@@ -85,7 +84,6 @@
name = "\improper Soylent Green"
desc = "Not made of people. Honest." //Totally people.
icon_state = "soylent_green"
trash_type = /obj/item/trash/waffles
food_reagents = list(
/datum/reagent/consumable/nutriment = 10,
/datum/reagent/consumable/nutriment/vitamin = 2,
@@ -100,7 +98,6 @@
name = "\improper Soylent Virdians"
desc = "Not made of people. Honest." //Actually honest for once.
icon_state = "soylent_yellow"
trash_type = /obj/item/trash/waffles
food_reagents = list(
/datum/reagent/consumable/nutriment = 10,
/datum/reagent/consumable/nutriment/vitamin = 2,
@@ -115,7 +112,6 @@
name = "roffle waffles"
desc = "Waffles from Roffle. Co."
icon_state = "rofflewaffles"
trash_type = /obj/item/trash/waffles
bite_consumption = 4
food_reagents = list(
/datum/reagent/consumable/nutriment = 8,
-4
View File
@@ -85,10 +85,6 @@
desc = "In the Mothic Fleet every individual wrapper is carefully recycled and repurposed into fresh material. Over here they are more commonly dropped directly onto the floor."
icon_state = "moth_ration"
/obj/item/trash/waffles
name = "waffles tray"
icon_state = "waffles"
/obj/item/trash/pistachios
name = "pistachios pack"
icon_state = "pistachios_pack"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 39 KiB

@@ -0,0 +1 @@
/obj/item/trash/waffles : @DELETE