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

Massive research refactor; changes research system to techwebs; Decentralized research

Browse Source
This commit is contained in:
kevinz000
2017-11-03 03:29:20 -07:00
committed by kevinz000
parent dabd669913
commit caa1e1f400
329 changed files with 5694 additions and 4220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/modular_computers/NTNet/NTNet_relay.dm
View File

@@ -119,4 +119,4 @@
D.target = null
D.error = "Connection to quantum relay severed"
return ..()
return ..()

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

@@ -9,7 +9,6 @@
power_usage = 50
critical = 1
malfunction_probability = 1
origin_tech = "programming=3;engineering=2"
var/max_idle_programs = 2 // 2 idle, + 1 active = 3 as said in description.
device_type = MC_CPU
@@ -23,7 +22,6 @@
w_class = WEIGHT_CLASS_TINY
power_usage = 25
max_idle_programs = 1
origin_tech = "programming=2;engineering=2"
/obj/item/computer_hardware/processor_unit/photonic
name = "photonic processor board"
@@ -32,7 +30,6 @@
w_class = WEIGHT_CLASS_SMALL
power_usage = 250
max_idle_programs = 4
origin_tech = "programming=5;engineering=4"
/obj/item/computer_hardware/processor_unit/photonic/small
name = "photonic microprocessor"
@@ -40,5 +37,4 @@
icon_state = "cpu_super"
w_class = WEIGHT_CLASS_TINY
power_usage = 75
max_idle_programs = 2
origin_tech = "programming=4;engineering=3"
max_idle_programs = 2

1
code/modules/modular_computers/hardware/ai_slot.dm
View File

@@ -4,7 +4,6 @@
power_usage = 100 //W
icon_state = "card_mini"
w_class = WEIGHT_CLASS_SMALL
origin_tech = "programming=2"
device_type = MC_AI
var/obj/item/device/aicard/stored_card = null

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

@@ -4,7 +4,6 @@
icon_state = "cell_con"
critical = 1
malfunction_probability = 1
origin_tech = "powerstorage=1;engineering=1"
var/obj/item/stock_parts/cell/battery = null
device_type = MC_CELL
@@ -64,7 +63,6 @@
desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops."
icon = 'icons/obj/module.dmi'
icon_state = "cell_mini"
origin_tech = "powerstorage=2;engineering=1"
w_class = WEIGHT_CLASS_TINY
maxcharge = 750
@@ -73,7 +71,6 @@
name = "advanced battery"
desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices."
icon_state = "cell"
origin_tech = "powerstorage=2;engineering=2"
w_class = WEIGHT_CLASS_SMALL
maxcharge = 1500
@@ -81,7 +78,6 @@
name = "super battery"
desc = "An advanced power cell, often used in high-end laptops."
icon_state = "cell"
origin_tech = "powerstorage=3;engineering=3"
w_class = WEIGHT_CLASS_SMALL
maxcharge = 2000

1
code/modules/modular_computers/hardware/card_slot.dm
View File

@@ -4,7 +4,6 @@
power_usage = 10 //W
icon_state = "card_mini"
w_class = WEIGHT_CLASS_TINY
origin_tech = "programming=2"
device_type = MC_CARD
var/obj/item/card/id/stored_card = null

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

