diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 93cd982c10..e52efc8b3a 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -450,7 +450,7 @@ usr.client.eye = target - +/* /obj/item/weapon/syntiflesh name = "syntiflesh" desc = "Meat that appears...strange..." @@ -459,7 +459,7 @@ flags = FPRINT | TABLEPASS | CONDUCT w_class = 2.0 origin_tech = "biotech=2" - +*/ /* /obj/item/weapon/cigarpacket name = "Pete's Cuban Cigars" diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 161dfc01ce..8e64854e1a 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -27,11 +27,11 @@ meat input = /obj/item/weapon/reagent_containers/food/snacks/meat output = /obj/item/weapon/reagent_containers/food/snacks/meatball - +/* The meat recipe handles all of these. meat2 - input = /obj/item/weapon/syntiflesh + input = /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh output = /obj/item/weapon/reagent_containers/food/snacks/meatball -/* + monkeymeat input = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey output = /obj/item/weapon/reagent_containers/food/snacks/meatball diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 0542d0b632..9518394916 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -13,7 +13,7 @@ I said no! /datum/recipe/syntitelebacon items = list( - /obj/item/weapon/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, /obj/item/device/assembly/signaler ) result = /obj/item/weapon/reagent_containers/food/snacks/telebacon @@ -128,7 +128,7 @@ I said no! /datum/recipe/syntiburger items = list( /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/syntiflesh + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh ) result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger @@ -252,9 +252,9 @@ I said no! /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/syntiflesh, - /obj/item/weapon/syntiflesh, - /obj/item/weapon/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, @@ -437,8 +437,8 @@ I said no! /datum/recipe/syntikabob items = list( /obj/item/stack/rods, - /obj/item/weapon/syntiflesh, - /obj/item/weapon/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, ) result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob @@ -533,7 +533,7 @@ I said no! /datum/recipe/syntisteak reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( - /obj/item/weapon/syntiflesh + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh ) result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak @@ -562,9 +562,9 @@ I said no! /datum/recipe/syntipizza items = list( /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, - /obj/item/weapon/syntiflesh, - /obj/item/weapon/syntiflesh, - /obj/item/weapon/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, ) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index 8a8c3c7771..fea5f3a21e 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -8082,7 +8082,7 @@ "cZv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/obj/machinery/camera{c_tag = "Main Computer Room"; dir = 2; network = list("Tcomsat")},/obj/structure/table,/obj/item/weapon/folder/yellow,/obj/item/weapon/folder/yellow,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/tcommsat/computer) "cZw" = (/obj/structure/table,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue{pixel_x = -3; pixel_y = 2},/turf/simulated/floor,/area/tcommsat/computer) "cZx" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor,/area/tcommsat/computer) -"cZy" = (/obj/item/weapon/syntiflesh{name = "Cuban Pete-Meat"},/turf/simulated/floor/engine,/area/tcommsat/computer) +"cZy" = (/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh{name = "Cuban Pete-Meat"},/turf/simulated/floor/engine,/area/tcommsat/computer) "cZz" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = -29; pixel_y = 0},/turf/simulated/floor,/area/tcommsat/computer) "cZA" = (/obj/structure/window/reinforced{dir = 4},/turf/space,/area/turret_protected/tcomsat) "cZB" = (/turf/simulated/shuttle/wall{dir = 1; icon_state = "swall_floor_f10"},/area/shuttle/escape/centcom) @@ -8105,7 +8105,7 @@ "cZS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor,/area/tcommsat/computer) "cZT" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor,/area/tcommsat/computer) "cZU" = (/obj/machinery/atmospherics/pipe/simple/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor,/area/tdome) -"cZV" = (/obj/item/weapon/syntiflesh{name = "Cuban Pete-Meat"},/obj/item/weapon/spacecash/c1,/turf/simulated/floor/engine,/area/tcommsat/computer) +"cZV" = (/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh{name = "Cuban Pete-Meat"},/obj/item/weapon/spacecash/c1,/turf/simulated/floor/engine,/area/tcommsat/computer) "cZW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor,/area/tcommsat/computer) "cZX" = (/obj/machinery/atmospherics/pipe/manifold/visible{tag = "icon-manifold (NORTH)"; icon_state = "manifold"; dir = 1},/turf/simulated/floor,/area/tdome) "cZY" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/tcommsat/computer)