Skip to content
This repository has been archived by the owner on Jan 28, 2023. It is now read-only.

Commit

Permalink
Compiled, basic functionality.
Browse files Browse the repository at this point in the history 
Still to do:
Test things
Fix icons
Add sawblade recipe
Distribute disks
  • Loading branch information
@NanakoAC
NanakoAC committed Aug 23, 2019
1 parent cb75ea5 commit 065c29b
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 62 deletions.
1 change: 1 addition & 0 deletions code/modules/modular_computers/hardware/_hardware.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]")

/obj/item/weapon/computer_hardware/New(var/obj/L)
.=..()
w_class = hardware_size
if(istype(L, /obj/item/modular_computer))
holder2 = L
Expand Down
8 changes: 6 additions & 2 deletions code/modules/modular_computers/hardware/hard_drive.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,13 @@
stored_files = null
return ..()

/obj/item/weapon/computer_hardware/hard_drive/New()

/obj/item/weapon/computer_hardware/hard_drive/Initialize()
world << "Hard drive initialize 1"
. = ..()
world << "Hard drive initialize 2"
install_default_programs()
..()
install_default_files()

// Adds default files to the drive.
/obj/item/weapon/computer_hardware/hard_drive/proc/install_default_files()
Expand Down
6 changes: 5 additions & 1 deletion code/modules/modular_computers/hardware/portable_hard_drive.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
origin_tech = list(TECH_DATA = 2)
matter = list(MATERIAL_STEEL = 1, MATERIAL_PLASTIC = 2, MATERIAL_GOLD = 0.25)
matter_reagents = list()
w_class = ITEM_SIZE_SMALL
var/disk_name
var/license = 0

Expand All @@ -33,9 +34,12 @@
origin_tech = list(TECH_DATA = 4)

/obj/item/weapon/computer_hardware/hard_drive/portable/Initialize()
world << "portable Disk initialising 1"
. = ..()
w_class = ITEM_SIZE_SMALL
world << "portable Disk initialising 2"
if(disk_name)
world << "Disk name is [disk_name]"
world << "Setting name to ["[initial(name)] - '[disk_name]'"]"
SetName("[initial(name)] - '[disk_name]'")

/obj/item/weapon/computer_hardware/hard_drive/portable/Destroy()
Expand Down
69 changes: 10 additions & 59 deletions code/modules/modular_computers/hardware/storage/autolathe_disks.dm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/obj/item/weapon/computer_hardware/hard_drive/portable/design
name = "design disk"
icon = 'icons/obj/discs.dmi'
icon_state = "yellow"
desc = "Data disk used to store autolathe designs."
max_capacity = 1024 // Up to 255 designs, automatically reduced to the nearest power of 2
Expand Down Expand Up @@ -70,7 +71,6 @@
/datum/design/autolathe/misc/radio_bounced,
/datum/design/autolathe/misc/ashtray,
/datum/design/autolathe/container/drinkingglass,
/datum/design/autolathe/container/carafe,
/datum/design/autolathe/container/insulated_pitcher,
/datum/design/autolathe/container/bucket,
/datum/design/autolathe/container/jar,
Expand All @@ -96,19 +96,14 @@
/datum/design/autolathe/device/analyzer,
/datum/design/autolathe/device/plant_analyzer,
/datum/design/autolathe/device/healthanalyzer,
/datum/design/research/item/medical/mass_spectrometer,
/datum/design/research/item/medical/reagent_scanner,
/datum/design/research/item/medical/robot_scanner,
/datum/design/autolathe/device/slime_scanner,
/datum/design/autolathe/device/antibody_scanner,
/datum/design/autolathe/device/megaphone,
/datum/design/autolathe/device/t_scanner,
/datum/design/autolathe/device/gps,
/datum/design/autolathe/device/destTagger,
/datum/design/autolathe/device/export_scanner,
/datum/design/autolathe/device/implanter,
/datum/design/autolathe/device/hand_labeler,
/datum/design/research/item/light_replacer
/datum/design/autolathe/device/hand_labeler
)

/obj/item/weapon/computer_hardware/hard_drive/portable/design/robustcells
Expand All @@ -117,12 +112,7 @@

license = 8
designs = list(
/datum/design/autolathe/cell/large,
/datum/design/autolathe/cell/large/high,
/datum/design/autolathe/cell/medium,
/datum/design/autolathe/cell/medium/high,
/datum/design/autolathe/cell/small,
/datum/design/autolathe/cell/small/high,
/datum/design/autolathe/cell
)


