cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 02:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Techweb Fixes (#11299)

Browse Source 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-04 15:36:43 -07:00
committed by GitHub
parent 399e4948e8
commit ac77b94d4b
29 changed files with 518 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/research/tg/designs/stock_part_designs.dm
View File

@@ -351,7 +351,7 @@
id = "basic_cell"
build_type = PROTOLATHE | AUTOLATHE
materials = list(MAT_STEEL = 700, MAT_GLASS = 50)
build_path = /obj/item/cell
build_path = /obj/item/cell/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
)
@@ -363,7 +363,7 @@
id = "high_cell"
build_type = PROTOLATHE
materials = list(MAT_STEEL = 700, MAT_GLASS = 60)
build_path = /obj/item/cell/high
build_path = /obj/item/cell/high/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2
)
@@ -375,7 +375,7 @@
id = "super_cell"
build_type = PROTOLATHE
materials = list(MAT_STEEL = 700, MAT_GLASS = 70)
build_path = /obj/item/cell/super
build_path = /obj/item/cell/super/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
)
@@ -388,7 +388,7 @@
// req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4)
build_type = PROTOLATHE
materials = list(MAT_STEEL = 400, MAT_GOLD = 150, MAT_SILVER = 150, MAT_GLASS = 70)
build_path = /obj/item/cell/hyper
build_path = /obj/item/cell/hyper/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4
)
@@ -400,7 +400,7 @@
id = "device_cell"
build_type = PROTOLATHE
materials = list(MAT_STEEL = 350, MAT_GLASS = 25)
build_path = /obj/item/cell/device
build_path = /obj/item/cell/device/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
)
@@ -410,7 +410,7 @@
id = "weapon_cell"
build_type = PROTOLATHE
materials = list(MAT_STEEL = 700, MAT_GLASS = 50)
build_path = /obj/item/cell/device/weapon
build_path = /obj/item/cell/device/weapon/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
)

3
code/modules/research/tg/machinery/_production.dm
View File

@@ -206,7 +206,7 @@
/obj/machinery/rnd/production/ui_assets(mob/user)
return list(
get_asset_datum(/datum/asset/spritesheet/sheetmaterials),
get_asset_datum(/datum/asset/spritesheet_batched/sheetmaterials),
get_asset_datum(/datum/asset/spritesheet_batched/research_designs)
)
@@ -254,6 +254,7 @@
data["designs"] = designs
data["fabName"] = name
data += materials.mat_container.tgui_static_data()
return data

2
code/modules/research/tg/machinery/mech_fabricator.dm
View File

@@ -361,7 +361,7 @@
/obj/machinery/mecha_part_fabricator_tg/ui_assets(mob/user)
return list(
get_asset_datum(/datum/asset/spritesheet/sheetmaterials),
get_asset_datum(/datum/asset/spritesheet_batched/sheetmaterials),
get_asset_datum(/datum/asset/spritesheet_batched/research_designs)
)

8
code/modules/research/tg/techwebs/_techweb_node.dm
View File

@@ -117,10 +117,10 @@
///Proc called when the Station (Science techweb specific) researches a node.
/datum/techweb_node/proc/on_station_research(atom/research_source)
SHOULD_CALL_PARENT(TRUE)
var/channels_to_use = announce_channels
if(length(channels_to_use) && !starting_node)
for(var/channel in channels_to_use)
GLOB.global_announcer.autosay("Science just researched node \"[display_name]\".", "Science Announcer", channel)
// var/channels_to_use = announce_channels
// if(length(channels_to_use) && !starting_node)
// for(var/channel in channels_to_use)
// GLOB.global_announcer.autosay("Science just researched node \"[display_name]\".", "Science Announcer", channel)
// if(istype(research_source, /obj/machinery/computer/rdconsole))
// var/obj/machinery/computer/rdconsole/console = research_source
// var/obj/item/circuitboard/computer/rdconsole/board = console.circuit