cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-23 20:56:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into economy-update-junk

Browse Source
This commit is contained in:
Dahlular
2022-07-06 16:28:45 -06:00
committed by GitHub
parent 7b9f638832 0584d6b79a
commit c7c6e2d193
196 changed files with 865 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/aifixer.dm
+2 -2
View File
@@ -2,12 +2,12 @@
name = "\improper AI system integrity restorer"
desc = "Used with intelliCards containing nonfunctional AIs to restore them to working order."
req_access = list(ACCESS_CAPTAIN, ACCESS_ROBOTICS, ACCESS_HEADS)
var/mob/living/silicon/ai/occupier = null
var/active = 0
circuit = /obj/item/circuitboard/computer/aifixer
icon_keyboard = "tech_key"
icon_screen = "ai-fixer"
light_color = LIGHT_COLOR_PINK
var/mob/living/silicon/ai/occupier = null
var/active = 0
/obj/machinery/computer/aifixer/attackby(obj/I, mob/user, params)
if(occupier && istype(I, /obj/item/screwdriver))
code/game/machinery/computer/arcade.dm
+1 -2
View File
@@ -11,6 +11,7 @@
icon_keyboard = null
icon_screen = "invaders"
clockwork = TRUE //it'd look weird
light_color = LIGHT_COLOR_GREEN
var/list/prizes = list(
/obj/item/toy/balloon = ARCADE_WEIGHT_USELESS,
/obj/item/toy/beach_ball = ARCADE_WEIGHT_USELESS,
@@ -72,8 +73,6 @@
/obj/item/clothing/mask/fakemoustache/italian = ARCADE_WEIGHT_RARE
)
light_color = LIGHT_COLOR_GREEN
/obj/machinery/computer/arcade/proc/Reset()
return
code/game/machinery/computer/atmos_alert.dm
+1 -2
View File
@@ -4,13 +4,12 @@
circuit = /obj/item/circuitboard/computer/atmos_alert
icon_screen = "alert:0"
icon_keyboard = "atmos_key"
light_color = LIGHT_COLOR_CYAN
var/list/priority_alarms = list()
var/list/minor_alarms = list()
var/receive_frequency = FREQ_ATMOS_ALARMS
var/datum/radio_frequency/radio_connection
light_color = LIGHT_COLOR_CYAN
/obj/machinery/computer/atmos_alert/Initialize()
. = ..()
set_frequency(receive_frequency)
code/game/machinery/computer/atmos_control.dm
+1 -2
View File
@@ -91,6 +91,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
icon_screen = "tank"
icon_keyboard = "atmos_key"
circuit = /obj/item/circuitboard/computer/atmos_control
light_color = LIGHT_COLOR_CYAN
ui_x = 400
ui_y = 925
@@ -111,8 +112,6 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
var/list/sensor_information = list()
var/datum/radio_frequency/radio_connection
light_color = LIGHT_COLOR_CYAN
/obj/machinery/computer/atmos_control/Initialize()
. = ..()
GLOB.atmos_air_controllers += src
code/game/machinery/computer/camera.dm
+1 -2
View File
@@ -4,12 +4,11 @@
icon_screen = "cameras"
icon_keyboard = "security_key"
circuit = /obj/item/circuitboard/computer/security
light_color = COLOR_SOFT_RED
var/last_pic = 1
var/list/network = list("ss13")
var/list/watchers = list() //who's using the console, associated with the camera they're on.
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/security/Initialize()
. = ..()
for(var/i in network)
code/game/machinery/computer/camera_advanced.dm
+1 -2
View File
@@ -3,6 +3,7 @@
desc = "Used to access the various cameras on the station."
icon_screen = "cameras"
icon_keyboard = "security_key"
light_color = COLOR_SOFT_RED
var/list/z_lock = list() // Lock use to these z levels
var/lock_override = NONE
var/mob/camera/aiEye/remote/eyeobj
@@ -12,8 +13,6 @@
var/datum/action/innate/camera_jump/jump_action = new
var/list/actions = list()
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/camera_advanced/Initialize()
. = ..()
for(var/i in networks)
code/game/machinery/computer/card.dm
+2 -7
View File
@@ -16,6 +16,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
icon_keyboard = "id_key"
req_one_access = list(ACCESS_HEADS, ACCESS_CHANGE_IDS)
circuit = /obj/item/circuitboard/computer/card
light_color = LIGHT_COLOR_BLUE
var/mode = 0
var/printing = null
var/target_dept = 0 //Which department this computer has access to. 0=all departments
@@ -49,8 +50,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
var/list/region_access = null
var/list/head_subordinates = null
light_color = LIGHT_COLOR_BLUE
/obj/machinery/computer/card/proc/get_jobs()
return get_all_jobs()
@@ -621,8 +620,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/obj/machinery/computer/card/minor/hos
target_dept = 2
icon_screen = "idhos"
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
/obj/machinery/computer/card/minor/cmo
target_dept = 3
@@ -631,19 +629,16 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/obj/machinery/computer/card/minor/rd
target_dept = 4
icon_screen = "idrd"
light_color = LIGHT_COLOR_PINK
/obj/machinery/computer/card/minor/ce
target_dept = 5
icon_screen = "idce"
light_color = LIGHT_COLOR_YELLOW
/obj/machinery/computer/card/minor/qm
target_dept = 6
icon_screen = "idqm"
light_color = LIGHT_COLOR_ORANGE
#undef JOB_ALLOWED
code/game/machinery/computer/communications.dm
+1 -2
View File
@@ -6,6 +6,7 @@
icon_keyboard = "tech_key"
req_access = list(ACCESS_HEADS)
circuit = /obj/item/circuitboard/computer/communications
light_color = LIGHT_COLOR_BLUE
var/auth_id = "Unknown" //Who is currently logged in?
var/list/datum/comm_message/messages = list()
var/datum/comm_message/currmsg
@@ -32,8 +33,6 @@
var/datum/lore/atc_controller/ATC
light_color = LIGHT_COLOR_BLUE
/obj/machinery/computer/communications/proc/checkCCcooldown()
var/obj/item/circuitboard/computer/communications/CM = circuit
if(CM.lastTimeUsed + 600 > world.time)
code/game/machinery/computer/medical.dm
+1 -2
View File
@@ -7,6 +7,7 @@
icon_keyboard = "med_key"
req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS)
circuit = /obj/item/circuitboard/computer/med_data
light_color = LIGHT_COLOR_BLUE
var/rank = null
var/screen = null
var/datum/data/record/active1
@@ -17,8 +18,6 @@
var/sortBy = "name"
var/order = 1 // -1 = Descending - 1 = Ascending
light_color = LIGHT_COLOR_BLUE
/obj/machinery/computer/med_data/syndie
icon_keyboard = "syndie_key"
code/game/machinery/computer/prisoner/gulag_teleporter.dm
+1 -2
View File
@@ -6,6 +6,7 @@
icon_keyboard = "security_key"
req_access = list(ACCESS_ARMORY)
circuit = /obj/item/circuitboard/computer/gulag_teleporter_console
light_color = COLOR_SOFT_RED
ui_x = 350
ui_y = 295
@@ -15,8 +16,6 @@
var/mob/living/carbon/human/prisoner = null
var/datum/data/record/temporary_record = null
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/prisoner/gulag_teleporter_computer/Initialize()
. = ..()
scan_machinery()
code/game/machinery/computer/prisoner/management.dm
+2 -3
View File
@@ -5,15 +5,14 @@
icon_screen = "explosive"
icon_keyboard = "security_key"
req_access = list(ACCESS_BRIG)
circuit = /obj/item/circuitboard/computer/prisoner
light_color = COLOR_SOFT_RED
var/id = 0
var/temp = null
var/status = 0
var/timeleft = 60
var/stop = 0
var/screen = 0 // 0 - No Access Denied, 1 - Access allowed
circuit = /obj/item/circuitboard/computer/prisoner
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/prisoner/management/ui_interact(mob/user)
. = ..()
code/game/machinery/computer/security.dm
+1 -2
View File
@@ -5,6 +5,7 @@
icon_keyboard = "security_key"
req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS)
circuit = /obj/item/circuitboard/computer/secure_data
light_color = COLOR_SOFT_RED
var/rank = null
var/screen = null
var/datum/data/record/active1 = null
@@ -18,8 +19,6 @@
var/sortBy = "name"
var/order = 1 // -1 = Descending - 1 = Ascending
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/secure_data/syndie
icon_keyboard = "syndie_key"
code/game/machinery/computer/telecrystalconsoles.dm
+1 -1
View File
@@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
clockwork = TRUE //it'd look weird, at least if ratvar ever got there
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
/////////////////////////////////////////////
/obj/machinery/computer/telecrystals/uplinker