Expand All @@ -134,12 +124,6 @@
license = 20
designs = list(
/datum/design/autolathe/part/consolescreen,
/datum/design/research/item/part/smes_coil,
/datum/design/research/item/part/basic_capacitor,
/datum/design/research/item/part/basic_sensor,
/datum/design/research/item/part/micro_mani,
/datum/design/research/item/part/basic_micro_laser,
/datum/design/research/item/part/basic_matter_bin,
/datum/design/autolathe/part/igniter,
/datum/design/autolathe/part/signaler,
/datum/design/autolathe/part/sensor_infra,
Expand All @@ -157,9 +141,6 @@
designs = list(
/datum/design/autolathe/tool/big_wrench,
/datum/design/autolathe/tool/pneumatic_crowbar,
/datum/design/research/item/weapon/mining/jackhammer,
/datum/design/research/item/weapon/mining/drill,
/datum/design/research/item/weapon/mining/drill_diamond,
/datum/design/autolathe/tool/pickaxe_excavation,
/datum/design/autolathe/tool/circularsaw,
/datum/design/autolathe/tool/chainsaw,
Expand All @@ -179,18 +160,8 @@
/datum/design/autolathe/circuit/airlockmodule,
/datum/design/autolathe/circuit/airalarm,
/datum/design/autolathe/circuit/firealarm,
/datum/design/autolathe/circuit/powermodule,
/datum/design/autolathe/circuit/recharger,
/datum/design/research/circuit/autolathe,
/datum/design/autolathe/circuit/autolathe_disk_cloner,
/datum/design/autolathe/circuit/vending,
/datum/design/research/circuit/arcade_battle,
/datum/design/research/circuit/arcade_orion_trail,
/datum/design/research/circuit/teleconsole,
/datum/design/research/circuit/operating,
/datum/design/autolathe/circuit/helm,
/datum/design/autolathe/circuit/nav,
/datum/design/autolathe/circuit/centrifuge,
/datum/design/autolathe/circuit/nav
)


Expand Down Expand Up @@ -228,6 +199,7 @@
/datum/design/autolathe/computer_part/frame_pda,
/datum/design/autolathe/computer_part/frame_tablet,
/datum/design/autolathe/computer_part/frame_laptop,
/*
/datum/design/research/item/modularcomponent/disk/micro,
/datum/design/research/item/modularcomponent/disk/small,
/datum/design/research/item/modularcomponent/disk/normal,
Expand All @@ -241,8 +213,7 @@
/datum/design/research/item/modularcomponent/teslalink,
/datum/design/research/item/modularcomponent/portabledrive/basic,
/datum/design/research/item/modularcomponent/nanoprinter,
/datum/design/autolathe/computer_part/gps,
/datum/design/autolathe/computer_part/led,
*/
/datum/design/autolathe/computer_part/scanner_paper,
/datum/design/autolathe/computer_part/scanner_atmos,
)
Expand All @@ -255,12 +226,9 @@

license = 3
designs = list(
/datum/design/autolathe/gun/mk58,
/datum/design/autolathe/gun/mk58_wood,
/datum/design/autolathe/gun/combat_shotgun,
/datum/design/autolathe/gun/heavysniper,
/datum/design/autolathe/gun/grenade_launcher,
/datum/design/research/item/weapon/stunrevolver,
/datum/design/autolathe/gun/taser,
/datum/design/autolathe/gun/sniperrifle
)
Expand All @@ -274,8 +242,6 @@
/datum/design/autolathe/gun/energy_crossbow,
/datum/design/autolathe/gun/large_energy_crossbow,
/datum/design/autolathe/gun/laser,
/datum/design/autolathe/gun/pulse,
/datum/design/autolathe/gun/pulse_destroyer,
/datum/design/autolathe/gun/ionrifle,
)

Expand All @@ -288,7 +254,7 @@
license = 20
designs = list(
/datum/design/autolathe/sec/secflashlight,
/datum/design/research/item/flash,
///datum/design/research/item/flash, Fix this
/datum/design/autolathe/sec/handcuffs,
/datum/design/autolathe/misc/taperecorder,
/datum/design/autolathe/tool/tacknife,
Expand All @@ -304,9 +270,6 @@

license = 7
designs = list(
/datum/design/autolathe/gun/giskard,
/datum/design/autolathe/gun/olivaw,
/datum/design/autolathe/gun/clarissa,
/datum/design/autolathe/gun/revolver_detective,
/datum/design/autolathe/gun/doublebarrel,
/datum/design/autolathe/gun/pump_shotgun,
Expand All @@ -318,23 +281,10 @@

license = 5
designs = list(
/datum/design/autolathe/gun/IH_sidearm, //pistols
/datum/design/autolathe/gun/IH_machinepistol,
/datum/design/autolathe/gun/lamia,
/datum/design/autolathe/gun/deagle,
/datum/design/autolathe/gun/revolver_consul, //revolvers
/datum/design/autolathe/gun/revolver_deckard,
/datum/design/autolathe/gun/revolver,
/datum/design/autolathe/gun/idaho, //smgs
/datum/design/autolathe/gun/wt550,
/datum/design/autolathe/gun/IH_smg,
/datum/design/autolathe/gun/atreides,
/datum/design/autolathe/gun/smg_sol, //other
/datum/design/autolathe/gun/smg_sol_rds,
/datum/design/autolathe/gun/z8,
/datum/design/autolathe/gun/IH_heavyrifle,
/datum/design/autolathe/gun/ak47_fs,
/datum/design/autolathe/gun/grenade_launcher_lenar, //GLs
/datum/design/autolathe/gun/z8
)

/obj/item/weapon/computer_hardware/hard_drive/portable/design/fs_energy_guns
Expand All @@ -346,6 +296,7 @@
/datum/design/autolathe/gun/energygun
)

/*
/obj/item/weapon/computer_hardware/hard_drive/portable/design/nonlethal_ammo //please, maintain general order (pistol>speedloaders>smg>other>shells)+(smaller/less damaging caliber>bigger/more damaging caliber)
disk_name = "Frozen Star Nonlethal Ammo Pack"
icon_state = "frozenstar"
Expand All @@ -354,7 +305,7 @@
designs = list(
/datum/design/autolathe/ammo/stunshell
)

*/

//This needs to be updated with proper ammo types
/*
Expand Down
Binary file added icons/obj/discs.dmi
View file
Binary file not shown.

0 comments on commit 065c29b

Please sign in to comment.