Skip to content

Commit

Permalink
Mapping and stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
fernerr committed Nov 3, 2019
1 parent bdbfb94 commit a28eb4a
Show file tree
Hide file tree
Showing 16 changed files with 567 additions and 417 deletions.
1 change: 1 addition & 0 deletions aurorastation.dme
Expand Up @@ -1943,6 +1943,7 @@
#include "code\modules\modular_computers\computers\subtypes\dev_tablet.dm"
#include "code\modules\modular_computers\computers\subtypes\dev_telescreen.dm"
#include "code\modules\modular_computers\computers\subtypes\preset_console.dm"
#include "code\modules\modular_computers\computers\subtypes\preset_laptop.dm"
#include "code\modules\modular_computers\computers\subtypes\preset_tablet.dm"
#include "code\modules\modular_computers\computers\subtypes\preset_telescreen.dm"
#include "code\modules\modular_computers\file_system\computer_file.dm"
Expand Down
Expand Up @@ -7,6 +7,8 @@
icon = 'icons/obj/modular_laptop.dmi'
icon_state = "laptop-open"
icon_state_broken = "laptop-broken"
randpixel = 6
center_of_mass = list("x"=14, "y"=10)
base_idle_power_usage = 25
base_active_power_usage = 200
max_hardware_size = 2
Expand Down
Expand Up @@ -22,16 +22,19 @@

// Engineering
/obj/item/modular_computer/console/preset/engineering/
name = "engineering console"
_app_preset_name = "engineering"
enrolled = 1

// Medical
/obj/item/modular_computer/console/preset/medical/
name = "medical console"
_app_preset_name = "medical"
enrolled = 1

// Research
/obj/item/modular_computer/console/preset/research/
name = "research console"
_app_preset_name = "research"
enrolled = 1

Expand All @@ -41,6 +44,7 @@

// Command
/obj/item/modular_computer/console/preset/command/
name = "command console"
_app_preset_name = "command"
enrolled = 1

Expand All @@ -52,6 +56,7 @@
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)

/obj/item/modular_computer/console/preset/captain/
name = "captain's console"
_app_preset_name = "captain"
enrolled = 1

Expand All @@ -64,16 +69,29 @@

// Security
/obj/item/modular_computer/console/preset/security/
name = "security console"
_app_preset_name = "security"
enrolled = 1

/obj/item/modular_computer/console/preset/security/investigations
name = "investigations console"
_app_preset_name = "security_inv"
enrolled = 1

/obj/item/modular_computer/console/preset/security/hos
name = "head of security's console"
_app_preset_name = "security_head"
enrolled = 1

// Civilian
/obj/item/modular_computer/console/preset/civilian/
name = "civilian console"
_app_preset_name = "civilian"
enrolled = 1

// Supply
/obj/item/modular_computer/console/preset/supply/
name = "supply console"
_app_preset_name = "supply"
enrolled = 1

Expand Down
107 changes: 107 additions & 0 deletions code/modules/modular_computers/computers/subtypes/preset_laptop.dm
@@ -0,0 +1,107 @@
/obj/item/modular_computer/laptop/preset
anchored = 0
screen_on = 0
icon_state = "laptop-closed"

/obj/item/modular_computer/laptop/preset/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(src)
network_card = new/obj/item/weapon/computer_hardware/network_card(src)
battery_module = new/obj/item/weapon/computer_hardware/battery_module(src)
battery_module.charge_to_full()
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
nano_printer.max_paper = 10
nano_printer.stored_paper = 5

/obj/item/modular_computer/laptop/preset/install_default_programs()
..()

// Engineering
/obj/item/modular_computer/laptop/preset/engineering/
name = "engineering laptop"
desc = "A portable computer belonging to the engineering department. It appears to have been used as a door stop at one point or another."
_app_preset_name = "engineering"
enrolled = 1

/obj/item/modular_computer/laptop/preset/engineering/ce/
name = "chief engineer's laptop"
desc = "A portable computer belonging to the chief engineer."
_app_preset_name = "engineering_head"

