cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 01:23:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes a redundant var from a few machines (#21424)

Browse Source 
* changes to vars

* map edits

* Empty commit

* Update code/modules/mining/machine_processing.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/mining/machine_processing.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>

* le changes

* error

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
This commit is contained in:
S34N
2023-07-20 18:58:01 +01:00
committed by GitHub
parent b7b055927e
commit 1459795807
6 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_processing.dm
+16 -16
View File
@@ -19,16 +19,16 @@
density = TRUE
anchored = TRUE
var/obj/machinery/mineral/processing_unit/machine = null
var/machinedir = EAST
speed_process = TRUE
/obj/machinery/mineral/processing_unit_console/Initialize(mapload)
. = ..()
machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir))
if(machine)
machine.CONSOLE = src
else
return INITIALIZE_HINT_QDEL
for(var/obj/machinery/mineral/processing_unit/found_machine in range(1, src))
machine = found_machine
machine.console = src
return //needed to break for loop
CRASH("[src] failed to link to a mineral processing unit!")
/obj/machinery/mineral/processing_unit_console/attack_ghost(mob/user)
return open_ui(user)
@@ -82,7 +82,7 @@
icon_state = "furnace"
density = TRUE
anchored = TRUE
var/obj/machinery/mineral/CONSOLE = null
var/obj/machinery/mineral/console = null
var/on = FALSE
var/selected_material = MAT_METAL
var/selected_alloy = null
@@ -95,7 +95,7 @@
files = new /datum/research/smelter(src)
/obj/machinery/mineral/processing_unit/Destroy()
CONSOLE = null
console = null
QDEL_NULL(files)
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
materials.retrieve_all()
@@ -115,8 +115,8 @@
else if(selected_alloy)
smelt_alloy()
if(CONSOLE)
CONSOLE.updateUsrDialog()
if(console)
console.updateUsrDialog()
/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/stack/ore/O)
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
@@ -126,8 +126,8 @@
else
materials.insert_item(O)
qdel(O)
if(CONSOLE)
CONSOLE.updateUsrDialog()
if(console)
console.updateUsrDialog()
/obj/machinery/mineral/processing_unit/proc/get_machine_data()
var/dat = "<b>Smelter control console</b><br><br>"
@@ -138,7 +138,7 @@
if(selected_material == mat_id)
dat += " <i>Smelting</i>"
else
dat += " <A href='?src=[CONSOLE.UID()];material=[mat_id]'><b>Not Smelting</b></A> "
dat += " <A href='?src=[console.UID()];material=[mat_id]'><b>Not Smelting</b></A> "
dat += "<br>"
dat += "<br><br>"
@@ -150,16 +150,16 @@
if(selected_alloy == D.id)
dat += " <i>Smelting</i>"
else
dat += " <A href='?src=[CONSOLE.UID()];alloy=[D.id]'><b>Not Smelting</b></A> "
dat += " <A href='?src=[console.UID()];alloy=[D.id]'><b>Not Smelting</b></A> "
dat += "<br>"
dat += "<br><br>"
//On or off
dat += "Machine is currently "
if(on)
dat += "<A href='?src=[CONSOLE.UID()];set_on=off'>On</A> "
dat += "<A href='?src=[console.UID()];set_on=off'>On</A> "
else
dat += "<A href='?src=[CONSOLE.UID()];set_on=on'>Off</A> "
dat += "<A href='?src=[console.UID()];set_on=on'>Off</A> "
return dat