From 2fd5be7b4cf50e566a61d2238b989f11ba3c530f Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 11 Jan 2024 13:16:23 +0100 Subject: [PATCH 1/5] Phase one turning every machine into prop delete distillery centrifuge as it was a double machine. made comment on what to do in case i don't. --- code/modules/destilery/main.dm | 273 +-------------------------------- 1 file changed, 3 insertions(+), 270 deletions(-) diff --git a/code/modules/destilery/main.dm b/code/modules/destilery/main.dm index a7274b317003..4a621a2bf371 100644 --- a/code/modules/destilery/main.dm +++ b/code/modules/destilery/main.dm @@ -1,298 +1,31 @@ -//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. +// Current phase : Turning all those outdated machines into "props".(incase i can't manage phase two.) +// Second phase : Remap and remove those from maps.(will be done independantly) +// Last phase : is to delete this file and is dme presence. /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) - From 24c428e48286f6dbfdd6467f29a067d246bd98e9 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 12 Jan 2024 11:44:31 +0100 Subject: [PATCH 2/5] turned into proper prop and putted into the props.dm file --- code/game/objects/structures/props.dm | 30 +++++++++++++++++ code/modules/destilery/main.dm | 32 +------------------ maps/map_files/BigRed/BigRed.dmm | 10 +++--- maps/map_files/DesertDam/Desert_Dam.dmm | 8 ++--- .../standalone/crashlanding-upp-bar.dmm | 2 +- .../LV522_Chances_Claim.dmm | 10 +++--- maps/map_files/LV624/LV624.dmm | 4 +-- 7 files changed, 48 insertions(+), 48 deletions(-) diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index e14eee13b1dd..8b1b190e9390 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -1372,3 +1372,33 @@ if(initial(emote.sound)) playsound(loc, initial(emote.sound), 50, FALSE) return TRUE + +//made into prop from an old destilery project abandon 9 year ago. + +/obj/structure/prop/mill + name = "\improper Mill" + desc = "It is a machine that grinds produce." + icon_state = "autolathe" + density = TRUE + anchored = TRUE + +/obj/structure/prop/fermenter + name = "\improper Fermenter" + desc = "It is a machine that ferments produce into alcoholic drinks." + icon_state = "autolathe" + density = TRUE + anchored = TRUE + +/obj/structure/prop/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/prop/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 index 4a621a2bf371..17dd21f786d2 100644 --- a/code/modules/destilery/main.dm +++ b/code/modules/destilery/main.dm @@ -1,31 +1 @@ -// Current phase : Turning all those outdated machines into "props".(incase i can't manage phase two.) -// Second phase : Remap and remove those from maps.(will be done independantly) -// Last phase : is to delete this file and is dme presence. - -/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 +//file to delete. don't forget dme file diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 48f7f9089399..ab3ad1af07d0 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -3723,7 +3723,7 @@ }, /area/bigredv2/caves/lambda/xenobiology) "akI" = ( -/obj/structure/machinery/mill, +/obj/structure/prop/mill, /turf/open/floor{ dir = 1; icon_state = "whitegreen" @@ -10069,7 +10069,7 @@ /turf/open/floor, /area/bigredv2/outside/hydroponics) "aCn" = ( -/obj/structure/machinery/fermenter, +/obj/structure/prop/fermenter, /turf/open/floor, /area/bigredv2/outside/hydroponics) "aCo" = ( @@ -11749,7 +11749,7 @@ }, /area/bigredv2/outside/bar) "aGJ" = ( -/obj/structure/machinery/squeezer, +/obj/structure/prop/squeezer, /turf/open/floor{ icon_state = "wood" }, @@ -22470,7 +22470,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/engineering) "bmp" = ( -/obj/structure/machinery/mill, +/obj/structure/prop/mill, /turf/open/floor{ dir = 1; icon_state = "darkyellow2" @@ -38436,7 +38436,7 @@ /turf/open/floor/plating, /area/bigredv2/caves/mining) "uFp" = ( -/obj/structure/machinery/mill, +/obj/structure/prop/mill, /turf/open/floor, /area/bigred/ground/garage_workshop) "uFD" = ( diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index bf1d64fbc499..00d3def81af4 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -12676,7 +12676,7 @@ /turf/open/floor/plating, /area/desert_dam/exterior/valley/valley_crashsite) "aMk" = ( -/obj/structure/machinery/mill, +/obj/structure/prop/mill, /turf/open/floor/plating, /area/desert_dam/exterior/valley/valley_crashsite) "aMl" = ( @@ -29519,7 +29519,7 @@ }, /area/desert_dam/interior/dam_interior/workshop) "bPQ" = ( -/obj/structure/machinery/mill, +/obj/structure/prop/mill, /turf/open/floor/prison{ icon_state = "sterile_white" }, @@ -30711,7 +30711,7 @@ }, /area/desert_dam/building/security/prison) "bTs" = ( -/obj/structure/machinery/squeezer, +/obj/structure/prop/squeezer, /turf/open/floor/interior/wood, /area/desert_dam/building/bar/backroom) "bTt" = ( @@ -49264,7 +49264,7 @@ /turf/open/floor/prison, /area/desert_dam/building/hydroponics/hydroponics) "ddR" = ( -/obj/structure/machinery/fermenter, +/obj/structure/prop/fermenter, /turf/open/floor/prison, /area/desert_dam/building/hydroponics/hydroponics) "ddS" = ( diff --git a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm index 7928c7f06b71..5a3312e4b11c 100644 --- a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm +++ b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm @@ -398,7 +398,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) "hk" = ( -/obj/structure/machinery/squeezer, +/obj/structure/prop/squeezer, /turf/open/floor/plating, /area/desert_dam/building/bar/backroom) "hm" = ( diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index f4b3d26d3e93..7df560775312 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -3992,7 +3992,7 @@ }, /area/lv522/oob/w_y_vault) "cbp" = ( -/obj/structure/machinery/squeezer, +/obj/structure/prop/squeezer, /turf/open/floor{ icon_state = "wood" }, @@ -13326,7 +13326,7 @@ }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "fRc" = ( -/obj/structure/machinery/mill, +/obj/structure/prop/mill, /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, @@ -39738,7 +39738,7 @@ }, /area/lv522/indoors/a_block/admin) "pDe" = ( -/obj/structure/machinery/squeezer, +/obj/structure/prop/squeezer, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -48184,7 +48184,7 @@ /obj/structure/platform{ dir = 1 }, -/obj/structure/machinery/squeezer, +/obj/structure/prop/squeezer, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) "sBH" = ( @@ -50462,7 +50462,7 @@ /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 }, -/obj/structure/machinery/mill, +/obj/structure/prop/mill, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "trZ" = ( diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index becac81a1897..6648b71c4398 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -7626,14 +7626,14 @@ }, /area/lv624/lazarus/quart) "aHm" = ( -/obj/structure/machinery/fermenter, +/obj/structure/prop/fermenter, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, /area/lv624/lazarus/quart) "aHn" = ( -/obj/structure/machinery/still, +/obj/structure/prop/still, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" From 8a27923e737f5fe074ea6a4da982c19e7a81ea04 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 12 Jan 2024 11:48:41 +0100 Subject: [PATCH 3/5] deleted main.dm and it's the folder he was in called destilery. remove it from dme file --- code/modules/destilery/main.dm | 1 - colonialmarines.dme | 1 - 2 files changed, 2 deletions(-) delete mode 100644 code/modules/destilery/main.dm diff --git a/code/modules/destilery/main.dm b/code/modules/destilery/main.dm deleted file mode 100644 index 17dd21f786d2..000000000000 --- a/code/modules/destilery/main.dm +++ /dev/null @@ -1 +0,0 @@ -//file to delete. don't forget dme file 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" From 3f61ecdd56a1a3e97eaa0297f42478f0c6c4eeb5 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 12 Jan 2024 13:38:03 +0100 Subject: [PATCH 4/5] move from props.dm to machinery.dm because it's still interesting to make them power up etc... --- code/game/machinery/machinery.dm | 30 +++++++++++++++++++++++++++ code/game/objects/structures/props.dm | 30 --------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index c5eaa14e05b5..6a0a5b851ab4 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/prop/mill + name = "\improper Mill" + desc = "It is a machine that grinds produce." + icon_state = "autolathe" + density = TRUE + anchored = TRUE + +/obj/structure/prop/fermenter + name = "\improper Fermenter" + desc = "It is a machine that ferments produce into alcoholic drinks." + icon_state = "autolathe" + density = TRUE + anchored = TRUE + +/obj/structure/prop/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/prop/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/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index 8b1b190e9390..e14eee13b1dd 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -1372,33 +1372,3 @@ if(initial(emote.sound)) playsound(loc, initial(emote.sound), 50, FALSE) return TRUE - -//made into prop from an old destilery project abandon 9 year ago. - -/obj/structure/prop/mill - name = "\improper Mill" - desc = "It is a machine that grinds produce." - icon_state = "autolathe" - density = TRUE - anchored = TRUE - -/obj/structure/prop/fermenter - name = "\improper Fermenter" - desc = "It is a machine that ferments produce into alcoholic drinks." - icon_state = "autolathe" - density = TRUE - anchored = TRUE - -/obj/structure/prop/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/prop/squeezer - name = "\improper Squeezer" - desc = "It is a machine that squeezes extracts from produce." - icon_state = "autolathe" - density = TRUE - anchored = TRUE From 7033bd2012ea6aa394826fd8d6e7abfec7b80583 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 12 Jan 2024 18:54:34 +0100 Subject: [PATCH 5/5] change the path because i still want them to operate a bit like machinery not rocks... --- code/game/machinery/machinery.dm | 10 +++++----- maps/map_files/BigRed/BigRed.dmm | 10 +++++----- maps/map_files/DesertDam/Desert_Dam.dmm | 8 ++++---- .../DesertDam/standalone/crashlanding-upp-bar.dmm | 2 +- .../LV522_Chances_Claim/LV522_Chances_Claim.dmm | 10 +++++----- maps/map_files/LV624/LV624.dmm | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 6a0a5b851ab4..04a9b8beea57 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -328,30 +328,30 @@ 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. +//made into "prop" from an old destilery project abandon 9 year ago. -/obj/structure/prop/mill +/obj/structure/machinery/mill name = "\improper Mill" desc = "It is a machine that grinds produce." icon_state = "autolathe" density = TRUE anchored = TRUE -/obj/structure/prop/fermenter +/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/prop/still +/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/prop/squeezer +/obj/structure/machinery/squeezer name = "\improper Squeezer" desc = "It is a machine that squeezes extracts from produce." icon_state = "autolathe" diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index ab3ad1af07d0..48f7f9089399 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -3723,7 +3723,7 @@ }, /area/bigredv2/caves/lambda/xenobiology) "akI" = ( -/obj/structure/prop/mill, +/obj/structure/machinery/mill, /turf/open/floor{ dir = 1; icon_state = "whitegreen" @@ -10069,7 +10069,7 @@ /turf/open/floor, /area/bigredv2/outside/hydroponics) "aCn" = ( -/obj/structure/prop/fermenter, +/obj/structure/machinery/fermenter, /turf/open/floor, /area/bigredv2/outside/hydroponics) "aCo" = ( @@ -11749,7 +11749,7 @@ }, /area/bigredv2/outside/bar) "aGJ" = ( -/obj/structure/prop/squeezer, +/obj/structure/machinery/squeezer, /turf/open/floor{ icon_state = "wood" }, @@ -22470,7 +22470,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/engineering) "bmp" = ( -/obj/structure/prop/mill, +/obj/structure/machinery/mill, /turf/open/floor{ dir = 1; icon_state = "darkyellow2" @@ -38436,7 +38436,7 @@ /turf/open/floor/plating, /area/bigredv2/caves/mining) "uFp" = ( -/obj/structure/prop/mill, +/obj/structure/machinery/mill, /turf/open/floor, /area/bigred/ground/garage_workshop) "uFD" = ( diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 00d3def81af4..bf1d64fbc499 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -12676,7 +12676,7 @@ /turf/open/floor/plating, /area/desert_dam/exterior/valley/valley_crashsite) "aMk" = ( -/obj/structure/prop/mill, +/obj/structure/machinery/mill, /turf/open/floor/plating, /area/desert_dam/exterior/valley/valley_crashsite) "aMl" = ( @@ -29519,7 +29519,7 @@ }, /area/desert_dam/interior/dam_interior/workshop) "bPQ" = ( -/obj/structure/prop/mill, +/obj/structure/machinery/mill, /turf/open/floor/prison{ icon_state = "sterile_white" }, @@ -30711,7 +30711,7 @@ }, /area/desert_dam/building/security/prison) "bTs" = ( -/obj/structure/prop/squeezer, +/obj/structure/machinery/squeezer, /turf/open/floor/interior/wood, /area/desert_dam/building/bar/backroom) "bTt" = ( @@ -49264,7 +49264,7 @@ /turf/open/floor/prison, /area/desert_dam/building/hydroponics/hydroponics) "ddR" = ( -/obj/structure/prop/fermenter, +/obj/structure/machinery/fermenter, /turf/open/floor/prison, /area/desert_dam/building/hydroponics/hydroponics) "ddS" = ( diff --git a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm index 5a3312e4b11c..7928c7f06b71 100644 --- a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm +++ b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm @@ -398,7 +398,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) "hk" = ( -/obj/structure/prop/squeezer, +/obj/structure/machinery/squeezer, /turf/open/floor/plating, /area/desert_dam/building/bar/backroom) "hm" = ( diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 7df560775312..f4b3d26d3e93 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -3992,7 +3992,7 @@ }, /area/lv522/oob/w_y_vault) "cbp" = ( -/obj/structure/prop/squeezer, +/obj/structure/machinery/squeezer, /turf/open/floor{ icon_state = "wood" }, @@ -13326,7 +13326,7 @@ }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "fRc" = ( -/obj/structure/prop/mill, +/obj/structure/machinery/mill, /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, @@ -39738,7 +39738,7 @@ }, /area/lv522/indoors/a_block/admin) "pDe" = ( -/obj/structure/prop/squeezer, +/obj/structure/machinery/squeezer, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -48184,7 +48184,7 @@ /obj/structure/platform{ dir = 1 }, -/obj/structure/prop/squeezer, +/obj/structure/machinery/squeezer, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) "sBH" = ( @@ -50462,7 +50462,7 @@ /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 }, -/obj/structure/prop/mill, +/obj/structure/machinery/mill, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "trZ" = ( diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 6648b71c4398..becac81a1897 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -7626,14 +7626,14 @@ }, /area/lv624/lazarus/quart) "aHm" = ( -/obj/structure/prop/fermenter, +/obj/structure/machinery/fermenter, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, /area/lv624/lazarus/quart) "aHn" = ( -/obj/structure/prop/still, +/obj/structure/machinery/still, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull"