cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-30 12:03:11 +00: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

9
code/game/objects/items/devices/PDA/cart.dm
View File

@@ -434,7 +434,7 @@ var/list/civilian_cartridges = list(
for(var/S in supply_controller.shoppinglist)
var/datum/supply_order/SO = S
supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment))
if(!supplyOrderData.len)
supplyOrderData[++supplyOrderData.len] = list("Number" = null, "Name" = null, "OrderedBy"=null)
@@ -443,10 +443,13 @@ var/list/civilian_cartridges = list(
var/requestCount = 0
var/requestData[0]
for(var/S in supply_controller.requestlist)
for(var/S in supply_controller.order_history)
var/datum/supply_order/SO = S
if(SO.status != SUP_ORDER_REQUESTED)
continue
requestCount++
requestData[++requestData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "OrderedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
requestData[++requestData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "OrderedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment))
if(!requestData.len)
requestData[++requestData.len] = list("Number" = null, "Name" = null, "orderedBy" = null, "Comment" = null)

5
code/game/objects/items/weapons/circuitboards/computer/computer.dm
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

9
code/game/objects/items/weapons/circuitboards/computer/supply.dm
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