Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

autoGibber and miner removal UNUSED #6802

Merged
merged 7 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions code/game/machinery/kitchen/gibber.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,37 +20,6 @@
if (PF)
PF.flags_can_pass_all = PASS_HIGH_OVER_ONLY|PASS_AROUND|PASS_OVER_THROW_ITEM

//auto-gibs anything that bumps into it
/obj/structure/machinery/gibber/autogibber
var/turf/input_plate

/obj/structure/machinery/gibber/autogibber/New()
..()
spawn(5)
for(var/i in GLOB.cardinals)
var/obj/structure/machinery/mineral/input/input_obj = locate( /obj/structure/machinery/mineral/input, get_step(loc, i) )
if(input_obj)
if(isturf(input_obj.loc))
input_plate = input_obj.loc
qdel(input_obj)
break

if(!input_plate)
log_misc("a [src] didn't find an input plate.")
return

/obj/structure/machinery/gibber/autogibber/Collided(atom/A)
if(!input_plate) return

if(ismob(A))
var/mob/M = A

if(M.loc == input_plate
)
M.forceMove(src)
M.gib()


/obj/structure/machinery/gibber/New()
..()
overlays += image('icons/obj/structures/machinery/kitchen.dmi', "grjam")
Expand Down
22 changes: 0 additions & 22 deletions code/game/machinery/mining.dm
Original file line number Diff line number Diff line change
@@ -1,25 +1,3 @@
/obj/structure/machinery/mineral/input
icon = 'icons/mob/hud/screen1.dmi'
icon_state = "x2"
name = "Input area"
density = FALSE
anchored = TRUE

/obj/structure/machinery/mineral/input/Initialize(mapload, ...)
. = ..()
icon_state = "blank"

/obj/structure/machinery/mineral/output
icon = 'icons/mob/hud/screen1.dmi'
icon_state = "x"
name = "Output area"
density = FALSE
anchored = TRUE

/obj/structure/machinery/mineral/output/Initialize(mapload, ...)
. = ..()
icon_state = "blank"

/obj/structure/machinery/mineral/processing_unit
name = "material processor" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron...
icon = 'icons/obj/structures/machinery/mining_machines.dmi'
Expand Down
Loading