// Medical
/obj/item/modular_computer/laptop/preset/medical/
name = "medical laptop"
desc = "A portable computer belonging to the medical department."
_app_preset_name = "medical"
enrolled = 1

/obj/item/modular_computer/laptop/preset/medical/cmo/
name = "chief medical officer's laptop"
desc = "A portable computer belonging to the chief medical officer."
_app_preset_name = "medical_head"

// Research
/obj/item/modular_computer/laptop/preset/research/
name = "research laptop"
desc = "A portable computer belonging to the research department."
_app_preset_name = "research"
enrolled = 1

/obj/item/modular_computer/laptop/preset/research/install_default_hardware()
..()
ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src)

/obj/item/modular_computer/laptop/preset/research/rd/
name = "research director's laptop"
desc = "A portable computer belonging to the research director. The edges are stained and partially melted."
_app_preset_name = "research_head"

// Command
/obj/item/modular_computer/laptop/preset/command/
name = "command laptop"
_app_preset_name = "command"
enrolled = 1

/obj/item/modular_computer/laptop/preset/command/hop/
name = "head of personnel's laptop"
desc = "A portable computer beloning to the head of personnel. The fan is filled with dog hair."
_app_preset_name = "command_hop"

/obj/item/modular_computer/laptop/preset/command/captain/
name = "captain's laptop"
desc = "A portable computer belonging to the captain."
_app_preset_name = "captain"

// Security
/obj/item/modular_computer/laptop/preset/security/
name = "security laptop"
desc = "A portable computer belonging to the security department."
_app_preset_name = "security"
enrolled = 1

/obj/item/modular_computer/laptop/preset/security/hos/
name = "head of security's laptop"
desc = "A portable computer belonging to the head of security. It smells faintly of gunpowder."
_app_preset_name = "security_head"

// Civilian
/obj/item/modular_computer/laptop/preset/civilian/
_app_preset_name = "civilian"
enrolled = 1

// Supply
/obj/item/modular_computer/laptop/preset/supply/
name = "supply laptop"
desc = "A portable computer belonging to cargo."
_app_preset_name = "supply"
enrolled = 1

// Representative
/obj/item/modular_computer/laptop/preset/representative/
name = "representative's laptop"
desc = "A portable computer belonging to the representative's office."
_app_preset_name = "representative"
enrolled = 1


134 changes: 130 additions & 4 deletions code/modules/modular_computers/file_system/programs/app_presets.dm
Expand Up @@ -37,6 +37,28 @@
)
return _prg_list

/datum/modular_computer_app_presets/engineering/ce
name = "engineering_head"
display_name = "Engineering - CE"
description = "Contains the most common engineering programs and command software."
available = 0

/datum/modular_computer_app_presets/engineering/ce/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/civilian/cargoorder(),
new/datum/computer_file/program/power_monitor(),
new/datum/computer_file/program/alarm_monitor(),
new/datum/computer_file/program/atmos_control(),
new/datum/computer_file/program/rcon_console(),
new/datum/computer_file/program/camera_monitor(),
new/datum/computer_file/program/lighting_control(),
new/datum/computer_file/program/comm(),
new/datum/computer_file/program/records/employment()
)
return _prg_list

/datum/modular_computer_app_presets/medical
name = "medical"
display_name = "Medical"
Expand All @@ -52,6 +74,23 @@
)
return _prg_list

/datum/modular_computer_app_presets/medical/cmo
name = "medical_head"
display_name = "Medical - CMO"
description = "Contains the most common medical programs and command software."
available = 0
/datum/modular_computer_app_presets/medical/cmo/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/civilian/cargoorder(),
new/datum/computer_file/program/suit_sensors(),
new/datum/computer_file/program/comm(),
new/datum/computer_file/program/records/employment(),
new/datum/computer_file/program/records/medical()
)
return _prg_list

/datum/modular_computer_app_presets/research
name = "research"
display_name = "Research"
Expand All @@ -68,6 +107,24 @@
)
return _prg_list

