cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linter Introduction + Cleanup

Browse Source
This commit is contained in:
Neerti
2021-05-25 23:19:34 -04:00
committed by VirgoBot
parent 6e257dcd84
commit 767e655310
191 changed files with 3753 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shieldgen/shield_capacitor.dm
+2 -2
View File
@@ -40,7 +40,7 @@
if(istype(W, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/C = W
if(access_captain in C.access || access_security in C.access || access_engine in C.access)
if((access_captain in C.access) || (access_security in C.access) || (access_engine in C.access))
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
updateDialog()
@@ -59,7 +59,7 @@
owned_gen.capacitors |= src
owned_gen.updateDialog()
else
if(owned_gen && src in owned_gen.capacitors)
if(owned_gen && (src in owned_gen.capacitors))
owned_gen.capacitors -= src
owned_gen = null
else
code/modules/shieldgen/shield_gen.dm
+25 -6
View File
@@ -60,7 +60,7 @@
/obj/machinery/shield_gen/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/C = W
if(access_captain in C.access || access_security in C.access || access_engine in C.access)
if((access_captain in C.access) || (access_security in C.access) || (access_engine in C.access))
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
updateDialog()
@@ -110,19 +110,18 @@
return ..()
/obj/machinery/shield_gen/tgui_data(mob/user)
var/list/data = list()
var/list/lockedData = list()
data["locked"] = locked
data["lockedData"] = list()
if(!locked)
data["lockedData"]["capacitors"] = list()
var/list/caps = list()
for(var/obj/machinery/shield_capacitor/C in capacitors)
data["lockedData"]["capacitors"].Add(list(list(
caps.Add(list(list(
"active" = C.active,
"stored_charge" = C.stored_charge,
"max_charge" = C.max_charge,
"failing" = (C.time_since_fail <= 2),
)))
<<<<<<< HEAD
data["lockedData"]["active"] = active
data["lockedData"]["failing"] = (time_since_fail <= 2)
@@ -140,6 +139,26 @@
data["lockedData"]["gen_power"] = round(field.len * min(strengthen_rate, target_field_strength - average_field_strength) / energy_conversion_rate)
return data
=======
lockedData["capacitors"] = caps
lockedData["active"] = active
lockedData["failing"] = (time_since_fail <= 2)
lockedData["radius"] = field_radius
lockedData["max_radius"] = max_field_radius
lockedData["z_range"] = z_range
lockedData["max_z_range"] = 10
lockedData["average_field_strength"] = average_field_strength
lockedData["target_field_strength"] = target_field_strength
lockedData["max_field_strength"] = max_field_strength
lockedData["shields"] = LAZYLEN(field)
lockedData["upkeep"] = round(field.len * max(average_field_strength * dissipation_rate, min_dissipation) / energy_conversion_rate)
lockedData["strengthen_rate"] = strengthen_rate
lockedData["max_strengthen_rate"] = max_strengthen_rate
lockedData["gen_power"] = round(field.len * min(strengthen_rate, target_field_strength - average_field_strength) / energy_conversion_rate)
return list("locked" = locked, "lockedData" = lockedData)
>>>>>>> fdabe51... Linter Introduction + Cleanup (#8085)
/obj/machinery/shield_gen/process()
if (!anchored && active)