diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index b589ad88d6..5eb0f5f2c8 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -1332,7 +1332,6 @@ }, /area/awaymission/wildwest/gov) "ez" = ( -/obj/machinery/mineral/input, /turf/open/floor/plasteel, /area/awaymission/wildwest/refine) "eA" = ( @@ -1340,7 +1339,6 @@ /turf/open/floor/plasteel, /area/awaymission/wildwest/refine) "eB" = ( -/obj/machinery/mineral/output, /turf/open/floor/plasteel, /area/awaymission/wildwest/refine) "eC" = ( diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 99a3de90e1..27fdf1951a 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -214,29 +214,13 @@ //auto-gibs anything that bumps into it /obj/machinery/gibber/autogibber - var/turf/input_plate - -/obj/machinery/gibber/autogibber/Initialize() - . = ..() - for(var/i in GLOB.cardinals) - var/obj/machinery/mineral/input/input_obj = locate() in get_step(loc, i) - if(input_obj) - if(isturf(input_obj.loc)) - input_plate = input_obj.loc - qdel(input_obj) - break - - if(!input_plate) - CRASH("Didn't find an input plate.") - return + var/input_dir = NORTH /obj/machinery/gibber/autogibber/CollidedWith(atom/movable/AM) - if(!input_plate) - return - + var/atom/input = get_step(src, input_dir) if(ismob(AM)) var/mob/M = AM - if(M.loc == input_plate) + if(M.loc == input) M.forceMove(src) M.gib() diff --git a/code/modules/mining/machine_input_output_plates.dm b/code/modules/mining/machine_input_output_plates.dm deleted file mode 100644 index b6f68d4c89..0000000000 --- a/code/modules/mining/machine_input_output_plates.dm +++ /dev/null @@ -1,33 +0,0 @@ -/**********************Input and output plates**************************/ - -/obj/machinery/mineral/input - icon = 'icons/mob/screen_gen.dmi' - icon_state = "x2" - name = "Input area" - density = FALSE - anchored = TRUE - -/obj/machinery/mineral/input/Initialize() - . = ..() - icon_state = "blank" - -/obj/machinery/mineral/output - icon = 'icons/mob/screen_gen.dmi' - icon_state = "x" - name = "Output area" - density = FALSE - anchored = TRUE - -/obj/machinery/mineral/output/Initialize() - . = ..() - icon_state = "blank" - -/obj/machinery/mineral - var/input_dir = NORTH - var/output_dir = SOUTH - -/obj/machinery/mineral/proc/unload_mineral(atom/movable/S) - S.forceMove(loc) - var/turf/T = get_step(src,output_dir) - if(T) - S.forceMove(T) \ No newline at end of file diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index b1587dd6ae..e991fc65aa 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -2,6 +2,16 @@ /**********************Mineral processing unit console**************************/ +/obj/machinery/mineral + var/input_dir = NORTH + var/output_dir = SOUTH + +/obj/machinery/mineral/proc/unload_mineral(atom/movable/S) + S.forceMove(drop_location()) + var/turf/T = get_step(src,output_dir) + if(T) + S.forceMove(T) + /obj/machinery/mineral/processing_unit_console name = "production machine console" icon = 'icons/obj/machines/mining_machines.dmi' diff --git a/tgstation.dme b/tgstation.dme index 1e4e9f0811..05b04a8285 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1718,7 +1718,6 @@ #include "code\modules\mining\aux_base.dm" #include "code\modules\mining\aux_base_camera.dm" #include "code\modules\mining\fulton.dm" -#include "code\modules\mining\machine_input_output_plates.dm" #include "code\modules\mining\machine_processing.dm" #include "code\modules\mining\machine_redemption.dm" #include "code\modules\mining\machine_stacking.dm"