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

Merge remote-tracking branch 'tgstation/master' into upstream-6-2-2026

Browse Source
This commit is contained in:
shayoki
2026-06-03 01:23:54 -05:00
parent 66f8cdea0b 7169c517a8
commit f601a6ddaf
1259 changed files with 50763 additions and 28726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/item/computer.dm
+1 -1
View File
@@ -688,7 +688,7 @@
data["PC_programheaders"] = program_headers
data["PC_stationtime"] = station_time_timestamp()
data["PC_stationtime"] = round_timestamp()
data["PC_stationdate"] = "[time2text(world.realtime, "DDD, Month DD", NO_TIMEZONE)], [CURRENT_STATION_YEAR]"
data["PC_showexitprogram"] = !!active_program // Hides "Exit Program" button on mainscreen
return data
code/modules/modular_computers/computers/item/pda.dm
+1
View File
@@ -369,6 +369,7 @@
/obj/item/modular_computer/pda/silicon/Destroy()
silicon_owner = null
robotact = null
return ..()
///Silicons don't have the tools (or hands) to make circuits setups with their own PDAs.