diff --git a/code/datums/materials/meat.dm b/code/datums/materials/meat.dm index 9539b2847774..8512753a22af 100644 --- a/code/datums/materials/meat.dm +++ b/code/datums/materials/meat.dm @@ -5,7 +5,6 @@ desc = "Meat" color = rgb(214, 67, 67) categories = list(MAT_CATEGORY_RIGID = TRUE) - sheet_type = /obj/item/stack/sheet/meat value_per_unit = 0.05 beauty_modifier = -0.3 strength_modifier = 0.7 @@ -13,22 +12,3 @@ item_sound_override = 'sound/effects/meatslap.ogg' turf_sound_override = FOOTSTEP_MEAT texture_layer_icon_state = "meat" - -/datum/material/meat/on_removed(atom/source, amount, material_flags) - . = ..() - qdel(source.GetComponent(/datum/component/edible)) - -/datum/material/meat/on_applied_obj(obj/O, amount, material_flags) - . = ..() - O.obj_flags |= UNIQUE_RENAME //So you can name it after the person its made from, a depressing comprimise. - make_edible(O, amount, material_flags) - -/datum/material/meat/on_applied_turf(turf/T, amount, material_flags) - . = ..() - make_edible(T, amount, material_flags) - -/datum/material/meat/proc/make_edible(atom/source, amount, material_flags) - var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT) - var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT) - source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, RAW | MEAT | GROSS, null, 30, list("Fleshy")) - diff --git a/code/datums/materials/pizza.dm b/code/datums/materials/pizza.dm deleted file mode 100644 index 62479d90e0d3..000000000000 --- a/code/datums/materials/pizza.dm +++ /dev/null @@ -1,31 +0,0 @@ -/datum/material/pizza - name = "pizza" - id = "pizza" - desc = "~Jamme, jamme, n'coppa, jamme ja! Jamme, jamme, n'coppa jamme ja, funi-culi funi-cala funi-culi funi-cala!! Jamme jamme ja funiculi funicula!~" - color = "#FF9F23" - categories = list(MAT_CATEGORY_RIGID = TRUE) - sheet_type = /obj/item/stack/sheet/pizza - value_per_unit = 0.05 - beauty_modifier = 0.1 - strength_modifier = 0.7 - armor_modifiers = list("melee" = 0.3, "bullet" = 0.3, "laser" = 1.2, "energy" = 1.2, "bomb" = 0.3, "bio" = 0, "rad" = 0.7, "fire" = 1, "acid" = 1) - item_sound_override = 'sound/effects/meatslap.ogg' - turf_sound_override = FOOTSTEP_MEAT - texture_layer_icon_state = "pizza" - -/datum/material/pizza/on_removed(atom/source, amount, material_flags) - . = ..() - qdel(source.GetComponent(/datum/component/edible)) - -/datum/material/pizza/on_applied_obj(obj/O, amount, material_flags) - . = ..() - make_edible(O, amount, material_flags) - -/datum/material/pizza/on_applied_turf(turf/T, amount, material_flags) - . = ..() - make_edible(T, amount, material_flags) - -/datum/material/pizza/proc/make_edible(atom/source, amount, material_flags) - var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT) - var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT) - source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, GRAIN | MEAT | DAIRY | VEGETABLES, null, 30, list("crust", "tomato", "cheese", "meat"), filling_color = COLOR_YELLOW) diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm deleted file mode 100644 index ec9f0f5ff5a3..000000000000 --- a/code/game/machinery/sheetifier.dm +++ /dev/null @@ -1,55 +0,0 @@ -/obj/machinery/sheetifier - name = "Sheet-meister 2000" - desc = "A very sheety machine" - icon = 'icons/obj/machines/sheetifier.dmi' - icon_state = "base_machine" - density = TRUE - use_power = IDLE_POWER_USE - idle_power_usage = IDLE_DRAW_MINIMAL - active_power_usage = ACTIVE_DRAW_LOW - circuit = /obj/item/circuitboard/machine/sheetifier - layer = BELOW_OBJ_LAYER - var/busy_processing = FALSE - -/obj/machinery/sheetifier/Initialize() - . = ..() - AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/reagent_containers/food/snacks/meat/slab, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, PROC_REF(AfterInsertMaterials))) - -/obj/machinery/sheetifier/update_overlays() - . = ..() - if(machine_stat & (BROKEN|NOPOWER)) - return - var/mutable_appearance/on_overlay = mutable_appearance(icon, "buttons_on") - . += on_overlay - -/obj/machinery/sheetifier/update_icon_state() - icon_state = "base_machine[busy_processing ? "_processing" : ""]" - return ..() - -/obj/machinery/sheetifier/proc/CanInsertMaterials() - return !busy_processing - -/obj/machinery/sheetifier/proc/AfterInsertMaterials(item_inserted, id_inserted, amount_inserted) - busy_processing = TRUE - update_appearance() - var/datum/material/last_inserted_material = id_inserted - var/mutable_appearance/processing_overlay = mutable_appearance(icon, "processing") - processing_overlay.color = last_inserted_material.color - flick_overlay_static(processing_overlay, src, 64) - addtimer(CALLBACK(src, PROC_REF(finish_processing)), 64) - -/obj/machinery/sheetifier/proc/finish_processing() - busy_processing = FALSE - update_appearance() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.retrieve_all() //Returns all as sheets - -/obj/machinery/sheetifier/attackby(obj/item/I, mob/user, params) - if(default_unfasten_wrench(user, I)) - return - if(default_deconstruction_screwdriver(user, I)) - update_appearance() - return - if(default_deconstruction_crowbar(I)) - return - return ..() diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index a74ed8c81b27..1d6a0d61c180 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -1392,16 +1392,6 @@ /obj/item/stock_parts/scanning_module = 2, /obj/item/stock_parts/micro_laser = 2) -//Misc -/obj/item/circuitboard/machine/sheetifier - name = "Sheet-meister 2000 (Machine Board)" - icon_state = "supply" - build_path = /obj/machinery/sheetifier - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stock_parts/matter_bin = 2) - needs_anchored = FALSE - /obj/item/circuitboard/machine/abductor name = "alien board (Report This)" icon_state = "abductor_mod" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 8f5b95ec89a7..4443218e4385 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -605,41 +605,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra /obj/item/stack/sheet/paperframes/fifty amount = 50 -/obj/item/stack/sheet/meat - name = "meat sheets" - desc = "Something's bloody meat compressed into a nice solid sheet." - singular_name = "meat sheet" - icon_state = "sheet-meat" - material_flags = MATERIAL_COLOR - custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT) - merge_type = /obj/item/stack/sheet/meat - material_type = /datum/material/meat - material_modifier = 1 //None of that wussy stuff - -/obj/item/stack/sheet/meat/fifty - amount = 50 -/obj/item/stack/sheet/meat/twenty - amount = 20 -/obj/item/stack/sheet/meat/five - amount = 5 - -/obj/item/stack/sheet/pizza - name = "pepperoni sheetzzas" - desc = "It's a delicious pepperoni sheetzza!" - singular_name = "pepperoni sheetzza" - icon_state = "sheet-meat" //This needs a pizza sheet but we also i dont think anyone will ever make this. - custom_materials = list(/datum/material/pizza = MINERAL_MATERIAL_AMOUNT) - merge_type = /obj/item/stack/sheet/pizza - material_type = /datum/material/pizza - material_modifier = 1 - -/obj/item/stack/sheet/pizza/fifty - amount = 50 -/obj/item/stack/sheet/pizza/twenty - amount = 20 -/obj/item/stack/sheet/pizza/five - amount = 5 - /obj/item/stack/sheet/sandblock name = "blocks of sand" desc = "You're too old to be playing with sandcastles. Now you build... sandstations." diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index 9b8e949b06e6..5129911cd311 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -215,14 +215,3 @@ icon_state = "pizzamargheritaslice" filling_color = "#FFFFFF" foodtype = GRAIN | VEGETABLES - -/obj/item/reagent_containers/food/snacks/pizzaslice/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/kitchen/rollingpin)) - if(!isturf(loc)) - to_chat(user, "You need to put [src] on a surface to roll it out!") - return - new /obj/item/stack/sheet/pizza(loc) - to_chat(user, "You smoosh [src] into a cheesy sheet.") - qdel(src) - return - return ..() diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 5f79bbbf12e5..fdfe0f7f7341 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -604,13 +604,6 @@ category = list ("Medical Machinery") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL -/datum/design/board/sheetifier - name = "Sheetifier" - desc = "This machine turns weird things into sheets." - id = "sheetifier" - build_path = /obj/item/circuitboard/machine/sheetifier - category = list ("Misc. Machinery") - /datum/design/board/shieldwallgen name = "Machine Design (Shield Wall Generator)" desc = "A shield generator commonly used in xenobiology research." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index ab2cfd3a4681..81f6938dd8c2 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -193,7 +193,7 @@ display_name = "Advanced Engineering" description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") - design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "rcd_loaded", "rpd_loaded", "sheetifier") + design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "rcd_loaded", "rpd_loaded") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 diff --git a/shiptest.dme b/shiptest.dme index 850167e0ec50..0bc938d7e2a0 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -737,7 +737,6 @@ #include "code\datums\materials\_material.dm" #include "code\datums\materials\basemats.dm" #include "code\datums\materials\meat.dm" -#include "code\datums\materials\pizza.dm" #include "code\datums\mood_events\_mood_event.dm" #include "code\datums\mood_events\beauty_events.dm" #include "code\datums\mood_events\drink_events.dm" @@ -937,7 +936,6 @@ #include "code\game\machinery\requests_console.dm" #include "code\game\machinery\roulette_machine.dm" #include "code\game\machinery\scan_gate.dm" -#include "code\game\machinery\sheetifier.dm" #include "code\game\machinery\shieldgen.dm" #include "code\game\machinery\sleeper.dm" #include "code\game\machinery\slotmachine.dm"