From d79242e38e062182d68a39b0dd611c2face225b0 Mon Sep 17 00:00:00 2001 From: Sinestia <40812746+Sinestia@users.noreply.github.com> Date: Thu, 11 Aug 2022 18:33:07 -0500 Subject: [PATCH] Remove from map, remove from code and DME (#18764) --- .../RandomRuins/SpaceRuins/abandonedzoo.dmm | 2 +- .../kitchen_machinery/juicer.dm | 187 ------------------ paradise.dme | 1 - 3 files changed, 1 insertion(+), 189 deletions(-) delete mode 100644 code/modules/food_and_drinks/kitchen_machinery/juicer.dm diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm index 56c33357e7f..fa251604932 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -679,7 +679,7 @@ /area/ruin/space/unpowered) "bA" = ( /obj/structure/table/reinforced, -/obj/machinery/juicer, +/obj/machinery/reagentgrinder, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm deleted file mode 100644 index 3055e0b1802..00000000000 --- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm +++ /dev/null @@ -1,187 +0,0 @@ - -/obj/machinery/juicer - name = "Juicer" - icon = 'icons/obj/kitchen.dmi' - icon_state = "juicer1" - layer = 2.9 - density = TRUE - anchored = FALSE - use_power = IDLE_POWER_USE - idle_power_usage = 5 - active_power_usage = 100 - pass_flags = PASSTABLE - var/obj/item/reagent_containers/beaker = null - var/global/list/allowed_items = list ( - /obj/item/reagent_containers/food/snacks/grown/tomato = "tomatojuice", - /obj/item/reagent_containers/food/snacks/grown/carrot = "carrotjuice", - /obj/item/reagent_containers/food/snacks/grown/grapes = "grapejuice", - /obj/item/reagent_containers/food/snacks/grown/grapes/green = "grapejuice", - /obj/item/reagent_containers/food/snacks/grown/banana = "banana", - /obj/item/reagent_containers/food/snacks/grown/potato = "potato", - /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = "lemonjuice", - /obj/item/reagent_containers/food/snacks/grown/citrus/orange = "orangejuice", - /obj/item/reagent_containers/food/snacks/grown/citrus/lime = "limejuice", - /obj/item/reagent_containers/food/snacks/grown/watermelon = "watermelonjuice", - /obj/item/reagent_containers/food/snacks/watermelonslice = "watermelonjuice", - /obj/item/reagent_containers/food/snacks/grown/berries/poison = "poisonberryjuice", - /obj/item/reagent_containers/food/snacks/grown/berries = "berryjuice", - /obj/item/reagent_containers/food/snacks/grown/pumpkin = "pumpkinjuice", - /obj/item/reagent_containers/food/snacks/grown/blumpkin = "blumpkinjuice", - /obj/item/reagent_containers/food/snacks/grown/pineapple = "pineapplejuice" - ) - -/obj/machinery/juicer/Initialize(mapload) - . = ..() - beaker = new /obj/item/reagent_containers/glass/beaker/large(src) - -/obj/machinery/juicer/update_icon_state() - if(beaker) - icon_state = "juicer1" - else - icon_state = "juicer0" - -/obj/machinery/juicer/attackby(obj/item/O, mob/user, params) - if(istype(O,/obj/item/reagent_containers/glass) || \ - istype(O,/obj/item/reagent_containers/food/drinks/drinkingglass)) - if(beaker) - return TRUE - else - if(!user.unEquip(O)) - to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") - return - O.forceMove(src) - beaker = O - verbs += /obj/machinery/juicer/verb/detach - update_icon(UPDATE_ICON_STATE) - updateUsrDialog() - return - if(!is_type_in_list(O, allowed_items)) - to_chat(user, "It doesn't look like that contains any juice.") - return TRUE - if(!user.unEquip(O)) - to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") - return - O.forceMove(src) - updateUsrDialog() - return - -/obj/machinery/juicer/attack_ai(mob/user) - return - -/obj/machinery/juicer/attack_hand(mob/user) - user.set_machine(src) - interact(user) - -/obj/machinery/juicer/interact(mob/user) // The microwave Menu - var/is_chamber_empty = FALSE - var/is_beaker_ready = FALSE - var/processing_chamber = "" - var/beaker_contents = "" - - for(var/i in allowed_items) - for(var/obj/item/O in contents) - if(!istype(O,i)) - continue - processing_chamber+= "some [O]
" - break - if(!processing_chamber) - is_chamber_empty = TRUE - processing_chamber = "Nothing." - if(!beaker) - beaker_contents = "\The [src] has no beaker attached." - else if(!beaker.reagents.total_volume) - beaker_contents = "\The [src] has attached an empty beaker." - is_beaker_ready = TRUE - else if(beaker.reagents.total_volume < beaker.reagents.maximum_volume) - beaker_contents = "\The [src] has attached a beaker with something." - is_beaker_ready = TRUE - else - beaker_contents = "\The [src] has attached a beaker and beaker is full!" - - var/dat = {" -Processing chamber contains:
-[processing_chamber]
-[beaker_contents]
-"} - if(is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN))) - dat += "Turn on!
" - if(beaker) - dat += "Detach a beaker!
" - var/datum/browser/popup = new(user, "juicer", name, 400, 400) - popup.set_content(dat) - popup.open(0) - onclose(user, "juicer") - return - - -/obj/machinery/juicer/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - switch(href_list["action"]) - if("juice") - juice() - - if("detach") - detach() - updateUsrDialog() - return - -/obj/machinery/juicer/verb/detach() - set category = "Object" - set name = "Detach Beaker from the juicer" - set src in oview(1) - if(usr.stat != 0) - return - if(!beaker) - return - verbs -= /obj/machinery/juicer/verb/detach - beaker.forceMove(loc) - beaker = null - update_icon(UPDATE_ICON_STATE) - -/obj/machinery/juicer/proc/get_juice_id(obj/item/reagent_containers/food/snacks/grown/O) - for (var/i in allowed_items) - if (istype(O, i)) - return allowed_items[i] - -/obj/machinery/juicer/proc/get_juice_amount(obj/item/reagent_containers/food/snacks/grown/O) - if(!istype(O) || !O.seed) - return 5 - else if (O.seed.potency == -1) - return 5 - else - return round(5*sqrt(O.seed.potency)) - -/obj/machinery/juicer/proc/juice() - power_change() //it is a portable machine - if(stat & (NOPOWER|BROKEN)) - return - if(!beaker || beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - return - playsound(loc, 'sound/machines/juicer.ogg', 50, 1) - for(var/obj/item/reagent_containers/food/snacks/O in contents) - var/r_id = get_juice_id(O) - beaker.reagents.add_reagent(r_id,get_juice_amount(O)) - qdel(O) - if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break - -/obj/structure/closet/crate/juice/populate_contents() - new/obj/machinery/juicer(src) - new/obj/item/reagent_containers/food/snacks/grown/tomato(src) - new/obj/item/reagent_containers/food/snacks/grown/carrot(src) - new/obj/item/reagent_containers/food/snacks/grown/berries(src) - new/obj/item/reagent_containers/food/snacks/grown/banana(src) - new/obj/item/reagent_containers/food/snacks/grown/grapes(src) - new/obj/item/reagent_containers/food/snacks/grown/tomato(src) - new/obj/item/reagent_containers/food/snacks/grown/carrot(src) - new/obj/item/reagent_containers/food/snacks/grown/berries(src) - new/obj/item/reagent_containers/food/snacks/grown/banana(src) - new/obj/item/reagent_containers/food/snacks/grown/grapes(src) - new/obj/item/reagent_containers/food/snacks/grown/tomato(src) - new/obj/item/reagent_containers/food/snacks/grown/carrot(src) - new/obj/item/reagent_containers/food/snacks/grown/berries(src) - new/obj/item/reagent_containers/food/snacks/grown/banana(src) - new/obj/item/reagent_containers/food/snacks/grown/grapes(src) - new/obj/item/reagent_containers/food/snacks/grown/pineapple(src) diff --git a/paradise.dme b/paradise.dme index 1f00ec6da04..574f609329c 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1649,7 +1649,6 @@ #include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm" #include "code\modules\food_and_drinks\kitchen_machinery\grill_new.dm" #include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm" -#include "code\modules\food_and_drinks\kitchen_machinery\juicer.dm" #include "code\modules\food_and_drinks\kitchen_machinery\kitchen_machine.dm" #include "code\modules\food_and_drinks\kitchen_machinery\microwave.dm" #include "code\modules\food_and_drinks\kitchen_machinery\monkeyrecycler.dm"