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

Merge branch 'master' of https://github.com/VOREStation/VOREStation into nikki-fluff

Browse Source
This commit is contained in:
Amy
2020-11-14 12:55:04 -06:00
parent 1572eeee0e a18553b22b
commit 5d0d3bb38d
83 changed files with 30005 additions and 23862 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/uplink.dm
+1
View File
@@ -112,6 +112,7 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
/obj/item/device/uplink/hidden/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui)
if(!active)
toggle()
uses = user.mind.tcrystals
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "Uplink", "Remote Uplink")
code/game/objects/items/weapons/circuitboards/computer/computer.dm
+5
View File
@@ -101,6 +101,11 @@
build_path = /obj/machinery/computer/arcade/orion_trail
origin_tech = list(TECH_DATA = 1)
/obj/item/weapon/circuitboard/arcade/clawmachine
name = T_BOARD("grab-a-gift arcade machine")
build_path = /obj/machinery/computer/arcade/clawmachine
origin_tech = list(TECH_DATA = 1)
/obj/item/weapon/circuitboard/turbine_control
name = T_BOARD("turbine control console")
build_path = /obj/machinery/computer/turbine_computer