mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] Linter Introduction + Cleanup
This commit is contained in:
@@ -69,20 +69,21 @@
|
||||
else
|
||||
data["has_id"] = FALSE
|
||||
|
||||
data["ores"] = list()
|
||||
|
||||
var/list/ores = list()
|
||||
for(var/ore in machine.ores_processing)
|
||||
if(!machine.ores_stored[ore] && !show_all_ores)
|
||||
continue
|
||||
var/ore/O = GLOB.ore_data[ore]
|
||||
if(!O)
|
||||
continue
|
||||
data["ores"].Add(list(list(
|
||||
ores.Add(list(list(
|
||||
"ore" = ore,
|
||||
"name" = O.display_name,
|
||||
"amount" = machine.ores_stored[ore],
|
||||
"processing" = machine.ores_processing[ore] ? machine.ores_processing[ore] : 0,
|
||||
)))
|
||||
|
||||
data["ores"] = ores
|
||||
data["showAllOres"] = show_all_ores
|
||||
data["power"] = machine.active
|
||||
data["speed"] = machine.speed_process
|
||||
@@ -158,8 +159,8 @@
|
||||
var/obj/machinery/mineral/output = null
|
||||
var/obj/machinery/mineral/console = null
|
||||
var/sheets_per_tick = 10
|
||||
var/list/ores_processing[0]
|
||||
var/list/ores_stored[0]
|
||||
var/list/ores_processing = list()
|
||||
var/list/ores_stored = list()
|
||||
var/active = FALSE
|
||||
|
||||
var/points = 0
|
||||
@@ -329,3 +330,4 @@
|
||||
#undef PROCESS_SMELT
|
||||
#undef PROCESS_COMPRESS
|
||||
#undef PROCESS_ALLOY
|
||||
|
||||
|
||||
@@ -37,13 +37,15 @@
|
||||
/obj/machinery/mineral/stacking_unit_console/tgui_data(mob/user)
|
||||
var/list/data = ..()
|
||||
|
||||
data["stacktypes"] = list()
|
||||
|
||||
var/list/stacktypes = list()
|
||||
for(var/stacktype in machine.stack_storage)
|
||||
if(machine.stack_storage[stacktype] > 0)
|
||||
data["stacktypes"].Add(list(list(
|
||||
stacktypes.Add(list(list(
|
||||
"type" = stacktype,
|
||||
"amt" = machine.stack_storage[stacktype],
|
||||
)))
|
||||
data["stacktypes"] = stacktypes
|
||||
data["stackingAmt"] = machine.stack_amt
|
||||
return data
|
||||
|
||||
|
||||
@@ -207,7 +207,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
|
||||
verbs -= /obj/structure/table/proc/do_put
|
||||
..()
|
||||
|
||||
/obj/structure/table/survival_pod/dismantle(obj/item/weapon/wrench/W, mob/user)
|
||||
/obj/structure/table/survival_pod/dismantle(obj/item/weapon/tool/wrench/W, mob/user)
|
||||
to_chat(user, "<span class='warning'>You cannot dismantle \the [src].</span>")
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user