/datum/modular_computer_app_presets/research/rd
name = "research_head"
display_name = "Research - RD"
description = "Contains the most common research programs and command software."
available = 0
/datum/modular_computer_app_presets/research/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/civilian/cargoorder(),
new/datum/computer_file/program/ntnetmonitor(),
new/datum/computer_file/program/aidiag(),
new/datum/computer_file/program/exosuit_monitor(),
new/datum/computer_file/program/comm(1),
new/datum/computer_file/program/records/employment()
)
return _prg_list

/datum/modular_computer_app_presets/command
name = "command"
display_name = "Command"
Expand All @@ -84,6 +141,24 @@
)
return _prg_list

/datum/modular_computer_app_presets/command/hop
name = "command_hop"
display_name = "Command - HoP"
description = "Contains the most common command programs."
available = 0
/datum/modular_computer_app_presets/command/hop/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/civilian/cargoorder(),
new/datum/computer_file/program/civilian/cargocontrol(),
new/datum/computer_file/program/card_mod(),
new/datum/computer_file/program/comm(),
new/datum/computer_file/program/records/employment(),
new/datum/computer_file/program/records/security()
)
return _prg_list

/datum/modular_computer_app_presets/captain
name = "captain"
display_name = "Captain"
Expand All @@ -94,7 +169,7 @@
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/card_mod(),
new/datum/computer_file/program/comm(1,1),
new/datum/computer_file/program/comm(1),
new/datum/computer_file/program/camera_monitor(),
new/datum/computer_file/program/digitalwarrant(),
new/datum/computer_file/program/civilian/cargocontrol(),
Expand All @@ -103,7 +178,6 @@
new/datum/computer_file/program/records/employment(),
new/datum/computer_file/program/records/medical(),
new/datum/computer_file/program/records/security()

)
return _prg_list

Expand All @@ -120,7 +194,44 @@
new/datum/computer_file/program/camera_monitor(),
new/datum/computer_file/program/comm(),
new/datum/computer_file/program/digitalwarrant(),
new/datum/computer_file/program/records/security()
new/datum/computer_file/program/records/security(),
new/datum/computer_file/program/records/employment()
)
return _prg_list

/datum/modular_computer_app_presets/security/investigations
name = "security_inv"
display_name = "Security - Investigations"
description = "Contains the most common security and forensics programs."
available = 0
/datum/modular_computer_app_presets/security/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/camera_monitor(),
new/datum/computer_file/program/digitalwarrant(),
new/datum/computer_file/program/records/security(),
new/datum/computer_file/program/records/employment(),
new/datum/computer_file/program/records/medical()
)
return _prg_list

/datum/modular_computer_app_presets/security/hos
name = "security_head"
display_name = "Security - HoS"
description = "Contains the most common security programs and command software."
available = 0
/datum/modular_computer_app_presets/security/hos/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/civilian/cargoorder(),
new/datum/computer_file/program/camera_monitor(),
new/datum/computer_file/program/comm(),
new/datum/computer_file/program/digitalwarrant(),
new/datum/computer_file/program/records/security(),
new/datum/computer_file/program/comm(1),
new/datum/computer_file/program/records/employment()
)
return _prg_list

Expand All @@ -135,7 +246,7 @@
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/civilian/cargoorder(),
new/datum/computer_file/program/game/arcade(),
new/datum/computer_file/program/game/sudoku()
new/datum/computer_file/program/game/sudoku()
)
return _prg_list

Expand Down Expand Up @@ -167,6 +278,21 @@
)
return _prg_list

/datum/modular_computer_app_presets/representative
name = "representative"
display_name = "Representative"
description = "Contains software intended for representatives."
available = 0
/datum/modular_computer_app_presets/representative/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/game/sudoku(),
new/datum/computer_file/program/civilian/cargoorder(),
new/datum/computer_file/program/records/employment()
)
return _prg_list

/datum/modular_computer_app_presets/wall_generic
name = "wallgeneric"
display_name = "Wall - Generic"
Expand Down

0 comments on commit a28eb4a

Please sign in to comment.