cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modular Computer Tweaks P1 (#21370)

Browse Source 
* the set

* woops

* wibi
This commit is contained in:
wonderinghost
2024-02-11 12:21:49 -05:00
committed by GitHub
parent d79c5948fb
commit c97e083740
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/storage/bags.dm
View File

@@ -467,7 +467,7 @@
STR.max_items = 40 STR.max_items = 40
STR.max_w_class = WEIGHT_CLASS_SMALL STR.max_w_class = WEIGHT_CLASS_SMALL
STR.insert_preposition = "in" STR.insert_preposition = "in"
STR.set_holdable(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/glass/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics, /obj/item/modular_computer)) STR.set_holdable(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/glass/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics, /obj/item/modular_computer, /obj/item/computer_hardware))
/obj/item/storage/bag/construction/admin/full/Initialize(mapload) /obj/item/storage/bag/construction/admin/full/Initialize(mapload)

2
code/modules/modular_computers/computers/item/pda/pda.dm
View File

@@ -6,7 +6,7 @@
icon_state_unpowered = "pda" icon_state_unpowered = "pda"
icon_state_powered = "pda" icon_state_powered = "pda"
hardware_flag = PROGRAM_PDA hardware_flag = PROGRAM_PDA
max_hardware_size = WEIGHT_CLASS_TINY max_hardware_size = WEIGHT_CLASS_SMALL
w_class = WEIGHT_CLASS_SMALL w_class = WEIGHT_CLASS_SMALL
max_bays = 1 max_bays = 1
steel_sheet_cost = 1 steel_sheet_cost = 1

2
code/modules/modular_computers/computers/item/phone/phone.dm
View File

@@ -6,7 +6,7 @@
icon_state_unpowered = "phone" icon_state_unpowered = "phone"
icon_state_powered = "phone" icon_state_powered = "phone"
hardware_flag = PROGRAM_PHONE hardware_flag = PROGRAM_PHONE
max_hardware_size = WEIGHT_CLASS_TINY max_hardware_size = WEIGHT_CLASS_SMALL
w_class = WEIGHT_CLASS_SMALL w_class = WEIGHT_CLASS_SMALL
max_bays = 2 max_bays = 2
steel_sheet_cost = 1 steel_sheet_cost = 1

0
code/modules/modular_computers/file_system/programs/ntmonitor.dm → code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm
View File

2
code/modules/modular_computers/file_system/programs/security/secureye.dm
View File

@@ -9,7 +9,7 @@
extended_desc = "This program allows access to standard security camera networks." extended_desc = "This program allows access to standard security camera networks."
requires_ntnet = TRUE requires_ntnet = TRUE
transfer_access = ACCESS_BRIG transfer_access = ACCESS_BRIG
usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_INTEGRATED // Probably not a good idea to let borgs use this, though im curious how it will pan out usage_flags = PROGRAM_LAPTOP |PROGRAM_STATIONARY| PROGRAM_INTEGRATED // Probably not a good idea to let borgs use this, though im curious how it will pan out
size = 10 size = 10
tgui_id = "NtosSecurEye" tgui_id = "NtosSecurEye"
program_icon = "eye" program_icon = "eye"

6
code/modules/modular_computers/hardware/CPU.dm
View File

@@ -22,7 +22,7 @@
icon_state = "cpu" icon_state = "cpu"
w_class = WEIGHT_CLASS_TINY w_class = WEIGHT_CLASS_TINY
power_usage = 25 power_usage = 25
max_idle_programs = 1 max_idle_programs = 2
/obj/item/computer_hardware/processor_unit/photonic /obj/item/computer_hardware/processor_unit/photonic
name = "photonic processor board" name = "photonic processor board"
@@ -38,7 +38,7 @@
icon_state = "cpu_super" icon_state = "cpu_super"
w_class = WEIGHT_CLASS_TINY w_class = WEIGHT_CLASS_TINY
power_usage = 75 power_usage = 75
max_idle_programs = 2 max_idle_programs = 3
/obj/item/computer_hardware/processor_unit/pda /obj/item/computer_hardware/processor_unit/pda
name = "cheep microprocessor" name = "cheep microprocessor"
@@ -46,7 +46,7 @@
icon_state = "cpu" icon_state = "cpu"
w_class = WEIGHT_CLASS_TINY w_class = WEIGHT_CLASS_TINY
power_usage = 25 power_usage = 25
max_idle_programs = 2 max_idle_programs = 1
/obj/item/computer_hardware/processor_unit/pda/can_install(obj/item/modular_computer/M, mob/living/user) /obj/item/computer_hardware/processor_unit/pda/can_install(obj/item/modular_computer/M, mob/living/user)
if(!istype(M, /obj/item/modular_computer/tablet)) if(!istype(M, /obj/item/modular_computer/tablet))

4
code/modules/modular_computers/hardware/network_card.dm
View File

@@ -68,7 +68,7 @@
icon_state = "radio" icon_state = "radio"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
w_class = WEIGHT_CLASS_TINY w_class = WEIGHT_CLASS_SMALL
/obj/item/computer_hardware/network_card/wired /obj/item/computer_hardware/network_card/wired
name = "wired network card" name = "wired network card"
@@ -76,7 +76,7 @@
ethernet = 1 ethernet = 1
power_usage = 100 // Better range but higher power usage. power_usage = 100 // Better range but higher power usage.
icon_state = "net_wired" icon_state = "net_wired"
w_class = WEIGHT_CLASS_BULKY w_class = WEIGHT_CLASS_NORMAL
/obj/item/computer_hardware/network_card/integrated //Borg tablet version, only works while the borg has power and is not locked /obj/item/computer_hardware/network_card/integrated //Borg tablet version, only works while the borg has power and is not locked
name = "cyborg data link" name = "cyborg data link"

2
yogstation.dme
View File

@@ -3065,7 +3065,6 @@
#include "code\modules\modular_computers\file_system\programs\file_browser.dm" #include "code\modules\modular_computers\file_system\programs\file_browser.dm"
#include "code\modules\modular_computers\file_system\programs\minesweeper.dm" #include "code\modules\modular_computers\file_system\programs\minesweeper.dm"
#include "code\modules\modular_computers\file_system\programs\ntdownloader.dm" #include "code\modules\modular_computers\file_system\programs\ntdownloader.dm"
#include "code\modules\modular_computers\file_system\programs\ntmonitor.dm"
#include "code\modules\modular_computers\file_system\programs\ntnrc_client.dm" #include "code\modules\modular_computers\file_system\programs\ntnrc_client.dm"
#include "code\modules\modular_computers\file_system\programs\ntpda_msg.dm" #include "code\modules\modular_computers\file_system\programs\ntpda_msg.dm"
#include "code\modules\modular_computers\file_system\programs\paperworkprinter.dm" #include "code\modules\modular_computers\file_system\programs\paperworkprinter.dm"
@@ -3085,6 +3084,7 @@
#include "code\modules\modular_computers\file_system\programs\engineering\alarm.dm" #include "code\modules\modular_computers\file_system\programs\engineering\alarm.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\atmosscan.dm" #include "code\modules\modular_computers\file_system\programs\engineering\atmosscan.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\energyharvestercontrol.dm" #include "code\modules\modular_computers\file_system\programs\engineering\energyharvestercontrol.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\ntmonitor.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\powermonitor.dm" #include "code\modules\modular_computers\file_system\programs\engineering\powermonitor.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\reactor_monitor.dm" #include "code\modules\modular_computers\file_system\programs\engineering\reactor_monitor.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\sm_monitor.dm" #include "code\modules\modular_computers\file_system\programs\engineering\sm_monitor.dm"