@@ -5,7 +5,6 @@
icon_state = "harddisk_mini"
critical = 1
w_class = WEIGHT_CLASS_TINY
origin_tech = "programming=1;engineering=1"
device_type = MC_HDD
var/max_capacity = 128
var/used_capacity = 0
@@ -130,7 +129,6 @@
name = "advanced hard disk drive"
desc = "A hybrid HDD, for use in higher grade computers where balance between power efficiency and capacity is desired."
max_capacity = 256
origin_tech = "programming=2;engineering=2"
power_usage = 50 // Hybrid, medium capacity and medium power storage
icon_state = "harddisk_mini"
w_class = WEIGHT_CLASS_SMALL
@@ -139,7 +137,6 @@
name = "super hard disk drive"
desc = "A high capacity HDD, for use in cluster storage solutions where capacity is more important than power efficiency."
max_capacity = 512
origin_tech = "programming=3;engineering=3"
power_usage = 100 // High-capacity but uses lots of power, shortening battery life. Best used with APC link.
icon_state = "harddisk_mini"
w_class = WEIGHT_CLASS_SMALL
@@ -148,7 +145,6 @@
name = "cluster hard disk drive"
desc = "A large storage cluster consisting of multiple HDDs for usage in dedicated storage systems."
power_usage = 500
origin_tech = "programming=4;engineering=4"
max_capacity = 2048
icon_state = "harddisk"
w_class = WEIGHT_CLASS_NORMAL
@@ -158,7 +154,6 @@
name = "solid state drive"
desc = "An efficient SSD for portable devices."
power_usage = 10
origin_tech = "programming=2;engineering=2"
max_capacity = 64
icon_state = "ssd_mini"
w_class = WEIGHT_CLASS_TINY
@@ -167,7 +162,6 @@
name = "micro solid state drive"
desc = "A highly efficient SSD chip for portable devices."
power_usage = 2
origin_tech = "programming=1;engineering=1"
max_capacity = 32
icon_state = "ssd_micro"
w_class = WEIGHT_CLASS_TINY

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

@@ -2,7 +2,6 @@
name = "network card"
desc = "A basic wireless network card for usage with standard NTNet frequencies."
power_usage = 50
origin_tech = "programming=2;engineering=1"
icon_state = "radio_mini"
var/identification_id = null // Identification ID. Technically MAC address of this device. Can't be changed by user.
var/identification_string = "" // Identification string, technically nickname seen in the network. Can be set by user.
@@ -65,7 +64,6 @@
name = "advanced network card"
desc = "An advanced network card for usage with standard NTNet frequencies. Its transmitter is strong enough to connect even off-station."
long_range = 1
origin_tech = "programming=4;engineering=2"
power_usage = 100 // Better range but higher power usage.
icon_state = "radio"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -76,7 +74,6 @@
name = "wired network card"
desc = "An advanced network card for usage with standard NTNet frequencies. This one also supports wired connection."
ethernet = 1
origin_tech = "programming=5;engineering=3"
power_usage = 100 // Better range but higher power usage.
icon_state = "net_wired"
w_class = WEIGHT_CLASS_NORMAL

3
code/modules/modular_computers/hardware/portable_disk.dm
View File

@@ -6,7 +6,6 @@
w_class = WEIGHT_CLASS_TINY
critical = 0
max_capacity = 16
origin_tech = "programming=1"
device_type = MC_SDD
/obj/item/computer_hardware/hard_drive/portable/on_install(obj/item/device/modular_computer/M, mob/living/user = null)
@@ -24,7 +23,6 @@
power_usage = 20
icon_state = "datadisk5"
max_capacity = 64
origin_tech = "programming=2"
/obj/item/computer_hardware/hard_drive/portable/super
name = "super data disk"
@@ -32,4 +30,3 @@
power_usage = 40
icon_state = "datadisk3"
max_capacity = 256
origin_tech = "programming=4"

1
code/modules/modular_computers/hardware/printer.dm
View File

@@ -2,7 +2,6 @@
name = "printer"
desc = "Computer-integrated printer with paper recycling module."
power_usage = 100
origin_tech = "programming=2;engineering=2"
icon_state = "printer"
w_class = WEIGHT_CLASS_NORMAL
device_type = MC_PRINT

2
code/modules/modular_computers/hardware/recharger.dm
View File

@@ -28,7 +28,6 @@
desc = "A device that wirelessly recharges connected device from nearby APC."
icon_state = "charger_APC"
w_class = WEIGHT_CLASS_SMALL // Can't be installed into tablets/PDAs
origin_tech = "programming=2;engineering=2;powerstorage=3"
/obj/item/computer_hardware/recharger/APC/use_power(amount, charging=0)
if(ismachinery(holder.physical))
@@ -52,7 +51,6 @@
desc = "A power connector that recharges connected device from nearby power wire. Incompatible with portable computers."
icon_state = "charger_wire"
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "engineering=2;powerstorage=1"
/obj/item/computer_hardware/recharger/wired/can_install(obj/item/device/modular_computer/M, mob/living/user = null)
if(ismachinery(M.physical) && M.physical.anchored)