cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 05:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates Part Seven

Browse Source
This commit is contained in:
Unknown
2019-04-10 22:33:48 -04:00
parent 2e8acaf5a4
commit eb62911b9d
23 changed files with 412 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/modular_computers/computers/item/modular_computer.dm
View File

@@ -776,4 +776,11 @@
if(HALLOSS)
take_damage(Proj.damage, Proj.damage / 3, 0)
if(BURN)
take_damage(Proj.damage, Proj.damage / 1.5)
take_damage(Proj.damage, Proj.damage / 1.5)
// Used by camera monitor program
/obj/item/modular_computer/check_eye(var/mob/user)
if(active_program)
return active_program.check_eye(user)
else
return ..()

31
code/modules/modular_computers/computers/machinery/console_presets.dm
View File

@@ -17,7 +17,6 @@
cpu.battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(cpu)
install_programs()
// Override in child types to install preset-specific programs.
/obj/machinery/modular_computer/console/preset/proc/install_programs()
return
@@ -31,6 +30,7 @@
cpu.hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())
cpu.hard_drive.store_file(new/datum/computer_file/program/atmos_control())
cpu.hard_drive.store_file(new/datum/computer_file/program/rcon_console())
cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
// ===== MEDICAL CONSOLE =====
@@ -40,6 +40,7 @@
/obj/machinery/modular_computer/console/preset/medical/install_programs()
cpu.hard_drive.store_file(new/datum/computer_file/program/suit_sensors())
cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
// ===== RESEARCH CONSOLE =====
@@ -51,6 +52,7 @@
cpu.hard_drive.store_file(new/datum/computer_file/program/ntnetmonitor())
cpu.hard_drive.store_file(new/datum/computer_file/program/nttransfer())
cpu.hard_drive.store_file(new/datum/computer_file/program/chatclient())
cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
// ===== COMMAND CONSOLE =====
@@ -64,6 +66,7 @@
cpu.hard_drive.store_file(new/datum/computer_file/program/chatclient())
cpu.hard_drive.store_file(new/datum/computer_file/program/card_mod())
cpu.hard_drive.store_file(new/datum/computer_file/program/comm())
cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
// ===== SECURITY CONSOLE =====
@@ -72,7 +75,7 @@
desc = "A stationary computer. This one comes preloaded with security programs."
/obj/machinery/modular_computer/console/preset/security/install_programs()
return // No security programs exist, yet, but the preset is ready so it may be mapped in.
cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
// ===== CIVILIAN CONSOLE =====
@@ -83,3 +86,27 @@
/obj/machinery/modular_computer/console/preset/civilian/install_programs()
cpu.hard_drive.store_file(new/datum/computer_file/program/chatclient())
cpu.hard_drive.store_file(new/datum/computer_file/program/nttransfer())
cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor()) // Mainly for the entertainment channel, won't allow connection to other channels without access anyway
// ===== ERT CONSOLE =====
/obj/machinery/modular_computer/console/preset/ert
console_department = "Crescent"
desc = "A stationary computer. This one comes preloaded with various programs used by Nanotrasen response teams."
/obj/machinery/modular_computer/console/preset/ert/install_programs()
cpu.hard_drive.store_file(new/datum/computer_file/program/nttransfer())
cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor/ert())
cpu.hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())
cpu.hard_drive.store_file(new/datum/computer_file/program/comm())
// ===== MERCENARY CONSOLE =====
/obj/machinery/modular_computer/console/preset/mercenary
console_department = "Unset"
desc = "A stationary computer. This one comes preloaded with various programs used by shady organizations."
_has_printer = 1
_has_id_slot = 1
emagged = 1 // Allows download of other antag programs for free.
/obj/machinery/modular_computer/console/preset/ert/install_programs()
cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor/hacked())
cpu.hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())

5
code/modules/modular_computers/computers/machinery/modular_computer.dm
View File

@@ -190,4 +190,7 @@
if(cpu)
cpu.bullet_act(Proj)
/obj/machinery/modular_computer/check_eye(var/mob/user)
if(cpu)
return cpu.check_eye(user)
return -1