cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-11 16:14:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finishes id computer

Browse Source 
adds designs for computer parts to rnd and cases to the autolathe.
This commit is contained in:
Shadowlight213
2016-08-09 22:55:07 -07:00
parent 6bb69d760e
commit 8035651400
37 changed files with 744 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/hardware/battery_module.dm
+7 -7
View File
@@ -6,7 +6,7 @@
icon_state = "battery_normal"
critical = 1
malfunction_probability = 1
origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1)
origin_tech = list("powerstorage" = 1, "engineering" = 1)
var/battery_rating = 750
var/obj/item/weapon/stock_parts/cell/battery = null
@@ -14,7 +14,7 @@
name = "advanced battery"
desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. It's rating is 1100."
icon_state = "battery_advanced"
origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2)
origin_tech = list("powerstorage" = 2, "engineering" = 2)
hardware_size = 2
battery_rating = 1100
@@ -22,15 +22,15 @@
name = "super battery"
desc = "A very advanced power cell, often used in high-end devices, or as uninterruptable power supply for important consoles or servers. It's rating is 1500."
icon_state = "battery_super"
origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3)
hardware_size = 1 //temp for testmerge
origin_tech = list("powerstorage" = 3, "engineering" = 3)
hardware_size = 2
battery_rating = 1500
/obj/item/weapon/computer_hardware/battery_module/ultra
name = "ultra battery"
desc = "A very advanced large power cell. It's often used as uninterruptable power supply for critical consoles or servers. It's rating is 2000."
icon_state = "battery_ultra"
origin_tech = list(TECH_POWER = 5, TECH_ENGINEERING = 4)
origin_tech = list("powerstorage" = 5, "engineering" = 4)
hardware_size = 3
battery_rating = 2000
@@ -38,14 +38,14 @@
name = "micro battery"
desc = "A small power cell, commonly seen in most portable microcomputers. It's rating is 500."
icon_state = "battery_micro"
origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2)
origin_tech = list("powerstorage" = 2, "engineering" = 2)
battery_rating = 500
/obj/item/weapon/computer_hardware/battery_module/nano
name = "nano battery"
desc = "A tiny power cell, commonly seen in low-end portable microcomputers. It's rating is 300."
icon_state = "battery_nano"
origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1)
origin_tech = list("powerstorage" = 1, "engineering" = 1)
battery_rating = 300
// This is not intended to be obtainable in-game. Intended for adminbus and debugging purposes.
code/modules/modular_computers/hardware/card_slot.dm
+4 -1
View File
@@ -5,14 +5,17 @@
critical = 0
icon_state = "cardreader"
hardware_size = 1
origin_tech = list(TECH_DATA = 2)
origin_tech = list("programming" = 2)
var/obj/item/weapon/card/id/stored_card = null
var/obj/item/weapon/card/id/stored_card2 = null
/obj/item/weapon/computer_hardware/card_slot/Destroy()
if(holder2 && (holder2.card_slot == src))
holder2.card_slot = null
if(stored_card)
stored_card.forceMove(get_turf(holder2))
if(stored_card2)
stored_card2.forceMove(get_turf(holder2))
holder2 = null
..()
code/modules/modular_computers/hardware/hard_drive.dm
+6 -6
View File
@@ -4,7 +4,7 @@
power_usage = 25 // SSD or something with low power usage
icon_state = "hdd_normal"
hardware_size = 1
origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
origin_tech = list("programming" = 1, "engineering" = 1)
var/max_capacity = 128
var/used_capacity = 0
var/list/stored_files = list() // List of stored files on this drive. DO NOT MODIFY DIRECTLY!
@@ -13,7 +13,7 @@
name = "advanced hard drive"
desc = "A small hybrid hard drive with 256GQ of storage capacity for use in higher grade computers where balance between power efficiency and capacity is desired."
max_capacity = 256
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
origin_tech = list("programming" = 2, "engineering" = 2)
power_usage = 50 // Hybrid, medium capacity and medium power storage
icon_state = "hdd_advanced"
hardware_size = 2
@@ -22,7 +22,7 @@
name = "super hard drive"
desc = "A small hard drive with 512GQ of storage capacity for use in cluster storage solutions where capacity is more important than power efficiency."
max_capacity = 512
origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
origin_tech = list("programming" = 3, "engineering" = 3)
power_usage = 100 // High-capacity but uses lots of power, shortening battery life. Best used with APC link.
icon_state = "hdd_super"
hardware_size = 2
@@ -31,7 +31,7 @@
name = "cluster hard drive"
desc = "A large storage cluster consisting of multiple hard drives for usage in high capacity storage systems. Has capacity of 2048 GQ."
power_usage = 500
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
origin_tech = list("programming" = 4, "engineering" = 4)
max_capacity = 2048
icon_state = "hdd_cluster"
hardware_size = 3
@@ -41,7 +41,7 @@
name = "small hard drive"
desc = "A small highly efficient solid state drive for portable devices."
power_usage = 10
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
origin_tech = list("programming" = 2, "engineering" = 2)
max_capacity = 64
icon_state = "hdd_small"
hardware_size = 1
@@ -50,7 +50,7 @@
name = "micro hard drive"
desc = "A small micro hard drive for portable devices."
power_usage = 2
origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
origin_tech = list("programming" = 1, "engineering" = 1)
max_capacity = 32
icon_state = "hdd_micro"
hardware_size = 1
code/modules/modular_computers/hardware/nano_printer.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "nano printer"
desc = "Small integrated printer with paper recycling module."
power_usage = 50
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
origin_tech = list("programming" = 2, "engineering" = 2)
critical = 0
icon_state = "printer"
hardware_size = 1
code/modules/modular_computers/hardware/network_card.dm
+3 -3
View File
@@ -4,7 +4,7 @@ var/global/ntnet_card_uid = 1
name = "basic NTNet network card"
desc = "A basic network card for usage with standard NTNet frequencies."
power_usage = 50
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1)
origin_tech = list("programming" = 2, TECH_ENGINEERING = 1)
critical = 0
icon_state = "netcard_basic"
hardware_size = 1
@@ -34,7 +34,7 @@ var/global/ntnet_card_uid = 1
name = "advanced NTNet network card"
desc = "An advanced network card for usage with standard NTNet frequencies. It's transmitter is strong enough to connect even off-station."
long_range = 1
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 2)
origin_tech = list("programming" = 4, "engineering" = 2)
power_usage = 100 // Better range but higher power usage.
icon_state = "netcard_advanced"
hardware_size = 1
@@ -43,7 +43,7 @@ var/global/ntnet_card_uid = 1
name = "wired NTNet network card"
desc = "An advanced network card for usage with standard NTNet frequencies. This one also supports wired connection."
ethernet = 1
origin_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 3)
origin_tech = list("programming" = 5, "engineering" = 3)
power_usage = 100 // Better range but higher power usage.
icon_state = "netcard_ethernet"
hardware_size = 3
code/modules/modular_computers/hardware/portable_hard_drive.dm
+3 -3
View File
@@ -6,7 +6,7 @@
icon_state = "flashdrive_basic"
hardware_size = 1
max_capacity = 16
origin_tech = list(TECH_DATA = 1)
origin_tech = list("programming" = 1)
/obj/item/weapon/computer_hardware/hard_drive/portable/advanced
name = "advanced data crystal"
@@ -15,7 +15,7 @@
icon_state = "flashdrive_advanced"
hardware_size = 1
max_capacity = 64
origin_tech = list(TECH_DATA = 2)
origin_tech = list("programming" = 2)
/obj/item/weapon/computer_hardware/hard_drive/portable/super
name = "super data crystal"
@@ -24,7 +24,7 @@
icon_state = "flashdrive_super"
hardware_size = 1
max_capacity = 256
origin_tech = list(TECH_DATA = 4)
origin_tech = list("programming" = 4)
/obj/item/weapon/computer_hardware/hard_drive/portable/New()
..()
code/modules/modular_computers/hardware/processor_unit.dm
+4 -4
View File
@@ -9,7 +9,7 @@
power_usage = 50
critical = 1
malfunction_probability = 1
origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2)
origin_tech = list("programming" = 3, "engineering" = 2)
var/max_idle_programs = 2 // 2 idle, + 1 active = 3 as said in description.
@@ -20,7 +20,7 @@
hardware_size = 1
power_usage = 25
max_idle_programs = 1
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
origin_tech = list("programming" = 2, "engineering" = 2)
/obj/item/weapon/computer_hardware/processor_unit/photonic
name = "photonic processor"
@@ -29,7 +29,7 @@
hardware_size = 2
power_usage = 250
max_idle_programs = 4
origin_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 4)
origin_tech = list("programming" = 5, "engineering" = 4)
/obj/item/weapon/computer_hardware/processor_unit/photonic/small
name = "photonic microprocessor"
@@ -38,4 +38,4 @@
hardware_size = 1
power_usage = 75
max_idle_programs = 2
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3)
origin_tech = list("programming" = 4, "engineering" = 3)
code/modules/modular_computers/hardware/tesla_link.dm
+1 -1
View File
@@ -5,7 +5,7 @@
enabled = 1
icon_state = "teslalink"
hardware_size = 2 // Can't be installed into tablets
origin_tech = list(TECH_DATA = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
origin_tech = list("programming" = 2, "powerstorage" = 3, "engineering" = 2)
var/obj/machinery/modular_computer/holder
/obj/item/weapon/computer_hardware/tesla_link/New(var/obj/L)