Removes input/output plates and their last remaining use (#35800)

* - Removes input/output plates and their last remaining use

* - ok fine updates the map too

* - loco loco
This commit is contained in:
BordListian
2018-02-23 02:26:42 +01:00
committed by ShizCalev
parent 8217ae6bf2
commit 0e746319e6
5 changed files with 13 additions and 55 deletions

View File

@@ -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" = (

View File

@@ -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()

View File

@@ -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)

View File

@@ -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'

View File

@@ -1663,7 +1663,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"