Replaces all var/const with #define

This commit is contained in:
AffectedArc07
2020-01-28 21:25:20 +00:00
parent 076ef673cd
commit c64bc93649
269 changed files with 1481 additions and 1474 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return
if(!(access_heads in W:access)) //doesn't have this access
if(!(ACCESS_HEADS in W:access)) //doesn't have this access
to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return 0
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/machinery/computer/shuttle/ert
name = "specops shuttle console"
req_access = list(access_cent_general)
req_access = list(ACCESS_CENT_GENERAL)
shuttleId = "specops"
possible_destinations = "specops_home;specops_away;specops_custom"
resistance_flags = INDESTRUCTIBLE
+2 -2
View File
@@ -32,9 +32,9 @@
jumpto_ports += list("nav_z1" = 1)
if(access_tcomms)
jumpto_ports += list("nav_z3" = 1)
if(access_construction)
if(ACCESS_CONSTRUCTION)
jumpto_ports += list("nav_z4" = 1)
if(access_mining)
if(ACCESS_MINING)
jumpto_ports += list("nav_z5" = 1)
if(access_derelict)
jumpto_ports += list("nav_z6" = 1)
+2 -2
View File
@@ -875,7 +875,7 @@
/obj/machinery/computer/shuttle/admin
name = "admin shuttle console"
req_access = list(access_cent_general)
req_access = list(ACCESS_CENT_GENERAL)
shuttleId = "admin"
possible_destinations = "admin_home;admin_away;admin_custom"
resistance_flags = INDESTRUCTIBLE
@@ -900,7 +900,7 @@
resistance_flags = INDESTRUCTIBLE
/obj/machinery/computer/shuttle/trade/sol
req_access = list(access_trade_sol)
req_access = list(ACCESS_TRADE_SOL)
possible_destinations = "trade_sol_base;trade_dock"
shuttleId = "trade_sol"
+5 -4
View File
@@ -382,7 +382,7 @@
name = "Supply Shuttle Console"
desc = "Used to order supplies."
icon_screen = "supply"
req_access = list(access_cargo)
req_access = list(ACCESS_CARGO)
circuit = /obj/item/circuitboard/supplycomp
var/temp = null
var/reqtime = 0
@@ -414,6 +414,7 @@
ui.open()
/obj/machinery/computer/ordercomp/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
message_admins("UI DATA CALLED")
var/data[0]
data["last_viewed_group"] = last_viewed_group
@@ -421,7 +422,7 @@
for(var/category in all_supply_groups)
category_list.Add(list(list("name" = get_supply_group_name(category), "category" = category)))
data["categories"] = category_list
message_admins("UI DATA 424")
var/cat = text2num(last_viewed_group)
var/packs_list[0]
for(var/set_name in SSshuttle.supply_packs)
@@ -448,7 +449,7 @@
owned = 1
requests_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby, "owned" = owned, "command1" = list("rreq" = SO.ordernum))))
data["requests"] = requests_list
message_admins("UI DATA 451")
var/orders_list[0]
for(var/set_name in SSshuttle.shoppinglist)
var/datum/supply_order/SO = set_name
@@ -462,7 +463,7 @@
data["moving"] = SSshuttle.supply.mode != SHUTTLE_IDLE
data["at_station"] = SSshuttle.supply.getDockedId() == "supply_home"
data["timeleft"] = SSshuttle.supply.timeLeft(600)
message_admins("UI DATA 465")
return data
/obj/machinery/computer/ordercomp/Topic(href, href_list)
+4 -4
View File
@@ -4,7 +4,7 @@
name = "syndicate shuttle terminal"
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
circuit = /obj/item/circuitboard/shuttle/syndicate
shuttleId = "syndicate"
possible_destinations = "syndicate_away;syndicate_z5;syndicate_z3;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s;syndicate_custom"
@@ -29,7 +29,7 @@
name = "syndicate assault pod control"
icon = 'icons/obj/terminals.dmi'
icon_state = "dorm_available"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
circuit = /obj/item/circuitboard/shuttle/syndicate/drop_pod
shuttleId = "steel_rain"
possible_destinations = null
@@ -46,7 +46,7 @@
desc = "Used to call and send the SST shuttle."
icon_keyboard = "syndie_key"
icon_screen = "syndishuttle"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
shuttleId = "sst"
possible_destinations = "sst_home;sst_away;sst_custom"
resistance_flags = INDESTRUCTIBLE
@@ -56,7 +56,7 @@
desc = "Used to call and send the SIT shuttle."
icon_keyboard = "syndie_key"
icon_screen = "syndishuttle"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
shuttleId = "sit"
possible_destinations = "sit_arrivals;sit_engshuttle;sit_away;sit_custom"
resistance_flags = INDESTRUCTIBLE
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/machinery/computer/shuttle/vox
name = "skipjack control console"
req_access = list(access_vox)
req_access = list(ACCESS_VOX)
shuttleId = "skipjack"
possible_destinations = "skipjack_away;skipjack_ne;skipjack_nw;skipjack_se;skipjack_sw;skipjack_z5;skipjack_custom"
resistance_flags = INDESTRUCTIBLE