cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 00:27:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

The supermatter crystal is now the parent object of the supermatter shard, rather than the other way around (#37025)

Browse Source 
*every mention of /obj/item/machinery/power/supermatter_shard in the code should have been replaced with /obj/item/machinery/power/supermatter_crystal and it's variants.
*supermatter shard has been moved to /obj/item/machinery/power/supermatter_crystal/shard
*variable changes like gasefficiency and explosion_power has been switcharood in order to keep it in line with the game as of now
This commit is contained in:
iksyp
2018-04-11 03:18:49 -07:00
committed by oranges
parent 09e72de5b9
commit 910eb893b9
13 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/sm_monitor.dm
+5 -5
View File
@@ -13,7 +13,7 @@
ui_y = 400
var/last_status = SUPERMATTER_INACTIVE
var/list/supermatters
var/obj/machinery/power/supermatter_shard/active // Currently selected supermatter crystal.
var/obj/machinery/power/supermatter_crystal/active // Currently selected supermatter crystal.
/datum/computer_file/program/supermatter_monitor/process_tick()
@@ -41,7 +41,7 @@
var/turf/T = get_turf(ui_host())
if(!T)
return
for(var/obj/machinery/power/supermatter_shard/S in GLOB.machines)
for(var/obj/machinery/power/supermatter_crystal/S in GLOB.machines)
// Delaminating, not within coverage, not on a tile.
if (!isturf(S.loc) || !(is_station_level(S.z) || is_mining_level(S.z) || S.z == T.z))
continue
@@ -52,7 +52,7 @@
/datum/computer_file/program/supermatter_monitor/proc/get_status()
. = SUPERMATTER_INACTIVE
for(var/obj/machinery/power/supermatter_shard/S in supermatters)
for(var/obj/machinery/power/supermatter_crystal/S in supermatters)
. = max(., S.get_status())
/datum/computer_file/program/supermatter_monitor/ui_data()
@@ -93,7 +93,7 @@
data["gases"] = gasdata
else
var/list/SMS = list()
for(var/obj/machinery/power/supermatter_shard/S in supermatters)
for(var/obj/machinery/power/supermatter_crystal/S in supermatters)
var/area/A = get_area(S)
if(A)
SMS.Add(list(list(
@@ -120,7 +120,7 @@
return TRUE
if("PRG_set")
var/newuid = text2num(params["target"])
for(var/obj/machinery/power/supermatter_shard/S in supermatters)
for(var/obj/machinery/power/supermatter_crystal/S in supermatters)
if(S.uid == newuid)
active = S
return TRUE