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 Twelve

Browse Source
This commit is contained in:
Unknown
2019-04-14 14:38:30 -04:00
parent 042720823a
commit 7594c28f21
56 changed files with 1074 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/modular_computers/computers/modular_computer/core.dm
View File

@@ -82,6 +82,8 @@
set_light(light_strength)
if(active_program)
overlays.Add(active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu)
if(active_program.program_key_state)
overlays.Add(active_program.program_key_state)
else
overlays.Add(icon_state_menu)

2
code/modules/modular_computers/computers/modular_computer/interaction.dm
View File

@@ -136,7 +136,7 @@
update_uis()
to_chat(user, "You insert \the [I] into \the [src].")
return
if(istype(W, /obj/item/weapon/paper))
if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/paper_bundle))
if(!nano_printer)
return
nano_printer.attackby(W, user)

1
code/modules/modular_computers/computers/modular_computer/ui.dm
View File

@@ -31,6 +31,7 @@
var/list/program = list()
program["name"] = P.filename
program["desc"] = P.filedesc
program["icon"] = P.program_menu_icon
program["autorun"] = (istype(autorun) && (autorun.stored_data == P.filename)) ? 1 : 0
if(P in idle_threads)
program["running"] = 1

2
code/modules/modular_computers/computers/subtypes/dev_laptop.dm
View File

@@ -34,4 +34,4 @@
icon_state = icon_state_closed
/obj/item/modular_computer/laptop/preset
anchored = FALSE
anchored = FALSE

7
code/modules/modular_computers/computers/subtypes/dev_tablet.dm
View File

@@ -8,4 +8,9 @@
hardware_flag = PROGRAM_TABLET
max_hardware_size = 1
w_class = ITEMSIZE_SMALL
light_strength = 2 // Same as PDAs
light_strength = 2 // Same as PDAs
/obj/item/modular_computer/tablet/lease
desc = "A small portable microcomputer. This one has a gold and blue stripe, and a serial number stamped into the case."
icon_state = "tabletsol"
icon_state_unpowered = "tabletsol"

2
code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
View File

@@ -1,6 +1,6 @@
/obj/item/modular_computer/telescreen
name = "telescreen"
desc = "A stationary wall-mounted touchscreen"
desc = "A wall-mounted touchscreen computer."
icon = 'icons/obj/modular_telescreen.dmi'
icon_state = "telescreen"
icon_state_unpowered = "telescreen"

17
code/modules/modular_computers/computers/subtypes/preset_console.dm
View File

@@ -20,6 +20,7 @@
..()
hard_drive.store_file(new/datum/computer_file/program/suit_sensors())
hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
hard_drive.store_file(new/datum/computer_file/program/wordprocessor())
set_autorun("sensormonitor")
// Research
@@ -35,6 +36,7 @@
hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
//hard_drive.store_file(new/datum/computer_file/program/aidiag())
hard_drive.store_file(new/datum/computer_file/program/email_client())
hard_drive.store_file(new/datum/computer_file/program/wordprocessor())
// Administrator
/obj/item/modular_computer/console/preset/sysadmin/install_default_hardware()
@@ -50,6 +52,7 @@
//hard_drive.store_file(new/datum/computer_file/program/aidiag())
hard_drive.store_file(new/datum/computer_file/program/email_client())
hard_drive.store_file(new/datum/computer_file/program/email_administration())
hard_drive.store_file(new/datum/computer_file/program/wordprocessor())
// Command
/obj/item/modular_computer/console/preset/command/install_default_hardware()
@@ -70,6 +73,7 @@
..()
hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
hard_drive.store_file(new/datum/computer_file/program/digitalwarrant())
hard_drive.store_file(new/datum/computer_file/program/wordprocessor())
// Civilian
/obj/item/modular_computer/console/preset/civilian/install_default_programs()
@@ -79,6 +83,7 @@
hard_drive.store_file(new/datum/computer_file/program/newsbrowser())
hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
hard_drive.store_file(new/datum/computer_file/program/email_client())
hard_drive.store_file(new/datum/computer_file/program/wordprocessor())
// ERT
/obj/item/modular_computer/console/preset/ert/install_default_hardware()
@@ -114,4 +119,14 @@
// Merchant
/obj/item/modular_computer/console/preset/merchant/install_default_programs()
..()
//hard_drive.store_file(new/datum/computer_file/program/merchant())
//hard_drive.store_file(new/datum/computer_file/program/merchant())
hard_drive.store_file(new/datum/computer_file/program/wordprocessor())
// Library
/obj/item/modular_computer/console/preset/library/install_default_programs()
..()
hard_drive.store_file(new/datum/computer_file/program/nttransfer())
hard_drive.store_file(new/datum/computer_file/program/newsbrowser())
hard_drive.store_file(new/datum/computer_file/program/email_client())
hard_drive.store_file(new/datum/computer_file/program/wordprocessor())
hard_drive.store_file(new/datum/computer_file/program/library())