mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-16 20:52:33 +00:00
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:
@@ -1332,7 +1332,6 @@
|
|||||||
},
|
},
|
||||||
/area/awaymission/wildwest/gov)
|
/area/awaymission/wildwest/gov)
|
||||||
"ez" = (
|
"ez" = (
|
||||||
/obj/machinery/mineral/input,
|
|
||||||
/turf/open/floor/plasteel,
|
/turf/open/floor/plasteel,
|
||||||
/area/awaymission/wildwest/refine)
|
/area/awaymission/wildwest/refine)
|
||||||
"eA" = (
|
"eA" = (
|
||||||
@@ -1340,7 +1339,6 @@
|
|||||||
/turf/open/floor/plasteel,
|
/turf/open/floor/plasteel,
|
||||||
/area/awaymission/wildwest/refine)
|
/area/awaymission/wildwest/refine)
|
||||||
"eB" = (
|
"eB" = (
|
||||||
/obj/machinery/mineral/output,
|
|
||||||
/turf/open/floor/plasteel,
|
/turf/open/floor/plasteel,
|
||||||
/area/awaymission/wildwest/refine)
|
/area/awaymission/wildwest/refine)
|
||||||
"eC" = (
|
"eC" = (
|
||||||
|
|||||||
@@ -214,29 +214,13 @@
|
|||||||
|
|
||||||
//auto-gibs anything that bumps into it
|
//auto-gibs anything that bumps into it
|
||||||
/obj/machinery/gibber/autogibber
|
/obj/machinery/gibber/autogibber
|
||||||
var/turf/input_plate
|
var/input_dir = NORTH
|
||||||
|
|
||||||
/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
|
|
||||||
|
|
||||||
/obj/machinery/gibber/autogibber/CollidedWith(atom/movable/AM)
|
/obj/machinery/gibber/autogibber/CollidedWith(atom/movable/AM)
|
||||||
if(!input_plate)
|
var/atom/input = get_step(src, input_dir)
|
||||||
return
|
|
||||||
|
|
||||||
if(ismob(AM))
|
if(ismob(AM))
|
||||||
var/mob/M = AM
|
var/mob/M = AM
|
||||||
|
|
||||||
if(M.loc == input_plate)
|
if(M.loc == input)
|
||||||
M.forceMove(src)
|
M.forceMove(src)
|
||||||
M.gib()
|
M.gib()
|
||||||
|
|||||||
@@ -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)
|
|
||||||
@@ -2,6 +2,16 @@
|
|||||||
|
|
||||||
/**********************Mineral processing unit console**************************/
|
/**********************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
|
/obj/machinery/mineral/processing_unit_console
|
||||||
name = "production machine console"
|
name = "production machine console"
|
||||||
icon = 'icons/obj/machines/mining_machines.dmi'
|
icon = 'icons/obj/machines/mining_machines.dmi'
|
||||||
|
|||||||
@@ -1663,7 +1663,6 @@
|
|||||||
#include "code\modules\mining\aux_base.dm"
|
#include "code\modules\mining\aux_base.dm"
|
||||||
#include "code\modules\mining\aux_base_camera.dm"
|
#include "code\modules\mining\aux_base_camera.dm"
|
||||||
#include "code\modules\mining\fulton.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_processing.dm"
|
||||||
#include "code\modules\mining\machine_redemption.dm"
|
#include "code\modules\mining\machine_redemption.dm"
|
||||||
#include "code\modules\mining\machine_stacking.dm"
|
#include "code\modules\mining\machine_stacking.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user