cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-25 22:28:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes weapons

Browse Source
This commit is contained in:
atermonera
2022-04-17 19:14:32 -08:00
parent 101740a7d3
commit 7a9806d9b4
1491 changed files with 24603 additions and 24603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/NTNet/NTNet.dm
+2 -2
View File
@@ -40,12 +40,12 @@ var/global/datum/ntnet/ntnet_global = new()
build_emails_list()
add_log("NTNet logging system activated.")
/datum/ntnet/proc/add_log_with_ids_check(var/log_string, var/obj/item/weapon/computer_hardware/network_card/source = null)
/datum/ntnet/proc/add_log_with_ids_check(var/log_string, var/obj/item/computer_hardware/network_card/source = null)
if(intrusion_detection_enabled)
add_log(log_string, source)
// 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 = "[stationtime2text()] - "
if(source)
log_text += "[source.get_network_tag()] - "
code/modules/modular_computers/NTNet/NTNet_relay.dm
+1 -1
View File
@@ -8,7 +8,7 @@
icon_state = "ntnet"
anchored = 1
density = 1
circuit = /obj/item/weapon/circuitboard/ntnet_relay
circuit = /obj/item/circuitboard/ntnet_relay
var/datum/ntnet/NTNet = null // This is mostly for backwards reference and to allow varedit modifications from ingame.
var/enabled = 1 // Set to 0 if the relay was turned off
var/dos_failure = 0 // Set to 1 if the relay failed due to (D)DoS attack
code/modules/modular_computers/computers/modular_computer/core.dm
+1 -1
View File
@@ -55,7 +55,7 @@
/obj/item/modular_computer/Destroy()
kill_program(1)
STOP_PROCESSING(SSobj, src)
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)
return ..()
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))
@@ -26,7 +26,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
+10 -10
View File
@@ -1,49 +1,49 @@
// Attempts to install the hardware into apropriate 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(portable_drive)
to_chat(user, "This computer's portable drive slot is already occupied by \the [portable_drive].")
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/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
@@ -57,7 +57,7 @@
update_verbs()
// 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
@@ -120,9 +120,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
@@ -136,12 +136,12 @@
update_uis()
to_chat(user, "You insert \the [I] into \the [src].")
return
if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/paper_bundle))
if(istype(W, /obj/item/paper) || istype(W, /obj/item/paper_bundle))
if(!nano_printer)
return
nano_printer.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
@@ -155,8 +155,8 @@
src.visible_message("\The [src] has been disassembled by [user].")
qdel(src)
return
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(!WT.isOn())
to_chat(user, "\The [W] is off.")
return
@@ -177,7 +177,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
@@ -188,7 +188,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
@@ -44,7 +44,7 @@
// Handles power-related things, such as battery interaction, recharging, shutdown when it's discharged
/obj/item/modular_computer/proc/handle_power()
var/power_usage = screen_on ? base_active_power_usage : base_idle_power_usage
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
@@ -38,9 +38,9 @@
data["device_theme"] = device_theme
data["login"] = list()
var/obj/item/weapon/computer_hardware/card_slot/cardholder = card_slot
var/obj/item/computer_hardware/card_slot/cardholder = card_slot
if(cardholder)
var/obj/item/weapon/card/id/stored_card = cardholder.stored_card
var/obj/item/card/id/stored_card = cardholder.stored_card
if(stored_card)
var/stored_name = stored_card.registered_name
var/stored_title = stored_card.assignment
code/modules/modular_computers/computers/modular_computer/variables.dm
+9 -9
View File
@@ -42,14 +42,14 @@
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.
code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
+1 -1
View File
@@ -24,7 +24,7 @@
// Allows us to create "north bump" "south bump" etc. named objects, for more comfortable mapping.
name = "telescreen"
/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.is_crowbar())
if(anchored)
shutdown_computer()
code/modules/modular_computers/computers/subtypes/preset_console.dm
+15 -15
View File
@@ -1,10 +1,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)
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(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)
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
// Engineering
/obj/item/modular_computer/console/preset/engineering/install_default_programs()
@@ -28,7 +28,7 @@
// Research
/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)
/obj/item/modular_computer/console/preset/research/install_default_programs()
..()
@@ -43,7 +43,7 @@
// Administrator
/obj/item/modular_computer/console/preset/sysadmin/install_default_hardware()
..()
//ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src)
//ai_slot = new/obj/item/computer_hardware/ai_slot(src)
/obj/item/modular_computer/console/preset/sysadmin/install_default_programs()
..()
@@ -59,8 +59,8 @@
// Command
/obj/item/modular_computer/console/preset/command/install_default_hardware()
..()
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
/obj/item/modular_computer/console/preset/command/install_default_programs()
..()
@@ -90,9 +90,9 @@
// 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)
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)
/obj/item/modular_computer/console/preset/ert/install_default_programs()
..()
@@ -108,9 +108,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)
/obj/item/modular_computer/console/preset/mercenary/install_default_programs()
..()
code/modules/modular_computers/computers/subtypes/preset_laptop.dm
+28 -28
View File
@@ -1,34 +1,34 @@
/obj/item/modular_computer/laptop/preset/custom_loadout/cheap/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(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)
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/advanced(src)
processor_unit = new/obj/item/computer_hardware/processor_unit/small(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)
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/advanced(src)
battery_module.charge_to_full()
/obj/item/modular_computer/laptop/preset/custom_loadout/advanced/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/advanced(src)
network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(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/advanced(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/advanced(src)
network_card = new/obj/item/computer_hardware/network_card/advanced(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/advanced(src)
battery_module.charge_to_full()
/obj/item/modular_computer/laptop/preset/custom_loadout/standard/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)
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/advanced(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)
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/advanced(src)
battery_module.charge_to_full()
/obj/item/modular_computer/laptop/preset/custom_loadout/elite
@@ -38,11 +38,11 @@
/obj/item/modular_computer/laptop/preset/custom_loadout/elite/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/advanced(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/super(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/advanced(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/super(src)
battery_module.charge_to_full()
code/modules/modular_computers/computers/subtypes/preset_laptop_vr.dm
+14 -14
View File
@@ -11,13 +11,13 @@
/obj/item/modular_computer/laptop/preset/custom_loadout/rugged/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/advanced(src)
network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(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/super(src)
processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/advanced(src)
network_card = new/obj/item/computer_hardware/network_card/advanced(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/super(src)
battery_module.charge_to_full()
//Fancy Schmancy - this is defined in normal file, just swapping the icon
@@ -38,11 +38,11 @@
/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/photonic(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/advanced(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/lambda(src)
processor_unit = new/obj/item/computer_hardware/processor_unit/photonic(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/advanced(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/lambda(src)
battery_module.charge_to_full()
code/modules/modular_computers/computers/subtypes/preset_tablet.dm
+17 -17
View File
@@ -1,28 +1,28 @@
/obj/item/modular_computer/tablet/preset/custom_loadout/cheap/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(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)
tesla_link = new/obj/item/computer_hardware/tesla_link(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)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(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)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/computer_hardware/network_card/advanced(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()
/obj/item/modular_computer/tablet/preset/custom_loadout/standard/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/weapon/computer_hardware/network_card(src)
battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(src)
processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/computer_hardware/network_card(src)
battery_module = new/obj/item/computer_hardware/battery_module/micro(src)
battery_module.charge_to_full()
code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm
+19 -19
View File
@@ -9,11 +9,11 @@
/obj/item/modular_computer/tablet/preset/custom_loadout/rugged/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/weapon/computer_hardware/network_card(src)
battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(src)
processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/computer_hardware/network_card(src)
battery_module = new/obj/item/computer_hardware/battery_module/micro(src)
battery_module.charge_to_full()
/obj/item/modular_computer/tablet/preset/custom_loadout/elite
@@ -25,13 +25,13 @@
/obj/item/modular_computer/tablet/preset/custom_loadout/elite/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(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)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/computer_hardware/network_card/advanced(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()
/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid
@@ -43,11 +43,11 @@
/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/photonic/small(src)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(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/lambda(src)
processor_unit = new/obj/item/computer_hardware/processor_unit/photonic/small(src)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/small(src)
network_card = new/obj/item/computer_hardware/network_card/advanced(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/lambda(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/install_default_programs()
..()
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/uid // UID of this file
code/modules/modular_computers/file_system/program.dm
+1 -1
View File
@@ -109,7 +109,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='notice'>\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.</span>")
code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
+5 -5
View File
@@ -31,8 +31,8 @@
. = ..()
if(!running)
return
var/obj/item/weapon/computer_hardware/processor_unit/CPU = computer.processor_unit
var/obj/item/weapon/computer_hardware/card_slot/RFID = computer.card_slot
var/obj/item/computer_hardware/processor_unit/CPU = computer.processor_unit
var/obj/item/computer_hardware/card_slot/RFID = computer.card_slot
if(!istype(CPU) || !CPU.check_functionality() || !istype(RFID) || !RFID.check_functionality())
message = "A fatal hardware error has been detected."
return
@@ -62,8 +62,8 @@
return TRUE
if(text2num(params["allowed"]))
return TRUE
var/obj/item/weapon/computer_hardware/processor_unit/CPU = computer.processor_unit
var/obj/item/weapon/computer_hardware/card_slot/RFID = computer.card_slot
var/obj/item/computer_hardware/processor_unit/CPU = computer.processor_unit
var/obj/item/computer_hardware/card_slot/RFID = computer.card_slot
if(!istype(CPU) || !CPU.check_functionality() || !istype(RFID) || !RFID.check_functionality())
message = "A fatal hardware error has been detected."
return
@@ -92,7 +92,7 @@
data["rate"] = computer.processor_unit.max_idle_programs
data["factor"] = (progress / target_progress)
else if(computer?.card_slot?.stored_card)
var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card
var/obj/item/card/id/id_card = computer.card_slot.stored_card
for(var/i = 1; i <= 7; i++)
var/list/accesses = list()
for(var/access in get_region_accesses(i))
code/modules/modular_computers/file_system/programs/antagonist/dos.dm
+1 -1
View File
@@ -84,7 +84,7 @@
executed = TRUE
target.dos_sources.Add(src)
if(ntnet_global.intrusion_detection_enabled)
var/obj/item/weapon/computer_hardware/network_card/network_card = computer.network_card
var/obj/item/computer_hardware/network_card/network_card = computer.network_card
ntnet_global.add_log("IDS WARNING - Excess traffic flood targeting relay [target.uid] detected from device: [network_card.get_network_tag()]")
ntnet_global.intrusion_detection_alarm = TRUE
return TRUE
code/modules/modular_computers/file_system/programs/generic/file_browser.dm
+4 -4
View File
@@ -18,8 +18,8 @@
if(..())
return TRUE
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/RHDD = computer.portable_drive
switch(action)
if("PRG_openfile")
@@ -143,8 +143,8 @@
/datum/computer_file/program/filemanager/tgui_data(mob/user)
var/list/data = get_header_data()
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
data["error"] = null
if(error)
code/modules/modular_computers/file_system/programs/generic/game.dm
+1 -1
View File
@@ -109,7 +109,7 @@
if(..()) // Always call parent in tgui_act, it handles making sure the user is allowed to interact with the UI.
return TRUE
var/obj/item/weapon/computer_hardware/nano_printer/printer
var/obj/item/computer_hardware/nano_printer/printer
if(computer)
printer = computer.nano_printer
code/modules/modular_computers/file_system/programs/generic/news_browser.dm
+1 -1
View File
@@ -109,7 +109,7 @@
var/savename = sanitize(input(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename))
if(!savename)
return TRUE
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 TRUE
var/datum/computer_file/data/news_article/N = loaded_article.clone()
code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm
+5 -5
View File
@@ -16,7 +16,7 @@
var/is_edited
/datum/computer_file/program/wordprocessor/proc/get_file(var/filename)
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/data/F = HDD.find_file_by_name(filename)
@@ -37,7 +37,7 @@
F = create_file(filename, loaded_data)
return !isnull(F)
var/datum/computer_file/data/backup = F.clone()
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
HDD.remove_file(F)
@@ -52,7 +52,7 @@
/datum/computer_file/program/wordprocessor/proc/create_file(var/newname, var/data = "")
if(!newname)
return
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
if(get_file(newname))
@@ -185,8 +185,8 @@
/datum/computer_file/program/wordprocessor/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = get_header_data()
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
data["error"] = null
if(error)
data["error"] = error
code/modules/modular_computers/file_system/programs/research/email_administration.dm
+1 -1
View File
@@ -65,7 +65,7 @@
return TRUE
// High security - can only be operated when the user has an ID with access on them.
var/obj/item/weapon/card/id/I = usr.GetIdCard()
var/obj/item/card/id/I = usr.GetIdCard()
if(!istype(I) || !(access_network in I.access))
return TRUE
code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
+1 -1
View File
@@ -71,7 +71,7 @@ var/warrant_uid = 0
// The following actions will only be possible if the user has an ID with security access equipped. This is in line with modular computer framework's authentication methods,
// which also use RFID scanning to allow or disallow access to some functions. Anyone can view warrants, editing requires ID. This also prevents situations where you show a tablet
// to someone who is to be arrested, which allows them to change the stuff there.
var/obj/item/weapon/card/id/I = usr.GetIdCard()
var/obj/item/card/id/I = usr.GetIdCard()
if(!istype(I) || !I.registered_name || !(access_security in I.access))
to_chat(usr, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
return
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(istype(W, /obj/item/device/multitool))
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)
. += "<span class='danger'>It seems to be severely damaged!</span>"
@@ -82,7 +82,7 @@
. += "It seems to be slightly damaged."
// Damages the component. Contains necessary checks. Negative damage "heals" the component.
/obj/item/weapon/computer_hardware/take_damage(var/amount)
/obj/item/computer_hardware/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/battery_module.dm
+16 -16
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 = null
var/obj/item/cell/battery = null
/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 @@
hardware_size = 2
battery_rating = 1100
/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 = 2
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,34 +49,34 @@
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 power source compatible with various computers. It is capable of providing power for nearly unlimited duration."
icon_state = "battery_lambda"
hardware_size = 1
battery_rating = 30000
/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] CU")
/obj/item/weapon/computer_hardware/battery_module/Initialize()
battery = new/obj/item/weapon/cell(src)
/obj/item/computer_hardware/battery_module/Initialize()
battery = new/obj/item/cell(src)
battery.maxcharge = battery_rating
battery.charge = 0
. = ..()
/obj/item/weapon/computer_hardware/battery_module/Destroy()
/obj/item/computer_hardware/battery_module/Destroy()
qdel_null(battery)
return ..()
/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
@@ -9,7 +9,7 @@
var/used_capacity = 0
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
@@ -18,7 +18,7 @@
icon_state = "hdd_advanced"
hardware_size = 2
/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
@@ -27,7 +27,7 @@
icon_state = "hdd_super"
hardware_size = 2
/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
@@ -37,7 +37,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
@@ -46,7 +46,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
@@ -55,14 +55,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
@@ -85,14 +85,14 @@
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/ntnetdownload(src)) // NTNet Downloader Utility, allows users to download more software from NTNet repository
store_file(new/datum/computer_file/program/filemanager(src)) // File manager, allows text editor functions and basic file manipulation.
// 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(stored_files.len >= 999)
@@ -129,7 +129,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
@@ -141,7 +141,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
@@ -156,12 +156,12 @@
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()
/obj/item/computer_hardware/hard_drive/Initialize()
install_default_programs()
. = ..()
code/modules/modular_computers/hardware/nano_printer.dm
+13 -13
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)
/obj/item/computer_hardware/nano_printer/proc/print_text(var/text_to_print, var/paper_title = null)
if(!stored_paper)
return 0
if(!enabled)
@@ -21,7 +21,7 @@
if(!check_functionality())
return 0
var/obj/item/weapon/paper/P = new/obj/item/weapon/paper(get_turf(holder2))
var/obj/item/paper/P = new/obj/item/paper(get_turf(holder2))
// Damaged printer causes the resulting paper to be somewhat harder to read.
if(damage > damage_malfunction)
@@ -37,8 +37,8 @@
stored_paper--
return 1
/obj/item/weapon/computer_hardware/nano_printer/proc/count_fields(var/info)
//Count the fields. This is taken directly from paper.dm, /obj/item/weapon/paper/proc/parsepencode(). -Hawk_v3
/obj/item/computer_hardware/nano_printer/proc/count_fields(var/info)
//Count the fields. This is taken directly from paper.dm, /obj/item/paper/proc/parsepencode(). -Hawk_v3
var/fields = 0
var/t = info
var/laststart = 1
@@ -50,8 +50,8 @@
fields++
return fields
/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 \the [src], but its paper bin is full.")
return
@@ -59,14 +59,14 @@
to_chat(user, "You insert \the [W] into [src].")
qdel(W)
stored_paper++
else if(istype(W, /obj/item/weapon/paper_bundle))
var/obj/item/weapon/paper_bundle/B = W
else if(istype(W, /obj/item/paper_bundle))
var/obj/item/paper_bundle/B = W
var/num_of_pages_added = 0
if(stored_paper >= max_paper)
to_chat(user, "You try to add \the [W] into \the [src], but its paper bin is full.")
return
for(var/obj/item/weapon/bundleitem in B) //loop through items in bundle
if(istype(bundleitem, /obj/item/weapon/paper)) //if item is paper (and not photo), add into the bin
for(var/obj/item/bundleitem in B) //loop through items in bundle
if(istype(bundleitem, /obj/item/paper)) //if item is paper (and not photo), add into the bin
B.pages.Remove(bundleitem)
qdel(bundleitem)
num_of_pages_added++
@@ -85,7 +85,7 @@
to_chat(user, "You add [num_of_pages_added] papers from \the [W] into \the [src].")
return
/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
+12 -12
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 when far away."
long_range = 1
@@ -39,7 +39,7 @@ var/global/ntnet_card_uid = 1
icon_state = "netcard_advanced"
hardware_size = 1
/obj/item/weapon/computer_hardware/network_card/quantum
/obj/item/computer_hardware/network_card/quantum
name = "quantum NTNet network card"
desc = "A network card that can connect to NTnet from anywhere, using quantum entanglement."
long_range = 1
@@ -48,7 +48,7 @@ var/global/ntnet_card_uid = 1
icon_state = "netcard_advanced"
hardware_size = 1
/obj/item/weapon/computer_hardware/network_card/quantum/get_signal(var/specific_action = 0)
/obj/item/computer_hardware/network_card/quantum/get_signal(var/specific_action = 0)
if(!holder2)
return 0
@@ -60,7 +60,7 @@ var/global/ntnet_card_uid = 1
return 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
@@ -69,21 +69,21 @@ 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])"
/obj/item/weapon/computer_hardware/network_card/proc/is_banned()
/obj/item/computer_hardware/network_card/proc/is_banned()
return ntnet_global.check_banned(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
@@ -126,7 +126,7 @@ var/global/ntnet_card_uid = 1
return best
return 0 // No computer!
/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
+5 -5
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,12 +26,12 @@
max_capacity = 256
origin_tech = list(TECH_DATA = 4)
/obj/item/weapon/computer_hardware/hard_drive/portable/Initialize()
/obj/item/computer_hardware/hard_drive/portable/Initialize()
. = ..()
stored_files = list()
recalculate_size()
/obj/item/weapon/computer_hardware/hard_drive/portable/Destroy()
/obj/item/computer_hardware/hard_drive/portable/Destroy()
if(holder2 && (holder2.portable_drive == src))
holder2.portable_drive = null
return ..()
code/modules/modular_computers/hardware/processor_unit.dm
+5 -5
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"
@@ -40,7 +40,7 @@
max_idle_programs = 2
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3)
/obj/item/weapon/computer_hardware/processor_unit/Destroy()
/obj/item/computer_hardware/processor_unit/Destroy()
if(holder2 && (holder2.processor_unit == src))
holder2.processor_unit = null
return ..()
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
@@ -8,7 +8,7 @@
origin_tech = list(TECH_DATA = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
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
+28 -28
View File
@@ -55,108 +55,108 @@
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) // 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)
if(2) // 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 += 199
if(3) // Advanced(1500C)
if(fabricate)
fabricated_laptop.battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(fabricated_laptop)
fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module/super(fabricated_laptop)
total_price += 499
switch(dev_disk)
if(1) // 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)
if(2) // 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 += 99
if(3) // Advanced(512GQ)
if(fabricate)
fabricated_laptop.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(fabricated_laptop)
fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive/super(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 += 99
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)
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)
return total_price
return 0
@@ -246,8 +246,8 @@
return data
/obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob)
var/obj/item/weapon/card/id/I = W.GetID()
/obj/machinery/lapvend/attackby(obj/item/W as obj, mob/user as mob)
var/obj/item/card/id/I = W.GetID()
// Awaiting payment state
if(state == 2)
if(process_payment(I,W))
@@ -274,7 +274,7 @@
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)
/obj/machinery/lapvend/proc/process_payment(var/obj/item/card/id/I, var/obj/item/ID_container)
if(I==ID_container || ID_container == null)
visible_message("<span class='info'>\The [usr] swipes \the [I] through \the [src].</span>")
else