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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool

Browse Source
This commit is contained in:
Anewbe
2018-08-04 11:20:02 -05:00
parent b88b70eb61 6ffd299fd7
commit f1507ebfa2
36 changed files with 1316 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/circuitboards/computer/computer.dm
-5
View File
@@ -153,11 +153,6 @@
name = T_BOARD("disease splicer")
build_path = /obj/machinery/computer/diseasesplicer
/obj/item/weapon/circuitboard/ordercomp
name = T_BOARD("supply ordering console")
build_path = /obj/machinery/computer/ordercomp
origin_tech = list(TECH_DATA = 2)
/obj/item/weapon/circuitboard/mining_shuttle
name = T_BOARD("mining shuttle console")
build_path = /obj/machinery/computer/shuttle_control/mining
code/game/objects/items/weapons/circuitboards/computer/supply.dm
+7 -2
View File
@@ -3,11 +3,16 @@
#endif
/obj/item/weapon/circuitboard/supplycomp
name = T_BOARD("supply control console")
name = T_BOARD("supply ordering console")
build_path = /obj/machinery/computer/supplycomp
origin_tech = list(TECH_DATA = 3)
origin_tech = list(TECH_DATA = 2)
var/contraband_enabled = 0
/obj/item/weapon/circuitboard/supplycomp/control
name = T_BOARD("supply ordering console")
build_path = /obj/machinery/computer/supplycomp/control
origin_tech = list(TECH_DATA = 3)
/obj/item/weapon/circuitboard/supplycomp/construct(var/obj/machinery/computer/supplycomp/SC)
if (..(SC))
SC.can_order_contraband = contraband_enabled