diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index c5eaa14e05b5..04a9b8beea57 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -327,3 +327,33 @@ Class Procs: /obj/structure/machinery/ui_state(mob/user) return GLOB.not_incapacitated_and_adjacent_state + +//made into "prop" from an old destilery project abandon 9 year ago. + +/obj/structure/machinery/mill + name = "\improper Mill" + desc = "It is a machine that grinds produce." + icon_state = "autolathe" + density = TRUE + anchored = TRUE + +/obj/structure/machinery/fermenter + name = "\improper Fermenter" + desc = "It is a machine that ferments produce into alcoholic drinks." + icon_state = "autolathe" + density = TRUE + anchored = TRUE + +/obj/structure/machinery/still + name = "\improper Still" + desc = "It is a machine that produces hard liquor from alcoholic drinks." + icon_state = "autolathe" + density = TRUE + anchored = TRUE + +/obj/structure/machinery/squeezer + name = "\improper Squeezer" + desc = "It is a machine that squeezes extracts from produce." + icon_state = "autolathe" + density = TRUE + anchored = TRUE diff --git a/code/modules/destilery/main.dm b/code/modules/destilery/main.dm deleted file mode 100644 index a7274b317003..000000000000 --- a/code/modules/destilery/main.dm +++ /dev/null @@ -1,298 +0,0 @@ -//This dm file includes some food processing machines: -// - I. Mill -// - II. Fermenter -// - III. Still -// - IV. Squeezer -// - V. Centrifuge - - - -// I. The mill is intended to be loaded with produce and returns ground up items. For example: Wheat should become flour and grapes should become raisins. - -/obj/structure/machinery/mill - var/list/obj/item/reagent_container/food/input = list() - var/list/obj/item/reagent_container/food/output = list() - var/obj/item/reagent_container/food/milled_item - var/busy = FALSE - var/progress = 0 - var/error = 0 - name = "\improper Mill" - desc = "It is a machine that grinds produce." - icon_state = "autolathe" - density = TRUE - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 10 - active_power_usage = 1000 - -/obj/structure/machinery/mill/Destroy() - QDEL_NULL(milled_item) - return ..() - -/obj/structure/machinery/mill/process() - if(error) - return - - if(!busy) - update_use_power(USE_POWER_IDLE) - if(input.len) - milled_item = input[1] - input -= milled_item - progress = 0 - busy = TRUE - update_use_power(USE_POWER_ACTIVE) - return - - progress++ - if(progress < 10) //Edit this value to make milling faster or slower - return //Not done yet. - - switch(milled_item.type) - if(/obj/item/reagent_container/food/snacks/grown/wheat) //Wheat becomes flour - var/obj/item/reagent_container/food/snacks/flour/F = new(src) - output += F - if(/obj/item/reagent_container/food/snacks/flour) //Flour is still flour - var/obj/item/reagent_container/food/snacks/flour/F = new(src) - output += F - else - error = 1 - - QDEL_NULL(milled_item) - busy = FALSE - -/obj/structure/machinery/mill/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/reagent_container/food)) - if(user.drop_inv_item_to_loc(W, src)) - input += W - else - ..() - -/obj/structure/machinery/mill/attack_hand(mob/user as mob) - for(var/obj/item/reagent_container/food/F in output) - F.forceMove(loc) - output -= F - - - - - - -// II. The fermenter is intended to be loaded with food items and returns medium-strength alcohol items, sucha s wine and beer. - -/obj/structure/machinery/fermenter - var/list/obj/item/reagent_container/food/input = list() - var/list/obj/item/reagent_container/food/output = list() - var/obj/item/reagent_container/food/fermenting_item - var/water_level = 0 - var/busy = FALSE - var/progress = 0 - var/error = 0 - name = "\improper Fermenter" - desc = "It is a machine that ferments produce into alcoholic drinks." - icon_state = "autolathe" - density = TRUE - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 10 - active_power_usage = 500 - -/obj/structure/machinery/fermenter/Destroy() - QDEL_NULL(fermenting_item) - return ..() - -/obj/structure/machinery/fermenter/process() - if(error) - return - - if(!busy) - update_use_power(USE_POWER_IDLE) - if(input.len) - fermenting_item = input[1] - input -= fermenting_item - progress = 0 - busy = TRUE - update_use_power(USE_POWER_ACTIVE) - return - - if(!water_level) - return - - water_level-- - - progress++ - if(progress < 10) //Edit this value to make milling faster or slower - return //Not done yet. - - switch(fermenting_item.type) - if(/obj/item/reagent_container/food/snacks/flour) //Flour is still flour - var/obj/item/reagent_container/food/drinks/cans/beer/B = new(src) - output += B - else - error = 1 - - QDEL_NULL(fermenting_item) - busy = FALSE - -/obj/structure/machinery/fermenter/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/reagent_container/food)) - if(user.drop_inv_item_to_loc(W, src)) - input += W - else - ..() - -/obj/structure/machinery/fermenter/attack_hand(mob/user as mob) - for(var/obj/item/reagent_container/food/F in output) - F.forceMove(loc) - output -= F - - - -// III. The still is a machine that is loaded with food items and returns hard liquor, such as vodka. - -/obj/structure/machinery/still - var/list/obj/item/reagent_container/food/input = list() - var/list/obj/item/reagent_container/food/output = list() - var/obj/item/reagent_container/food/destilling_item - var/busy = FALSE - var/progress = 0 - var/error = 0 - name = "\improper Still" - desc = "It is a machine that produces hard liquor from alcoholic drinks." - icon_state = "autolathe" - density = TRUE - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 10 - active_power_usage = 10000 - -/obj/structure/machinery/still/Destroy() - QDEL_NULL(destilling_item) - return ..() - -/obj/structure/machinery/still/process() - if(error) - return - - if(!busy) - update_use_power(USE_POWER_IDLE) - if(input.len) - destilling_item = input[1] - input -= destilling_item - progress = 0 - busy = TRUE - update_use_power(USE_POWER_ACTIVE) - return - - progress++ - if(progress < 10) //Edit this value to make distilling faster or slower - return //Not done yet. - - switch(destilling_item.type) - if(/obj/item/reagent_container/food/drinks/cans/beer) //Flour is still flour - var/obj/item/reagent_container/food/drinks/bottle/vodka/V = new(src) - output += V - else - error = 1 - - QDEL_NULL(destilling_item) - busy = FALSE - -/obj/structure/machinery/still/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/reagent_container/food)) - if(user.drop_inv_item_to_loc(W, loc)) - input += W - else - ..() - -/obj/structure/machinery/still/attack_hand(mob/user as mob) - for(var/obj/item/reagent_container/food/F in output) - F.forceMove(loc) - output -= F - - - - -// IV. The squeezer is intended to destroy inserted food items, but return some of the reagents they contain. - -/obj/structure/machinery/squeezer - var/list/obj/item/reagent_container/food/input = list() - var/obj/item/reagent_container/food/squeezed_item - var/water_level = 0 - var/busy = FALSE - var/progress = 0 - var/error = 0 - name = "\improper Squeezer" - desc = "It is a machine that squeezes extracts from produce." - icon_state = "autolathe" - density = TRUE - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 10 - active_power_usage = 500 - - - - - -// V. The centrifuge spins inserted food items. It is intended to squeeze out the reagents that are common food catalysts (enzymes currently) - -/obj/structure/machinery/centrifuge - var/list/obj/item/reagent_container/food/input = list() - var/list/obj/item/reagent_container/food/output = list() - var/obj/item/reagent_container/food/spinning_item - var/busy = FALSE - var/progress = 0 - var/error = 0 - var/enzymes = 0 - var/water = 0 - name = "\improper Centrifuge" - desc = "It is a machine that spins produce." - icon_state = "autolathe" - density = TRUE - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 10 - active_power_usage = 10000 - -/obj/structure/machinery/centrifuge/process() - if(error) - return - - if(!busy) - update_use_power(USE_POWER_IDLE) - if(input.len) - spinning_item = input[1] - input -= spinning_item - progress = 0 - busy = TRUE - update_use_power(USE_POWER_ACTIVE) - return - - progress++ - if(progress < 10) //Edit this value to make milling faster or slower - return //Not done yet. - - var/transfer_enzymes = spinning_item.reagents.get_reagent_amount("enzyme") - - if(transfer_enzymes) - enzymes += transfer_enzymes - spinning_item.reagents.remove_reagent("enzyme",transfer_enzymes) - - output += spinning_item - busy = FALSE - -/obj/structure/machinery/centrifuge/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/reagent_container/food)) - if(user.drop_inv_item_to_loc(W, src)) - input += W - else - ..() - -/obj/structure/machinery/centrifuge/attack_hand(mob/user as mob) - for(var/obj/item/reagent_container/food/F in output) - F.forceMove(loc) - output -= F - while(enzymes >= 50) - enzymes -= 50 - new/obj/item/reagent_container/food/condiment/enzyme(src.loc) - diff --git a/colonialmarines.dme b/colonialmarines.dme index ec330db86a4d..5489564d609e 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1691,7 +1691,6 @@ #include "code\modules\desert_dam\filtration\floodgates.dm" #include "code\modules\desert_dam\filtration\structures.dm" #include "code\modules\desert_dam\motion_sensor\sensortower.dm" -#include "code\modules\destilery\main.dm" #include "code\modules\discord\discord_embed.dm" #include "code\modules\droppod\container_droppod.dm" #include "code\modules\droppod\droppod_ui.dm"