cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes Weapons (#7415)

Browse Source 
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/NTNet/NTNet.dm
+1 -1
View File
@@ -39,7 +39,7 @@ var/global/datum/ntnet/ntnet_global = new()
add_log("NTNet logging system activated.")
// Simplified logging: Adds a log. log_string is mandatory parameter, source is optional.
/datum/ntnet/proc/add_log(var/log_string, var/obj/item/weapon/computer_hardware/network_card/source = null)
/datum/ntnet/proc/add_log(var/log_string, var/obj/item/computer_hardware/network_card/source = null)
var/log_text = "[worldtime2text()] - "
if(source)
log_text += "[source.get_network_tag()] - "
code/modules/modular_computers/NTNet/NTNet_relay.dm
+2 -2
View File
@@ -21,7 +21,7 @@
component_types = list(
/obj/item/stack/cable_coil{amount = 15},
/obj/item/weapon/circuitboard/ntnet_relay
/obj/item/circuitboard/ntnet_relay
)
// TODO: Implement more logic here. For now it's only a placeholder.
@@ -127,7 +127,7 @@
D.error = "Connection to quantum relay severed"
return ..()
/obj/machinery/ntnet_relay/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/ntnet_relay/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(W.isscrewdriver())
playsound(src.loc, W.usesound, 50, 1)
panel_open = !panel_open
code/modules/modular_computers/computers/modular_computer/core.dm
+1 -1
View File
@@ -65,7 +65,7 @@
/obj/item/modular_computer/Destroy()
kill_program(1)
for(var/obj/item/weapon/computer_hardware/CH in src.get_all_components())
for(var/obj/item/computer_hardware/CH in src.get_all_components())
uninstall_component(null, CH)
qdel(CH)
STOP_PROCESSING(SSprocessing, src)
code/modules/modular_computers/computers/modular_computer/damage.dm
+2 -2
View File
@@ -9,7 +9,7 @@
visible_message("\The [src] breaks apart!")
var/turf/newloc = get_turf(src)
new /obj/item/stack/material/steel(newloc, round(steel_sheet_cost/2))
for(var/obj/item/weapon/computer_hardware/H in get_all_components())
for(var/obj/item/computer_hardware/H in get_all_components())
uninstall_component(null, H)
H.forceMove(newloc)
if(prob(25))
@@ -27,7 +27,7 @@
damage = between(0, damage, max_damage)
if(component_probability)
for(var/obj/item/weapon/computer_hardware/H in get_all_components())
for(var/obj/item/computer_hardware/H in get_all_components())
if(prob(component_probability))
H.take_damage(round(amount / 2))
code/modules/modular_computers/computers/modular_computer/hardware.dm
+11 -11
View File
@@ -1,7 +1,7 @@
// Attempts to install the hardware into appropriate slot.
/obj/item/modular_computer/proc/try_install_component(var/mob/living/user, var/obj/item/weapon/computer_hardware/H, var/found = 0)
/obj/item/modular_computer/proc/try_install_component(var/mob/living/user, var/obj/item/computer_hardware/H, var/found = 0)
// "USB" flash drive.
if(istype(H, /obj/item/weapon/computer_hardware/hard_drive/portable))
if(istype(H, /obj/item/computer_hardware/hard_drive/portable))
if(enrolled == 1 && !computer_emagged)
to_chat(user, "The client management software on this computer rejects \the [portable_drive].")
return
@@ -10,49 +10,49 @@
return
found = 1
portable_drive = H
else if(istype(H, /obj/item/weapon/computer_hardware/hard_drive))
else if(istype(H, /obj/item/computer_hardware/hard_drive))
if(hard_drive)
to_chat(user, "This computer's hard drive slot is already occupied by \the [hard_drive].")
return
found = 1
hard_drive = H
else if(istype(H, /obj/item/weapon/computer_hardware/network_card))
else if(istype(H, /obj/item/computer_hardware/network_card))
if(network_card)
to_chat(user, "This computer's network card slot is already occupied by \the [network_card].")
return
found = 1
network_card = H
else if(istype(H, /obj/item/weapon/computer_hardware/nano_printer))
else if(istype(H, /obj/item/computer_hardware/nano_printer))
if(nano_printer)
to_chat(user, "This computer's nano printer slot is already occupied by \the [nano_printer].")
return
found = 1
nano_printer = H
else if(istype(H, /obj/item/weapon/computer_hardware/card_slot))
else if(istype(H, /obj/item/computer_hardware/card_slot))
if(card_slot)
to_chat(user, "This computer's card slot is already occupied by \the [card_slot].")
return
found = 1
card_slot = H
else if(istype(H, /obj/item/weapon/computer_hardware/battery_module))
else if(istype(H, /obj/item/computer_hardware/battery_module))
if(battery_module)
to_chat(user, "This computer's battery slot is already occupied by \the [battery_module].")
return
found = 1
battery_module = H
else if(istype(H, /obj/item/weapon/computer_hardware/processor_unit))
else if(istype(H, /obj/item/computer_hardware/processor_unit))
if(processor_unit)
to_chat(user, "This computer's processor slot is already occupied by \the [processor_unit].")
return
found = 1
processor_unit = H
else if(istype(H, /obj/item/weapon/computer_hardware/ai_slot))
else if(istype(H, /obj/item/computer_hardware/ai_slot))
if(ai_slot)
to_chat(user, "This computer's intellicard slot is already occupied by \the [ai_slot].")
return
found = 1
ai_slot = H
else if(istype(H, /obj/item/weapon/computer_hardware/tesla_link))
else if(istype(H, /obj/item/computer_hardware/tesla_link))
if(tesla_link)
to_chat(user, "This computer's tesla link slot is already occupied by \the [tesla_link].")
return
@@ -65,7 +65,7 @@
update_icon()
// Uninstalls component. Found and Critical vars may be passed by parent types, if they have additional hardware.
/obj/item/modular_computer/proc/uninstall_component(var/mob/living/user, var/obj/item/weapon/computer_hardware/H, var/found = 0, var/critical = 0)
/obj/item/modular_computer/proc/uninstall_component(var/mob/living/user, var/obj/item/computer_hardware/H, var/found = 0, var/critical = 0)
if(portable_drive == H)
portable_drive = null
found = 1
code/modules/modular_computers/computers/modular_computer/interaction.dm
+10 -10
View File
@@ -123,9 +123,9 @@
else if(!enabled && screen_on)
turn_on(user)
/obj/item/modular_computer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if(istype(W, /obj/item/weapon/card/id)) // ID Card, try to insert it.
var/obj/item/weapon/card/id/I = W
/obj/item/modular_computer/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(istype(W, /obj/item/card/id)) // ID Card, try to insert it.
var/obj/item/card/id/I = W
if(!card_slot)
to_chat(user, "You try to insert \the [I] into \the [src], but it does not have an ID card slot installed.")
return
@@ -138,16 +138,16 @@
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/paper))
if(!nano_printer)
return
nano_printer.attackby(W, user)
if(istype(W, /obj/item/weapon/aicard))
if(istype(W, /obj/item/aicard))
if(!ai_slot)
return
ai_slot.attackby(W, user)
if(istype(W, /obj/item/weapon/computer_hardware))
var/obj/item/weapon/computer_hardware/C = W
if(istype(W, /obj/item/computer_hardware))
var/obj/item/computer_hardware/C = W
if(C.hardware_size <= max_hardware_size)
try_install_component(user, C)
else
@@ -167,7 +167,7 @@
qdel(src)
return
if(W.iswelder())
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/weldingtool/WT = W
if(!WT.isOn())
to_chat(user, "\The [W] is off.")
return
@@ -190,7 +190,7 @@
to_chat(user, "This device doesn't have any components installed.")
return
var/list/component_names = list()
for(var/obj/item/weapon/computer_hardware/H in all_components)
for(var/obj/item/computer_hardware/H in all_components)
component_names.Add(H.name)
var/choice = input(usr, "Which component do you want to uninstall?", "Computer maintenance", null) as null|anything in component_names
@@ -201,7 +201,7 @@
if(!Adjacent(usr))
return
var/obj/item/weapon/computer_hardware/H = find_hardware_by_name(choice)
var/obj/item/computer_hardware/H = find_hardware_by_name(choice)
if(!H)
return
code/modules/modular_computers/computers/modular_computer/power.dm
+1 -1
View File
@@ -42,7 +42,7 @@
/obj/item/modular_computer/proc/handle_power()
var/power_usage = screen_on ? base_active_power_usage : base_idle_power_usage
if (enabled)
for(var/obj/item/weapon/computer_hardware/H in get_all_components())
for(var/obj/item/computer_hardware/H in get_all_components())
if(H.enabled)
power_usage += H.power_usage
last_power_usage = power_usage
code/modules/modular_computers/computers/modular_computer/ui.dm
+2 -2
View File
@@ -60,12 +60,12 @@
kill_program()
return 1
if( href_list["PC_enable_component"] )
var/obj/item/weapon/computer_hardware/H = find_hardware_by_name(href_list["PC_enable_component"])
var/obj/item/computer_hardware/H = find_hardware_by_name(href_list["PC_enable_component"])
if(H && istype(H) && !H.enabled)
H.enabled = 1
. = 1
if( href_list["PC_disable_component"] )
var/obj/item/weapon/computer_hardware/H = find_hardware_by_name(href_list["PC_disable_component"])
var/obj/item/computer_hardware/H = find_hardware_by_name(href_list["PC_disable_component"])
if(H && istype(H) && H.enabled)
H.enabled = 0
. = 1
code/modules/modular_computers/computers/modular_computer/variables.dm
+9 -9
View File
@@ -49,17 +49,17 @@
var/max_damage = 100 // Damage level at which the computer breaks apart.
// Important hardware (must be installed for computer to work)
var/obj/item/weapon/computer_hardware/processor_unit/processor_unit // CPU. Without it the computer won't run. Better CPUs can run more programs at once.
var/obj/item/weapon/computer_hardware/network_card/network_card // Network Card component of this computer. Allows connection to NTNet
var/obj/item/weapon/computer_hardware/hard_drive/hard_drive // Hard Drive component of this computer. Stores programs and files.
var/obj/item/computer_hardware/processor_unit/processor_unit // CPU. Without it the computer won't run. Better CPUs can run more programs at once.
var/obj/item/computer_hardware/network_card/network_card // Network Card component of this computer. Allows connection to NTNet
var/obj/item/computer_hardware/hard_drive/hard_drive // Hard Drive component of this computer. Stores programs and files.
// Optional hardware (improves functionality, but is not critical for computer to work in most cases)
var/obj/item/weapon/computer_hardware/battery_module/battery_module // An internal power source for this computer. Can be recharged.
var/obj/item/weapon/computer_hardware/card_slot/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification.
var/obj/item/weapon/computer_hardware/nano_printer/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs.
var/obj/item/weapon/computer_hardware/hard_drive/portable/portable_drive // Portable data storage
var/obj/item/weapon/computer_hardware/ai_slot/ai_slot // AI slot, an intellicard housing that allows modifications of AIs.
var/obj/item/weapon/computer_hardware/tesla_link/tesla_link // Tesla Link, Allows remote charging from nearest APC.
var/obj/item/computer_hardware/battery_module/battery_module // An internal power source for this computer. Can be recharged.
var/obj/item/computer_hardware/card_slot/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification.
var/obj/item/computer_hardware/nano_printer/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs.
var/obj/item/computer_hardware/hard_drive/portable/portable_drive // Portable data storage
var/obj/item/computer_hardware/ai_slot/ai_slot // AI slot, an intellicard housing that allows modifications of AIs.
var/obj/item/computer_hardware/tesla_link/tesla_link // Tesla Link, Allows remote charging from nearest APC.
var/listener/listener //Listener needed for things
code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
+1 -1
View File
@@ -17,7 +17,7 @@
w_class = 5
is_holographic = TRUE
/obj/item/modular_computer/telescreen/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/item/modular_computer/telescreen/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(W.iscrowbar())
if(anchored)
shutdown_computer()
code/modules/modular_computers/computers/subtypes/preset_console.dm
+20 -20
View File
@@ -11,10 +11,10 @@
/obj/item/modular_computer/console/preset/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(src)
network_card = new/obj/item/weapon/computer_hardware/network_card/wired(src)
processor_unit = new/obj/item/computer_hardware/processor_unit(src)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/super(src)
network_card = new/obj/item/computer_hardware/network_card/wired(src)
/obj/item/modular_computer/console/preset/install_default_programs()
..()
@@ -37,7 +37,7 @@
/obj/item/modular_computer/console/preset/research/install_default_hardware()
..()
ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src)
ai_slot = new/obj/item/computer_hardware/ai_slot(src)
// Command
/obj/item/modular_computer/console/preset/command/
@@ -46,10 +46,10 @@
/obj/item/modular_computer/console/preset/command/install_default_hardware()
..()
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
nano_printer.max_paper = 25
nano_printer.stored_paper = 20
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
/obj/item/modular_computer/console/preset/captain/
_app_preset_name = "captain"
@@ -57,10 +57,10 @@
/obj/item/modular_computer/console/preset/captain/install_default_hardware()
..()
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
nano_printer.max_paper = 25
nano_printer.stored_paper = 20
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
// Security
/obj/item/modular_computer/console/preset/security/
@@ -79,19 +79,19 @@
/obj/item/modular_computer/console/preset/supply/install_default_hardware()
..()
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
nano_printer.max_paper = 25
nano_printer.stored_paper = 20
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
// ERT
/obj/item/modular_computer/console/preset/ert/install_default_hardware()
..()
ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src)
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
ai_slot = new/obj/item/computer_hardware/ai_slot(src)
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
nano_printer.max_paper = 25
nano_printer.stored_paper = 20
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
/obj/item/modular_computer/console/preset/ert/
_app_preset_name = "ert"
@@ -106,9 +106,9 @@
/obj/item/modular_computer/console/preset/mercenary/install_default_hardware()
..()
ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src)
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
ai_slot = new/obj/item/computer_hardware/ai_slot(src)
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
// Merchant
@@ -118,9 +118,9 @@
/obj/item/modular_computer/console/preset/merchant/install_default_hardware()
..()
ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src)
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
ai_slot = new/obj/item/computer_hardware/ai_slot(src)
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
// AI
code/modules/modular_computers/computers/subtypes/preset_tablet.dm
+10 -10
View File
@@ -1,19 +1,19 @@
/obj/item/modular_computer/tablet/preset/custom_loadout/cheap/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/micro(src)
network_card = new/obj/item/weapon/computer_hardware/network_card(src)
battery_module = new/obj/item/weapon/computer_hardware/battery_module/nano(src)
processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/micro(src)
network_card = new/obj/item/computer_hardware/network_card(src)
battery_module = new/obj/item/computer_hardware/battery_module/nano(src)
battery_module.charge_to_full()
/obj/item/modular_computer/tablet/preset/custom_loadout/advanced/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/weapon/computer_hardware/network_card(src)
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
battery_module = new/obj/item/weapon/computer_hardware/battery_module(src)
processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/computer_hardware/network_card(src)
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
battery_module = new/obj/item/computer_hardware/battery_module(src)
battery_module.charge_to_full()
code/modules/modular_computers/computers/subtypes/preset_telescreen.dm
+4 -4
View File
@@ -1,9 +1,9 @@
/obj/item/modular_computer/telescreen/preset/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(src)
network_card = new/obj/item/weapon/computer_hardware/network_card(src)
processor_unit = new/obj/item/computer_hardware/processor_unit(src)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive(src)
network_card = new/obj/item/computer_hardware/network_card(src)
/obj/item/modular_computer/telescreen/preset/generic/
_app_preset_name = "wallgeneric"
code/modules/modular_computers/file_system/computer_file.dm
+1 -1
View File
@@ -4,7 +4,7 @@ var/global/file_uid = 0
var/filename = "NewFile" // Placeholder. No spacebars
var/filetype = "XXX" // File full names are [filename].[filetype] so like NewFile.XXX in this case
var/size = 1 // File size in GQ. Integers only!
var/obj/item/weapon/computer_hardware/hard_drive/holder // Holder that contains this file.
var/obj/item/computer_hardware/hard_drive/holder // Holder that contains this file.
var/unsendable = 0 // Whether the file may be sent to someone via NTNet transfer or other means.
var/undeletable = 0 // Whether the file may be deleted. Setting to 1 prevents deletion/renaming/etc.
var/password = "" // Placeholder for password protected files.
code/modules/modular_computers/file_system/program.dm
+2 -2
View File
@@ -95,7 +95,7 @@
if(!istype(user))
return 0
var/obj/item/weapon/card/id/I = user.GetIdCard()
var/obj/item/card/id/I = user.GetIdCard()
if(!I)
if(loud)
to_chat(user, "<span class='danger'>\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.</span>")
@@ -143,7 +143,7 @@
if(!istype(user))
return 0
var/obj/item/weapon/card/id/I = user.GetIdCard()
var/obj/item/card/id/I = user.GetIdCard()
if(!I)
if(loud)
to_chat(user, "<span class='danger'>\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.</span>")
code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm
+1 -1
View File
@@ -30,7 +30,7 @@
data["status_message"] = status_message
//Pass the ID Data
var/obj/item/weapon/card/id/user_id_card = user.GetIdCard()
var/obj/item/card/id/user_id_card = user.GetIdCard()
last_user_name = GetNameAndAssignmentFromId(user_id_card)
data["username"] = last_user_name
code/modules/modular_computers/file_system/programs/civilian/cargo_delivery.dm
+3 -3
View File
@@ -29,7 +29,7 @@
mod_mode = 0 //We can't pay for orders when there is no card reader and no network card
if(program && program.computer && program.computer.card_slot)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
data["has_id"] = !!id_card
data["id_account_number"] = id_card ? id_card.associated_account_number : null
//data["id_rank"] = id_card && id_card.assignment ? id_card.assignment : "Unassigned"
@@ -76,7 +76,7 @@
return 1
if(program && program.computer && program.computer.card_slot && program.computer.network_card)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
if(!id_card || !id_card.registered_name)
status_message = "Card Error: Invalid ID Card in Card Reader"
return 1
@@ -117,7 +117,7 @@
var/mob/user = usr
if(!istype(user))
return
var/obj/item/weapon/card/id/I = user.GetIdCard()
var/obj/item/card/id/I = user.GetIdCard()
if(!istype(I) || !I.registered_name || !(access_cargo in I.access) || issilicon(user))
to_chat(user, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
return
code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm
+1 -1
View File
@@ -28,7 +28,7 @@
var/list/data = host.initial_data()
//Pass the ID Data
var/obj/item/weapon/card/id/user_id_card = user.GetIdCard()
var/obj/item/card/id/user_id_card = user.GetIdCard()
if(!user_id_card)
last_user_name = "Unknown"
else
code/modules/modular_computers/file_system/programs/command/card.dm
+7 -7
View File
@@ -38,7 +38,7 @@
data["centcom_access"] = is_centcom
if(program && program.computer && program.computer.card_slot)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
data["has_id"] = !!id_card
data["id_account_number"] = id_card ? id_card.associated_account_number : null
data["id_rank"] = id_card && id_card.assignment ? id_card.assignment : "Unassigned"
@@ -58,7 +58,7 @@
data["regions"] = get_accesses()
if(program.computer.card_slot.stored_card)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
if(is_centcom)
var/list/all_centcom_access = list()
for(var/access in get_all_centcom_access())
@@ -91,7 +91,7 @@
ui.open()
/datum/nano_module/program/card_mod/proc/format_jobs(list/jobs)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
var/list/formatted = list()
for(var/job in jobs)
formatted.Add(list(list(
@@ -110,8 +110,8 @@
return 1
var/mob/user = usr
var/obj/item/weapon/card/id/user_id_card = user.GetIdCard()
var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card
var/obj/item/card/id/user_id_card = user.GetIdCard()
var/obj/item/card/id/id_card = computer.card_slot.stored_card
var/datum/nano_module/program/card_mod/module = NM
switch(href_list["action"])
if("switchm")
@@ -235,8 +235,8 @@
SSnanoui.update_uis(NM)
return 1
/datum/computer_file/program/card_mod/proc/remove_nt_access(var/obj/item/weapon/card/id/id_card)
/datum/computer_file/program/card_mod/proc/remove_nt_access(var/obj/item/card/id/id_card)
id_card.access -= get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM)
/datum/computer_file/program/card_mod/proc/apply_access(var/obj/item/weapon/card/id/id_card, var/list/accesses)
/datum/computer_file/program/card_mod/proc/apply_access(var/obj/item/card/id/id_card, var/list/accesses)
id_card.access |= accesses
code/modules/modular_computers/file_system/programs/command/comm.dm
+1 -1
View File
@@ -136,7 +136,7 @@
if("announce")
if(is_autenthicated(user) && !issilicon(usr) && ntn_comm)
if(user)
var/obj/item/weapon/card/id/id_card = user.GetIdCard()
var/obj/item/card/id/id_card = user.GetIdCard()
crew_announcement.announcer = GetNameAndAssignmentFromId(id_card)
else
crew_announcement.announcer = "Unknown"
code/modules/modular_computers/file_system/programs/generic/news_browser.dm
+1 -1
View File
@@ -72,7 +72,7 @@
var/savename = sanitize(input(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename))
if(!savename)
return 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/data/news_article/N = loaded_article.clone()
code/modules/modular_computers/file_system/programs/generic/ntsl2_interpreter.dm
+2 -2
View File
@@ -30,7 +30,7 @@
if(href_list["PRG_execfile"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
var/datum/computer_file/data/F = HDD.find_file_by_name(href_list["PRG_execfile"])
if(istype(F))
var/oldtext = html_decode(F.stored_data)
@@ -72,7 +72,7 @@
else
return
var/obj/item/weapon/computer_hardware/hard_drive/HDD
var/obj/item/computer_hardware/hard_drive/HDD
if(!PRG.computer || !PRG.computer.hard_drive)
data["error"] = "I/O ERROR: Unable to access hard drive."
code/modules/modular_computers/file_system/programs/research/ai_restorer.dm
+1 -1
View File
@@ -73,7 +73,7 @@
A.switch_from_dead_to_living_mob_list()
A.add_ai_verbs()
A.updateicon()
var/obj/item/weapon/aicard/AC = A.loc
var/obj/item/aicard/AC = A.loc
if(AC)
AC.update_icon()
// Finished restoring
code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
+1 -1
View File
@@ -62,7 +62,7 @@
var/mob/user = usr
if(!istype(user))
return
var/obj/item/weapon/card/id/I = user.GetIdCard()
var/obj/item/card/id/I = user.GetIdCard()
if(!istype(I) || !I.registered_name || !(access_armory in I.access) || issilicon(user))
to_chat(user, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
return
code/modules/modular_computers/file_system/programs/system/configurator.dm
+1 -1
View File
@@ -49,7 +49,7 @@
VUEUI_SET_CHECK(data["battery"]["percent"], round(computer.battery_module.battery.percent()), ., data)
LAZYINITLIST(data["hardware"])
for(var/obj/item/weapon/computer_hardware/H in hardware)
for(var/obj/item/computer_hardware/H in hardware)
LAZYINITLIST(data["hardware"][H.name])
for(var/v in list("name", "desc", "enabled", "critical", "power_usage"))
VUEUI_SET_CHECK(data["hardware"][H.name][v], H.vars[v], ., data)
code/modules/modular_computers/file_system/programs/system/file_browser.dm
+16 -16
View File
@@ -19,7 +19,7 @@
if(href_list["PRG_openfile"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_openfile"])
if (!F)
return
@@ -32,7 +32,7 @@
var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename"))
if(!newname)
return 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/data/F = new/datum/computer_file/data()
@@ -41,7 +41,7 @@
HDD.store_file(F)
if(href_list["PRG_deletefile"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_deletefile"])
@@ -50,7 +50,7 @@
HDD.remove_file(file)
if(href_list["PRG_usbdeletefile"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive
var/obj/item/computer_hardware/hard_drive/RHDD = computer.portable_drive
if(!RHDD)
return 1
var/datum/computer_file/file = RHDD.find_file_by_name(href_list["PRG_usbdeletefile"])
@@ -63,7 +63,7 @@
error = null
if(href_list["PRG_clone"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_clone"])
@@ -73,7 +73,7 @@
HDD.store_file(C)
if(href_list["PRG_rename"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_rename"])
@@ -86,7 +86,7 @@
. = 1
if(!open_file)
return 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
@@ -117,7 +117,7 @@
. = 1
if(!open_file)
return 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
@@ -131,8 +131,8 @@
return 1
if(href_list["PRG_copytousb"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
if(!HDD || !RHDD || computer.enrolled != 2)
return 1
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_copytousb"])
@@ -142,8 +142,8 @@
RHDD.store_file(C)
if(href_list["PRG_copyfromusb"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
if(!HDD || !RHDD || computer.enrolled != 2)
return 1
var/datum/computer_file/F = RHDD.find_file_by_name(href_list["PRG_copyfromusb"])
@@ -153,7 +153,7 @@
HDD.store_file(C)
if(href_list["PRG_encrypt"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if (!HDD)
return
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_encrypt"])
@@ -164,7 +164,7 @@
F.password = sanitize(input(usr, "Enter an encryption key:", "Encrypt File"))
if(href_list["PRG_decrypt"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if (!HDD)
return
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_encrypt"])
@@ -186,8 +186,8 @@
//var/list/data = list("_PC" = program.get_header_data())
PRG = program
var/obj/item/weapon/computer_hardware/hard_drive/HDD
var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD
var/obj/item/computer_hardware/hard_drive/HDD
var/obj/item/computer_hardware/hard_drive/portable/RHDD
if(PRG.error)
data["error"] = PRG.error
if(PRG.open_file)
code/modules/modular_computers/hardware/ai_slot.dm
+6 -6
View File
@@ -1,5 +1,5 @@
// A wrapper that allows the computer to contain an intellicard.
/obj/item/weapon/computer_hardware/ai_slot
/obj/item/computer_hardware/ai_slot
name = "intellicard slot"
desc = "An IIS interlink with connection uplinks that allow the device to interface with most common intellicard models. Too large to fit into tablets. Uses a lot of power when active."
icon_state = "aislot"
@@ -7,20 +7,20 @@
critical = 0
power_usage = 100
origin_tech = list(TECH_POWER = 2, TECH_DATA = 3)
var/obj/item/weapon/aicard/stored_card
var/obj/item/aicard/stored_card
var/power_usage_idle = 100
var/power_usage_occupied = 2 KILOWATTS
/obj/item/weapon/computer_hardware/ai_slot/proc/update_power_usage()
/obj/item/computer_hardware/ai_slot/proc/update_power_usage()
if(!stored_card || !stored_card.carded_ai)
power_usage = power_usage_idle
return
power_usage = power_usage_occupied
/obj/item/weapon/computer_hardware/ai_slot/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/item/computer_hardware/ai_slot/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(..())
return 1
if(istype(W, /obj/item/weapon/aicard))
if(istype(W, /obj/item/aicard))
if(stored_card)
to_chat(user, "\The [src] is already occupied.")
return
@@ -33,7 +33,7 @@
stored_card = null
update_power_usage()
/obj/item/weapon/computer_hardware/ai_slot/Destroy()
/obj/item/computer_hardware/ai_slot/Destroy()
if(holder2 && (holder2.ai_slot == src))
holder2.ai_slot = null
if(stored_card)
code/modules/modular_computers/hardware/battery_module.dm
+15 -15
View File
@@ -1,6 +1,6 @@
// This device is wrapper for actual power cell. I have decided to not use power cells directly as even low-end cells available on station
// have tremendeous capacity in comparsion. Higher tier cells would provide your device with nearly infinite battery life, which is something i want to avoid.
/obj/item/weapon/computer_hardware/battery_module
/obj/item/computer_hardware/battery_module
name = "standard battery"
desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops. It's rating is 750."
icon_state = "battery_normal"
@@ -8,9 +8,9 @@
malfunction_probability = 1
origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1)
var/battery_rating = 750
var/obj/item/weapon/cell/battery
var/obj/item/cell/battery
/obj/item/weapon/computer_hardware/battery_module/advanced
/obj/item/computer_hardware/battery_module/advanced
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"
@@ -18,7 +18,7 @@
battery_rating = 1100
hardware_size = 2
/obj/item/weapon/computer_hardware/battery_module/super
/obj/item/computer_hardware/battery_module/super
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"
@@ -26,7 +26,7 @@
hardware_size = 3
battery_rating = 1500
/obj/item/weapon/computer_hardware/battery_module/ultra
/obj/item/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"
@@ -34,14 +34,14 @@
hardware_size = 3
battery_rating = 2000
/obj/item/weapon/computer_hardware/battery_module/micro
/obj/item/computer_hardware/battery_module/micro
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)
battery_rating = 500
/obj/item/weapon/computer_hardware/battery_module/nano
/obj/item/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"
@@ -49,29 +49,29 @@
battery_rating = 300
// This is not intended to be obtainable in-game. Intended for adminbus and debugging purposes.
/obj/item/weapon/computer_hardware/battery_module/lambda
/obj/item/computer_hardware/battery_module/lambda
name = "lambda coil"
desc = "A very complex device that creates its own bluespace dimension. This dimension may be used to store massive amounts of energy."
icon_state = "battery_lambda"
hardware_size = 1
battery_rating = 1000000
/obj/item/weapon/computer_hardware/battery_module/lambda/Initialize()
/obj/item/computer_hardware/battery_module/lambda/Initialize()
. = ..()
battery = new/obj/item/weapon/cell/infinite(src)
battery = new/obj/item/cell/infinite(src)
/obj/item/weapon/computer_hardware/battery_module/diagnostics(var/mob/user)
/obj/item/computer_hardware/battery_module/diagnostics(var/mob/user)
..()
to_chat(user, "Internal battery charge: [battery.charge]/[battery.maxcharge] mAh")
/obj/item/weapon/computer_hardware/battery_module/Initialize()
/obj/item/computer_hardware/battery_module/Initialize()
. = ..()
battery = new/obj/item/weapon/cell/device/variable(src, battery_rating)
battery = new/obj/item/cell/device/variable(src, battery_rating)
battery.charge = 0
/obj/item/weapon/computer_hardware/battery_module/proc/charge_to_full()
/obj/item/computer_hardware/battery_module/proc/charge_to_full()
if(battery)
battery.charge = battery.maxcharge
/obj/item/weapon/computer_hardware/battery_module/get_cell()
/obj/item/computer_hardware/battery_module/get_cell()
return battery
code/modules/modular_computers/hardware/card_slot.dm
+3 -3
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/computer_hardware/card_slot
/obj/item/computer_hardware/card_slot
name = "RFID card slot"
desc = "Slot that allows this computer to write data on RFID cards. Necessary for some programs to run properly."
power_usage = 10 //W
@@ -7,9 +7,9 @@
hardware_size = 1
origin_tech = list(TECH_DATA = 2)
var/obj/item/weapon/card/id/stored_card = null
var/obj/item/card/id/stored_card = null
/obj/item/weapon/computer_hardware/card_slot/Destroy()
/obj/item/computer_hardware/card_slot/Destroy()
if(holder2 && (holder2.card_slot == src))
holder2.card_slot = null
if(stored_card)
code/modules/modular_computers/hardware/hard_drive.dm
+16 -16
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/computer_hardware/hard_drive/
/obj/item/computer_hardware/hard_drive/
name = "basic hard drive"
desc = "A small power efficient solid state drive, with 128GQ of storage capacity for use in basic computers where power efficiency is desired."
power_usage = 25 // SSD or something with low power usage
@@ -10,7 +10,7 @@
var/read_only = 0 // If the HDD is read only
var/list/stored_files = list() // List of stored files on this drive. DO NOT MODIFY DIRECTLY!
/obj/item/weapon/computer_hardware/hard_drive/advanced
/obj/item/computer_hardware/hard_drive/advanced
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
@@ -19,7 +19,7 @@
icon_state = "hdd_advanced"
hardware_size = 3
/obj/item/weapon/computer_hardware/hard_drive/super
/obj/item/computer_hardware/hard_drive/super
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
@@ -28,7 +28,7 @@
icon_state = "hdd_super"
hardware_size = 3
/obj/item/weapon/computer_hardware/hard_drive/cluster
/obj/item/computer_hardware/hard_drive/cluster
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
@@ -38,7 +38,7 @@
hardware_size = 3
// For tablets, etc. - highly power efficient.
/obj/item/weapon/computer_hardware/hard_drive/small
/obj/item/computer_hardware/hard_drive/small
name = "small hard drive"
desc = "A small highly efficient solid state drive for portable devices."
power_usage = 10
@@ -47,7 +47,7 @@
icon_state = "hdd_small"
hardware_size = 1
/obj/item/weapon/computer_hardware/hard_drive/micro
/obj/item/computer_hardware/hard_drive/micro
name = "micro hard drive"
desc = "A small micro hard drive for portable devices."
power_usage = 2
@@ -56,14 +56,14 @@
icon_state = "hdd_micro"
hardware_size = 1
/obj/item/weapon/computer_hardware/hard_drive/diagnostics(var/mob/user)
/obj/item/computer_hardware/hard_drive/diagnostics(var/mob/user)
..()
// 999 is a byond limit that is in place. It's unlikely someone will reach that many files anyway, since you would sooner run out of space.
to_chat(user, "NT-NFS File Table Status: [stored_files.len]/999")
to_chat(user, "Storage capacity: [used_capacity]/[max_capacity]GQ")
// Use this proc to add file to the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks.
/obj/item/weapon/computer_hardware/hard_drive/proc/store_file(var/datum/computer_file/F)
/obj/item/computer_hardware/hard_drive/proc/store_file(var/datum/computer_file/F)
if(!F || !istype(F))
return 0
@@ -86,13 +86,13 @@
return 1
// Use this proc to add file to the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks.
/obj/item/weapon/computer_hardware/hard_drive/proc/install_default_programs()
/obj/item/computer_hardware/hard_drive/proc/install_default_programs()
store_file(new/datum/computer_file/program/computerconfig(src)) // Computer configuration utility, allows hardware control and displays more info than status bar
store_file(new/datum/computer_file/program/clientmanager(src)) // Client Manager to Enroll the Device
// Use this proc to remove file from the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks.
/obj/item/weapon/computer_hardware/hard_drive/proc/remove_file(var/datum/computer_file/F)
/obj/item/computer_hardware/hard_drive/proc/remove_file(var/datum/computer_file/F)
if(!F || !istype(F))
return 0
@@ -110,7 +110,7 @@
return 0
// Loops through all stored files and recalculates used_capacity of this drive
/obj/item/weapon/computer_hardware/hard_drive/proc/recalculate_size()
/obj/item/computer_hardware/hard_drive/proc/recalculate_size()
var/total_size = 0
for(var/datum/computer_file/F in stored_files)
total_size += F.size
@@ -118,7 +118,7 @@
used_capacity = total_size
// Checks whether file can be stored on the hard drive.
/obj/item/weapon/computer_hardware/hard_drive/proc/can_store_file(var/size = 1)
/obj/item/computer_hardware/hard_drive/proc/can_store_file(var/size = 1)
// In the unlikely event someone manages to create that many files.
// BYOND is acting weird with numbers above 999 in loops (infinite loop prevention)
if(read_only)
@@ -131,7 +131,7 @@
return 1
// Checks whether we can store the file. We can only store unique files, so this checks whether we wouldn't get a duplicity by adding a file.
/obj/item/weapon/computer_hardware/hard_drive/proc/try_store_file(var/datum/computer_file/F)
/obj/item/computer_hardware/hard_drive/proc/try_store_file(var/datum/computer_file/F)
if(!F || !istype(F))
return 0
var/name = F.filename + "." + F.filetype
@@ -143,7 +143,7 @@
// Tries to find the file by filename. Returns null on failure
/obj/item/weapon/computer_hardware/hard_drive/proc/find_file_by_name(var/filename)
/obj/item/computer_hardware/hard_drive/proc/find_file_by_name(var/filename)
if(!check_functionality())
return null
@@ -158,13 +158,13 @@
return F
return null
/obj/item/weapon/computer_hardware/hard_drive/Destroy()
/obj/item/computer_hardware/hard_drive/Destroy()
if(holder2 && (holder2.hard_drive == src))
holder2.hard_drive = null
stored_files = null
return ..()
/obj/item/weapon/computer_hardware/hard_drive/Initialize(mapload)
/obj/item/computer_hardware/hard_drive/Initialize(mapload)
install_default_programs()
if(mapload && prob(5))
var/datum/docs_document/file = SSdocs.pick_document_by_tag(SSDOCS_MEDIUM_FILE)
code/modules/modular_computers/hardware/hardware.dm
+8 -8
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/computer_hardware/
/obj/item/computer_hardware/
name = "Hardware"
desc = "Unknown Hardware."
icon = 'icons/obj/modular_components.dmi'
@@ -13,7 +13,7 @@
var/damage_failure = 50 // "Failure" threshold. When damage exceeds this value the hardware piece will not work at all.
var/malfunction_probability = 10// Chance of malfunction when the component is damaged
/obj/item/weapon/computer_hardware/attackby(var/obj/item/W as obj, var/mob/living/user as mob)
/obj/item/computer_hardware/attackby(var/obj/item/W as obj, var/mob/living/user as mob)
// Multitool. Runs diagnostics
if(W.ismultitool())
to_chat(user, "***** DIAGNOSTICS REPORT *****")
@@ -43,22 +43,22 @@
// Called on multitool click, prints diagnostic information to the user.
/obj/item/weapon/computer_hardware/proc/diagnostics(var/mob/user)
/obj/item/computer_hardware/proc/diagnostics(var/mob/user)
to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]")
/obj/item/weapon/computer_hardware/Initialize()
/obj/item/computer_hardware/Initialize()
. = ..()
w_class = hardware_size
if(istype(loc, /obj/item/modular_computer))
holder2 = loc
return .
/obj/item/weapon/computer_hardware/Destroy()
/obj/item/computer_hardware/Destroy()
holder2 = null
return ..()
// Handles damage checks
/obj/item/weapon/computer_hardware/proc/check_functionality()
/obj/item/computer_hardware/proc/check_functionality()
// Turned off
if(!enabled)
return 0
@@ -72,7 +72,7 @@
// Good to go.
return 1
/obj/item/weapon/computer_hardware/examine(var/mob/user)
/obj/item/computer_hardware/examine(var/mob/user)
. = ..()
if(damage > damage_failure)
to_chat(user, "<span class='danger'>It seems to be severely damaged!</span>")
@@ -82,7 +82,7 @@
to_chat(user, "It seems to be slightly damaged.")
// Damages the component. Contains necessary checks. Negative damage "heals" the component.
/obj/item/weapon/computer_hardware/proc/take_damage(var/amount)
/obj/item/computer_hardware/proc/take_damage(var/amount)
damage += round(amount) // We want nice rounded numbers here.
damage = between(0, damage, max_damage) // Clamp the value.
code/modules/modular_computers/hardware/nano_printer.dm
+7 -7
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/computer_hardware/nano_printer
/obj/item/computer_hardware/nano_printer
name = "nano printer"
desc = "Small integrated printer with paper recycling module."
power_usage = 50
@@ -9,11 +9,11 @@
var/stored_paper = 5
var/max_paper = 10
/obj/item/weapon/computer_hardware/nano_printer/diagnostics(var/mob/user)
/obj/item/computer_hardware/nano_printer/diagnostics(var/mob/user)
..()
to_chat(user, "Paper buffer level: [stored_paper]/[max_paper]")
/obj/item/weapon/computer_hardware/nano_printer/proc/print_text(var/text_to_print, var/paper_title = null, var/paper_color = null)
/obj/item/computer_hardware/nano_printer/proc/print_text(var/text_to_print, var/paper_title = null, var/paper_color = null)
if(!stored_paper)
return 0
if(!enabled)
@@ -24,15 +24,15 @@
// Damaged printer causes the resulting paper to be somewhat harder to read.
if(damage > damage_malfunction)
text_to_print = stars(text_to_print, 100-malfunction_probability)
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(holder2),text_to_print, paper_title)
var/obj/item/paper/P = new /obj/item/paper(get_turf(holder2),text_to_print, paper_title)
if (paper_color)
P.color = paper_color
stored_paper--
return 1
/obj/item/weapon/computer_hardware/nano_printer/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/paper))
/obj/item/computer_hardware/nano_printer/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/paper))
if(stored_paper >= max_paper)
to_chat(user, "You try to add \the [W] into [src], but it's paper bin is full")
return
@@ -41,7 +41,7 @@
qdel(W)
stored_paper++
/obj/item/weapon/computer_hardware/nano_printer/Destroy()
/obj/item/computer_hardware/nano_printer/Destroy()
if(holder2 && (holder2.nano_printer == src))
holder2.nano_printer = null
holder2 = null
code/modules/modular_computers/hardware/network_card.dm
+9 -9
View File
@@ -1,6 +1,6 @@
var/global/ntnet_card_uid = 1
/obj/item/weapon/computer_hardware/network_card/
/obj/item/computer_hardware/network_card/
name = "basic NTNet network card"
desc = "A basic network card for usage with standard NTNet frequencies."
power_usage = 50
@@ -14,7 +14,7 @@ var/global/ntnet_card_uid = 1
var/ethernet = 0 // Hard-wired, therefore always on, ignores NTNet wireless checks.
malfunction_probability = 1
/obj/item/weapon/computer_hardware/network_card/diagnostics(var/mob/user)
/obj/item/computer_hardware/network_card/diagnostics(var/mob/user)
..()
to_chat(user, "NIX Unique ID: [identification_id]")
to_chat(user, "NIX User Tag: [identification_string]")
@@ -25,12 +25,12 @@ var/global/ntnet_card_uid = 1
if(ethernet)
to_chat(user, "OpenEth (Physical Connection) - Physical network connection port")
/obj/item/weapon/computer_hardware/network_card/Initialize()
/obj/item/computer_hardware/network_card/Initialize()
. = ..()
identification_id = ntnet_card_uid
ntnet_card_uid++
/obj/item/weapon/computer_hardware/network_card/advanced
/obj/item/computer_hardware/network_card/advanced
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
@@ -39,7 +39,7 @@ var/global/ntnet_card_uid = 1
icon_state = "netcard_advanced"
hardware_size = 2
/obj/item/weapon/computer_hardware/network_card/wired
/obj/item/computer_hardware/network_card/wired
name = "wired NTNet network card"
desc = "An advanced network card for usage with standard NTNet frequencies. This one also supports wired connection."
ethernet = 1
@@ -48,18 +48,18 @@ var/global/ntnet_card_uid = 1
icon_state = "netcard_ethernet"
hardware_size = 3
/obj/item/weapon/computer_hardware/network_card/Destroy()
/obj/item/computer_hardware/network_card/Destroy()
if(holder2 && (holder2.network_card == src))
holder2.network_card = null
holder2 = null
return ..()
// Returns a string identifier of this network card
/obj/item/weapon/computer_hardware/network_card/proc/get_network_tag()
/obj/item/computer_hardware/network_card/proc/get_network_tag()
return "[identification_string] (NID [identification_id])"
// 0 - No signal, 1 - Low signal, 2 - High signal. 3 - Wired Connection
/obj/item/weapon/computer_hardware/network_card/proc/get_signal(var/specific_action = 0)
/obj/item/computer_hardware/network_card/proc/get_signal(var/specific_action = 0)
if(!holder2) // Hardware is not installed in anything. No signal. How did this even get called?
return 0
@@ -89,7 +89,7 @@ var/global/ntnet_card_uid = 1
return 0 // Computer is not on station and does not have upgraded network card. No signal.
/obj/item/weapon/computer_hardware/network_card/Destroy()
/obj/item/computer_hardware/network_card/Destroy()
if(holder2 && (holder2.network_card == src))
holder2.network_card = null
return ..()
code/modules/modular_computers/hardware/portable_hard_drive.dm
+4 -4
View File
@@ -1,5 +1,5 @@
// These are basically USB data sticks and may be used to transfer files between devices
/obj/item/weapon/computer_hardware/hard_drive/portable/
/obj/item/computer_hardware/hard_drive/portable/
name = "basic data crystal"
desc = "Small crystal with imprinted photonic circuits that can be used to store data. Its capacity is 16 GQ."
power_usage = 10
@@ -8,7 +8,7 @@
max_capacity = 16
origin_tech = list(TECH_DATA = 1)
/obj/item/weapon/computer_hardware/hard_drive/portable/advanced
/obj/item/computer_hardware/hard_drive/portable/advanced
name = "advanced data crystal"
desc = "Small crystal with imprinted high-density photonic circuits that can be used to store data. Its capacity is 64 GQ."
power_usage = 20
@@ -17,7 +17,7 @@
max_capacity = 64
origin_tech = list(TECH_DATA = 2)
/obj/item/weapon/computer_hardware/hard_drive/portable/super
/obj/item/computer_hardware/hard_drive/portable/super
name = "super data crystal"
desc = "Small crystal with imprinted ultra-density photonic circuits that can be used to store data. Its capacity is 256 GQ."
power_usage = 40
@@ -26,7 +26,7 @@
max_capacity = 256
origin_tech = list(TECH_DATA = 4)
/obj/item/weapon/computer_hardware/hard_drive/portable/New()
/obj/item/computer_hardware/hard_drive/portable/New()
..()
stored_files = list()
recalculate_size()
code/modules/modular_computers/hardware/portable_hard_drive_presets.dm
+6 -6
View File
@@ -1,8 +1,8 @@
/obj/item/weapon/computer_hardware/hard_drive/portable/super/preset/all/Initialize()
/obj/item/computer_hardware/hard_drive/portable/super/preset/all/Initialize()
. = ..()
add_programs()
/obj/item/weapon/computer_hardware/hard_drive/portable/super/preset/all/proc/add_programs()
/obj/item/computer_hardware/hard_drive/portable/super/preset/all/proc/add_programs()
for(var/F in typesof(/datum/computer_file/program))
var/datum/computer_file/program/prog = new F
// Invalid type (shouldn't be possible but just in case), invalid filetype (not executable program) or invalid filename (unset program)
@@ -14,16 +14,16 @@
/obj/item/weapon/computer_hardware/hard_drive/portable/backup
/obj/item/computer_hardware/hard_drive/portable/backup
var/_program = null //Change that far to the file name of the backup program you would like to spawn
origin_tech = list() //Nope, no research levels from backup disks
/obj/item/weapon/computer_hardware/hard_drive/portable/backup/New(loc, var/prog_name)
/obj/item/computer_hardware/hard_drive/portable/backup/New(loc, var/prog_name)
. = ..()
_program = prog_name
add_program()
/obj/item/weapon/computer_hardware/hard_drive/portable/backup/proc/add_program()
/obj/item/computer_hardware/hard_drive/portable/backup/proc/add_program()
if(_program == null)
qdel(src) //Delete itself if no program is set
return
@@ -51,4 +51,4 @@
continue
// Check whether the program should be available for station/antag download, if yes, add it to lists.
if(prog.available_on_ntnet)
new /obj/item/weapon/computer_hardware/hard_drive/portable/backup(src, prog.filename)
new /obj/item/computer_hardware/hard_drive/portable/backup(src, prog.filename)
code/modules/modular_computers/hardware/processor_unit.dm
+4 -4
View File
@@ -1,7 +1,7 @@
// CPU that allows the computer to run programs.
// Better CPUs are obtainable via research and can run more programs on background.
/obj/item/weapon/computer_hardware/processor_unit
/obj/item/computer_hardware/processor_unit
name = "standard processor"
desc = "A standard CPU used in most computers. It can run up to three programs simultaneously."
icon_state = "cpu_normal"
@@ -13,7 +13,7 @@
var/max_idle_programs = 2 // 2 idle, + 1 active = 3 as said in description.
/obj/item/weapon/computer_hardware/processor_unit/small
/obj/item/computer_hardware/processor_unit/small
name = "standard microprocessor"
desc = "A standard miniaturised CPU used in portable devices. It can run up to two programs simultaneously."
icon_state = "cpu_small"
@@ -22,7 +22,7 @@
max_idle_programs = 1
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
/obj/item/weapon/computer_hardware/processor_unit/photonic
/obj/item/computer_hardware/processor_unit/photonic
name = "photonic processor"
desc = "An advanced experimental CPU that uses photonic core instead of regular circuitry. It can run up to five programs simultaneously, but uses a lot of power."
icon_state = "cpu_normal_photonic"
@@ -31,7 +31,7 @@
max_idle_programs = 4
origin_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 4)
/obj/item/weapon/computer_hardware/processor_unit/photonic/small
/obj/item/computer_hardware/processor_unit/photonic/small
name = "photonic microprocessor"
desc = "An advanced miniaturised CPU for use in portable devices. It uses photonic core instead of regular circuitry. It can run up to three programs simultaneously."
icon_state = "cpu_small_photonic"
code/modules/modular_computers/hardware/tesla_link.dm
+2 -2
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/computer_hardware/tesla_link
/obj/item/computer_hardware/tesla_link
name = "tesla link"
desc = "An advanced tesla link that wirelessly recharges connected device from nearby area power controller."
critical = 0
@@ -9,7 +9,7 @@
var/obj/machinery/modular_computer/holder
var/passive_charging_rate = 250 // W
/obj/item/weapon/computer_hardware/tesla_link/Destroy()
/obj/item/computer_hardware/tesla_link/Destroy()
if(holder2 && (holder2.tesla_link == src))
holder2.tesla_link = null
return ..()
code/modules/modular_computers/laptop_vendor.dm
+32 -32
View File
@@ -57,116 +57,116 @@
switch(dev_cpu)
if(1)
if(fabricate)
fabricated_laptop.processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(fabricated_laptop)
fabricated_laptop.processor_unit = new/obj/item/computer_hardware/processor_unit/small(fabricated_laptop)
if(2)
if(fabricate)
fabricated_laptop.processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(fabricated_laptop)
fabricated_laptop.processor_unit = new/obj/item/computer_hardware/processor_unit(fabricated_laptop)
total_price += 299
switch(dev_battery)
if(1) //Micro(500C)
if(fabricate)
fabricated_laptop.battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(fabricated_laptop)
fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module/micro(fabricated_laptop)
if(2) // Basic(750C)
if(fabricate)
fabricated_laptop.battery_module = new/obj/item/weapon/computer_hardware/battery_module(fabricated_laptop)
fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module(fabricated_laptop)
total_price += 199
// if(3) // Upgraded(1100C)
// if(fabricate)
// fabricated_laptop.battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(fabricated_laptop)
// fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module/advanced(fabricated_laptop)
// total_price += 499
switch(dev_disk)
if(1)
if(fabricate)
fabricated_laptop.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(fabricated_laptop)
fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive/small(fabricated_laptop)
if(2) // Basic(128GQ)
if(fabricate)
fabricated_laptop.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(fabricated_laptop)
fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive(fabricated_laptop)
total_price += 199
// if(3) // Upgraded(256GQ)
// if(fabricate)
// fabricated_laptop.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/advanced(fabricated_laptop)
// fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive/advanced(fabricated_laptop)
// total_price += 299
switch(dev_netcard)
if(1) // Basic(Short-Range)
if(fabricate)
fabricated_laptop.network_card = new/obj/item/weapon/computer_hardware/network_card(fabricated_laptop)
fabricated_laptop.network_card = new/obj/item/computer_hardware/network_card(fabricated_laptop)
total_price += 199
// if(2) // Advanced (Long Range)
// if(fabricate)
// fabricated_laptop.network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(fabricated_laptop)
// fabricated_laptop.network_card = new/obj/item/computer_hardware/network_card/advanced(fabricated_laptop)
// total_price += 299
// if(dev_tesla)
// total_price += 399
// if(fabricate)
// fabricated_laptop.tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(fabricated_laptop)
// fabricated_laptop.tesla_link = new/obj/item/computer_hardware/tesla_link(fabricated_laptop)
// if(dev_nanoprint)
// total_price += 99
// if(fabricate)
// fabricated_laptop.nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(fabricated_laptop)
// fabricated_laptop.nano_printer = new/obj/item/computer_hardware/nano_printer(fabricated_laptop)
if(dev_card)
total_price += 199
if(fabricate)
fabricated_laptop.card_slot = new/obj/item/weapon/computer_hardware/card_slot(fabricated_laptop)
fabricated_laptop.card_slot = new/obj/item/computer_hardware/card_slot(fabricated_laptop)
//if(dev_aislot)
//total_price += 499
//if(fabricate)
//fabricated_laptop.ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(fabricated_laptop)
//fabricated_laptop.ai_slot = new/obj/item/computer_hardware/ai_slot(fabricated_laptop)
return total_price
else if(devtype == 2) // Tablet, more expensive, not everyone could probably afford this.
if(fabricate)
fabricated_tablet = new(src)
fabricated_tablet.processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(fabricated_tablet)
fabricated_tablet.processor_unit = new/obj/item/computer_hardware/processor_unit/small(fabricated_tablet)
total_price = 199
switch(dev_battery)
if(1) // Basic(300C)
if(fabricate)
fabricated_tablet.battery_module = new/obj/item/weapon/computer_hardware/battery_module/nano(fabricated_tablet)
fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module/nano(fabricated_tablet)
if(2) // Upgraded(500C)
if(fabricate)
fabricated_tablet.battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(fabricated_tablet)
fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module/micro(fabricated_tablet)
total_price += 199
if(3) // Advanced(750C)
if(fabricate)
fabricated_tablet.battery_module = new/obj/item/weapon/computer_hardware/battery_module(fabricated_tablet)
fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module(fabricated_tablet)
total_price += 499
switch(dev_disk)
if(1) // Basic(32GQ)
if(fabricate)
fabricated_tablet.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/micro(fabricated_tablet)
fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive/micro(fabricated_tablet)
if(2) // Upgraded(64GQ)
if(fabricate)
fabricated_tablet.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(fabricated_tablet)
fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive/small(fabricated_tablet)
total_price += 99
if(3) // Advanced(128GQ)
if(fabricate)
fabricated_tablet.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(fabricated_tablet)
fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive(fabricated_tablet)
total_price += 299
switch(dev_netcard)
if(1) // Basic(Short-Range)
if(fabricate)
fabricated_tablet.network_card = new/obj/item/weapon/computer_hardware/network_card(fabricated_tablet)
fabricated_tablet.network_card = new/obj/item/computer_hardware/network_card(fabricated_tablet)
total_price += 99
if(2) // Advanced (Long Range)
if(fabricate)
fabricated_tablet.network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(fabricated_tablet)
fabricated_tablet.network_card = new/obj/item/computer_hardware/network_card/advanced(fabricated_tablet)
total_price += 299
if(dev_nanoprint)
total_price += 99
if(fabricate)
fabricated_tablet.nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(fabricated_tablet)
fabricated_tablet.nano_printer = new/obj/item/computer_hardware/nano_printer(fabricated_tablet)
if(dev_card)
total_price += 199
if(fabricate)
fabricated_tablet.card_slot = new/obj/item/weapon/computer_hardware/card_slot(fabricated_tablet)
fabricated_tablet.card_slot = new/obj/item/computer_hardware/card_slot(fabricated_tablet)
if(dev_tesla)
total_price += 399
if(fabricate)
fabricated_tablet.tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(fabricated_tablet)
fabricated_tablet.tesla_link = new/obj/item/computer_hardware/tesla_link(fabricated_tablet)
if(dev_aislot)
total_price += 499
if(fabricate)
fabricated_tablet.ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(fabricated_tablet)
fabricated_tablet.ai_slot = new/obj/item/computer_hardware/ai_slot(fabricated_tablet)
return total_price
return 0
@@ -264,10 +264,10 @@
ui.set_auto_update(1)
obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob)
obj/machinery/lapvend/attackby(obj/item/W as obj, mob/user as mob)
// Awaiting payment state
if(state == 2)
var/obj/item/weapon/card/id/I = W.GetID()
var/obj/item/card/id/I = W.GetID()
if(process_payment(I,W))
fabricate_and_recalc_price(1)
if((devtype == 1) && fabricated_laptop)
@@ -303,9 +303,9 @@ obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob)
return ..()
// Simplified payment processing, returns 1 on success.
/obj/machinery/lapvend/proc/process_payment(var/obj/item/weapon/card/id/I, var/obj/item/ID_container)
var/obj/item/weapon/spacecash/S = null
if (istype(ID_container, /obj/item/weapon/spacecash))
/obj/machinery/lapvend/proc/process_payment(var/obj/item/card/id/I, var/obj/item/ID_container)
var/obj/item/spacecash/S = null
if (istype(ID_container, /obj/item/spacecash))
S = ID_container
if(I==ID_container || ID_container == null)
visible_message("<span class='info'>\The [usr] swipes \the [I] through \the [src].</span>")