cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 03:21:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repath obj/machinery to obj/structure/machinery [MDB Ignore] (#22500)

Browse Source 
Repaths obj/machinery to obj/structure/machinery. **Note for
reviewers:** the only meaningful changed code exists within
**code/game/objects/structures.dm** and
**code/game/objects/structures/_machinery.dm**, largely concerning
damage procs. With the exception of moving airlock defines to their own
file, ALL OTHER CHANGES ARE STRICTLY PATH CHANGES.

Objects, _categorically_, are largely divided between those you can hold
in your hand/inventory and those you can't. Machinery objects are
already subtypes of Structures behaviorally, this PR just makes their
pathing reflect that, and allows for future work (tool actions, more
health/destruction functionality) to be developed without unnecessary
code duplication.

I have tested this PR by loading up the Horizon and dismantling various
machines and structures with tools, shooting guns of various types
throughout the ship, and detonating a bunch of explosions throughout the
ship.
This commit is contained in:
Batrachophreno
2026-05-26 15:35:48 -04:00
committed by GitHub
parent d8e02149e0
commit 4ecb0bc21c
1102 changed files with 114406 additions and 114428 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_processing.dm
+33 -33
View File
@@ -4,21 +4,21 @@
#define SMELTER_MODE_COMPRESSING BITFLAG(2)
#define SMELTER_MODE_SMELTING BITFLAG(3)
/obj/machinery/mineral
/obj/structure/machinery/mineral
var/id //used for linking machines to consoles
var/is_processing_machine = FALSE //used to check for initializing machines
var/turf/input_turf
var/turf/output_turf
// Locate our output and input machinery.
/obj/machinery/mineral/proc/setup_io()
/obj/structure/machinery/mineral/proc/setup_io()
for(var/dir in GLOB.cardinals)
var/input_spot = locate(/obj/machinery/mineral/input, get_step(src, dir))
var/input_spot = locate(/obj/structure/machinery/mineral/input, get_step(src, dir))
if(input_spot)
input_turf = get_turf(input_spot) // thought of qdeling the spots here, but it's useful when rebuilding a destroyed machine
break
for(var/dir in GLOB.cardinals)
var/output_spot = locate(/obj/machinery/mineral/output, get_step(src, dir))
var/output_spot = locate(/obj/structure/machinery/mineral/output, get_step(src, dir))
if(output_turf)
output_turf = get_turf(output_spot)
break
@@ -28,19 +28,19 @@
if(!output_turf)
output_turf = get_step(src, dir)
/obj/machinery/mineral/proc/reset_io()
/obj/structure/machinery/mineral/proc/reset_io()
input_turf = null
output_turf = null
setup_io()
/obj/machinery/mineral/Initialize()
/obj/structure/machinery/mineral/Initialize()
. = ..()
if(is_processing_machine)
// checks for movement (i.e. shuttles) and calls reset_io()
RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(reset_io))
/obj/machinery/mineral/Destroy()
/obj/structure/machinery/mineral/Destroy()
if(is_processing_machine)
UnregisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(reset_io))
@@ -48,7 +48,7 @@
/**********************Mineral processing unit console**************************/
/obj/machinery/mineral/processing_unit_console
/obj/structure/machinery/mineral/processing_unit_console
name = "ore redemption console"
desc = "A handy console which can be use to retrieve mining points for use in the mining vendor, or to set processing values for various ore types."
icon = 'icons/obj/machinery/wall/terminals.dmi'
@@ -58,7 +58,7 @@
idle_power_usage = 15
active_power_usage = 50
var/obj/machinery/mineral/processing_unit/machine
var/obj/structure/machinery/mineral/processing_unit/machine
var/show_all_ores = TRUE
var/points = 0
@@ -74,13 +74,13 @@
/obj/item/stock_parts/console_screen
)
/obj/machinery/mineral/processing_unit_console/upgrade_hints(mob/user, distance, is_adjacent)
/obj/structure/machinery/mineral/processing_unit_console/upgrade_hints(mob/user, distance, is_adjacent)
. += ..()
. += "Upgraded <b>capacitors</b> will increase the amount of ore smelted per second."
. += "Upgraded <b>micro-lasers</b> will increase the amount of ore smelted per second."
. += "Upgraded <b>scanning modules</b> will increase the amount of ore smelted per second."
/obj/machinery/mineral/processing_unit_console/Initialize(mapload, d, populate_components)
/obj/structure/machinery/mineral/processing_unit_console/Initialize(mapload, d, populate_components)
. = ..()
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "production_console-screen", plane = ABOVE_LIGHTING_PLANE)
AddOverlays(screen_overlay)
@@ -88,24 +88,24 @@
return INITIALIZE_HINT_LATELOAD
/obj/machinery/mineral/processing_unit_console/LateInitialize()
/obj/structure/machinery/mineral/processing_unit_console/LateInitialize()
. = ..()
setup_machine()
/obj/machinery/mineral/processing_unit_console/Destroy()
/obj/structure/machinery/mineral/processing_unit_console/Destroy()
if(machine)
machine.console = null
return ..()
/obj/machinery/mineral/processing_unit_console/proc/handle_machine_deletion()
/obj/structure/machinery/mineral/processing_unit_console/proc/handle_machine_deletion()
SIGNAL_HANDLER
machine = null
/obj/machinery/mineral/processing_unit_console/proc/setup_machine(mob/user)
/obj/structure/machinery/mineral/processing_unit_console/proc/setup_machine(mob/user)
if(!machine)
var/area/A = get_area(src)
var/best_distance = INFINITY
for(var/obj/machinery/mineral/processing_unit/checked_machine in SSmachinery.machinery)
for(var/obj/structure/machinery/mineral/processing_unit/checked_machine in SSmachinery.machinery)
if(id)
if(checked_machine.id == id)
machine = checked_machine
@@ -124,7 +124,7 @@
return machine
/obj/machinery/mineral/processing_unit_console/attackby(obj/item/attacking_item, mob/user)
/obj/structure/machinery/mineral/processing_unit_console/attackby(obj/item/attacking_item, mob/user)
if(default_deconstruction_screwdriver(user, attacking_item))
return
if(default_deconstruction_crowbar(user, attacking_item))
@@ -133,20 +133,20 @@
return
return ..()
/obj/machinery/mineral/processing_unit_console/attack_hand(mob/user)
/obj/structure/machinery/mineral/processing_unit_console/attack_hand(mob/user)
add_fingerprint(user)
if(!setup_machine(user))
return
ui_interact(user)
/obj/machinery/mineral/processing_unit_console/ui_interact(mob/user, datum/tgui/ui)
/obj/structure/machinery/mineral/processing_unit_console/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "MiningProcessor", "Ore Redemption Console", ui_x=500, ui_y=575)
ui.autoupdate = FALSE
ui.open()
/obj/machinery/mineral/processing_unit_console/ui_data(mob/user)
/obj/structure/machinery/mineral/processing_unit_console/ui_data(mob/user)
var/list/data = list()
var/obj/item/card/id/ID = user.GetIdCard()
if(ID)
@@ -180,7 +180,7 @@
data["oreList"] = ore_list
return data
/obj/machinery/mineral/processing_unit_console/ui_act(action, params)
/obj/structure/machinery/mineral/processing_unit_console/ui_act(action, params)
if(..())
return TRUE
@@ -231,7 +231,7 @@
show_all_ores = !show_all_ores
return TRUE
/obj/machinery/mineral/processing_unit_console/proc/print_report(var/mob/living/user)
/obj/structure/machinery/mineral/processing_unit_console/proc/print_report(var/mob/living/user)
var/obj/item/card/id/ID = user.GetIdCard()
if(!ID)
to_chat(user, SPAN_WARNING("No ID detected. Cannot digitally sign."))
@@ -342,11 +342,11 @@
/**********************Mineral processing unit**************************/
/**
* A list containing alloy data, initialized only once by the first `/obj/machinery/mineral/processing_unit` that initializes
* A list containing alloy data, initialized only once by the first `/obj/structure/machinery/mineral/processing_unit` that initializes
*/
GLOBAL_LIST_EMPTY_TYPED(alloy_data, /datum/alloy)
/obj/machinery/mineral/processing_unit
/obj/structure/machinery/mineral/processing_unit
name = "industrial smelter" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron... //lol fuk u bay it is //i'm gay // based and redpilled
desc = "A large smelter and compression machine which heats up ore, then applies the process specified within the ore redemption console, outputting the result to the other side."
icon = 'icons/obj/machinery/mining_machines.dmi'
@@ -357,7 +357,7 @@ GLOBAL_LIST_EMPTY_TYPED(alloy_data, /datum/alloy)
light_range = 3
///The ore redemption console that is linked to us
var/obj/machinery/mineral/processing_unit_console/console
var/obj/structure/machinery/mineral/processing_unit_console/console
///How many sheets in a second this smelter can make (more or less, rounded up depending on ticklag)
var/sheets_per_second = 50
@@ -392,7 +392,7 @@ GLOBAL_LIST_EMPTY_TYPED(alloy_data, /datum/alloy)
/obj/item/stock_parts/matter_bin
)
/obj/machinery/mineral/processing_unit/Initialize()
/obj/structure/machinery/mineral/processing_unit/Initialize()
. = ..()
// initialize static alloy_data list, if it's not already initialized
@@ -407,16 +407,16 @@ GLOBAL_LIST_EMPTY_TYPED(alloy_data, /datum/alloy)
return INITIALIZE_HINT_LATELOAD
/obj/machinery/mineral/processing_unit/LateInitialize()
/obj/structure/machinery/mineral/processing_unit/LateInitialize()
. = ..()
setup_io()
/obj/machinery/mineral/processing_unit/Destroy()
/obj/structure/machinery/mineral/processing_unit/Destroy()
if(console)
console.machine = null
return ..()
/obj/machinery/mineral/processing_unit/proc/link_console(obj/machinery/mineral/processing_unit_console/console_to_link)
/obj/structure/machinery/mineral/processing_unit/proc/link_console(obj/structure/machinery/mineral/processing_unit_console/console_to_link)
if(console)
UnregisterSignal(console, COMSIG_QDELETING)
console = null
@@ -424,12 +424,12 @@ GLOBAL_LIST_EMPTY_TYPED(alloy_data, /datum/alloy)
console = console_to_link
RegisterSignal(console, COMSIG_QDELETING, PROC_REF(handle_console_deletion))
/obj/machinery/mineral/processing_unit/proc/handle_console_deletion()
/obj/structure/machinery/mineral/processing_unit/proc/handle_console_deletion()
SIGNAL_HANDLER
console = null
/obj/machinery/mineral/processing_unit/attackby(obj/item/attacking_item, mob/user)
/obj/structure/machinery/mineral/processing_unit/attackby(obj/item/attacking_item, mob/user)
if(default_deconstruction_screwdriver(user, attacking_item))
return
if(default_deconstruction_crowbar(user, attacking_item))
@@ -439,7 +439,7 @@ GLOBAL_LIST_EMPTY_TYPED(alloy_data, /datum/alloy)
return ..()
/obj/machinery/mineral/processing_unit/process(seconds_per_tick)
/obj/structure/machinery/mineral/processing_unit/process(seconds_per_tick)
..()
if(!src.output_turf || !src.input_turf)
@@ -568,7 +568,7 @@ GLOBAL_LIST_EMPTY_TYPED(alloy_data, /datum/alloy)
if(console)
SStgui.update_uis(console)
/obj/machinery/mineral/processing_unit/RefreshParts()
/obj/structure/machinery/mineral/processing_unit/RefreshParts()
..()
var/scan_rating = 0
var/cap_rating = 0