", "\[logo\]")
return text
+
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index eb2305cfdb2..82b2ea8b419 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1347,19 +1347,19 @@ Standard way to write links -Sayu
/proc/get_location_accessible(mob/M, location)
var/covered_locations = 0 //based on body_parts_covered
var/face_covered = 0 //based on flags_inv
- var/eyesmouth_covered = 0 //based on flags
+ var/eyesmouth_covered = 0 //based on flags_cover
if(iscarbon(M))
var/mob/living/carbon/C = M
for(var/obj/item/clothing/I in list(C.back, C.wear_mask))
covered_locations |= I.body_parts_covered
face_covered |= I.flags_inv
- eyesmouth_covered |= I.flags
+ eyesmouth_covered |= I.flags_cover
if(ishuman(C))
var/mob/living/carbon/human/H = C
for(var/obj/item/I in list(H.wear_suit, H.w_uniform, H.shoes, H.belt, H.gloves, H.glasses, H.head, H.r_ear, H.l_ear))
covered_locations |= I.body_parts_covered
face_covered |= I.flags_inv
- eyesmouth_covered |= I.flags
+ eyesmouth_covered |= I.flags_cover
switch(location)
if("head")
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 41588a7b07a..f4fad058068 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -30,7 +30,7 @@ var/global/list/deliverybeacons = list() //list of all MULEbot delivery beacon
var/global/list/deliverybeacontags = list() //list of all tags associated with delivery beacons.
var/global/list/beacons = list()
-var/global/list/shuttle_caller_list = list() //list of all communication consoles and AIs, for automatic shuttle calls when there are none.
+var/global/list/shuttle_caller_list = list() //list of all communication consoles, comms consoles circuit and AIs, for automatic shuttle calls when there are none.
var/global/list/tracked_implants = list() //list of all current implants that are tracked to work out what sort of trek everyone is on. Sadly not on lavaworld not implemented...
var/global/list/pinpointer_list = list() //list of all pinpointers. Used to change stuff they are pointing to all at once.
var/global/list/abductor_equipment = list() //list of all abductor equipment
diff --git a/code/controllers/Processes/shuttles.dm b/code/controllers/Processes/shuttles.dm
index 9c01974a1a9..b6b078323e9 100644
--- a/code/controllers/Processes/shuttles.dm
+++ b/code/controllers/Processes/shuttles.dm
@@ -182,6 +182,8 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
var/obj/machinery/computer/communications/C = thing
if(C.stat & BROKEN)
continue
+ else if(istype(thing, /datum/computer_file/program/comm) || istype(thing, /obj/item/weapon/circuitboard/communications))
+ continue
var/turf/T = get_turf(thing)
if(T && is_station_level(T.z))
diff --git a/code/datums/cache/apc.dm b/code/datums/cache/apc.dm
index 4271886ac4b..29a2574f6e0 100644
--- a/code/datums/cache/apc.dm
+++ b/code/datums/cache/apc.dm
@@ -1,8 +1,8 @@
var/global/datum/repository/apc/apc_repository = new()
-/datum/repository/apc/proc/apc_data(var/obj/machinery/computer/monitor/powermonitor)
+/datum/repository/apc/proc/apc_data(datum/powernet/powernet)
var/apcData[0]
-
+
var/datum/cache_entry/cache_entry = cache_data
if(!cache_entry)
cache_entry = new/datum/cache_entry
@@ -10,10 +10,10 @@ var/global/datum/repository/apc/apc_repository = new()
if(world.time < cache_entry.timestamp)
return cache_entry.data
-
- if(powermonitor && !isnull(powermonitor.powernet))
+
+ if(powernet)
var/list/L = list()
- for(var/obj/machinery/power/terminal/term in powermonitor.powernet.nodes)
+ for(var/obj/machinery/power/terminal/term in powernet.nodes)
if(istype(term.master, /obj/machinery/power/apc))
var/obj/machinery/power/apc/A = term.master
L += A
@@ -24,5 +24,5 @@ var/global/datum/repository/apc/apc_repository = new()
apcData[++apcData.len] = list("Name" = html_encode(A.area.name), "Equipment" = Status[A.equipment+1], "Lights" = Status[A.lighting+1], "Environment" = Status[A.environ+1], "CellPct" = A.cell ? round(A.cell.percent(),1) : "M", "CellStatus" = A.cell ? chg[A.charging+1] : "M", "Load" = round(A.lastused_total,1))
cache_entry.timestamp = world.time + 5 SECONDS
- cache_entry.data = apcData
+ cache_entry.data = apcData
return apcData
\ No newline at end of file
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index 4219032fb96..9a6438853c0 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -279,7 +279,7 @@
name = "flesh mass"
icon_state = "lingspacehelmet"
desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front."
- flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | NODROP
+ flags = BLOCKHAIR | STOPSPRESSUREDMAGE | NODROP
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/head/helmet/space/changeling/dropped()
@@ -330,7 +330,7 @@
name = "chitinous mass"
desc = "A tough, hard covering of black chitin with transparent chitin in front."
icon_state = "lingarmorhelmet"
- flags = HEADCOVERSEYES | BLOCKHAIR | NODROP
+ flags = BLOCKHAIR | NODROP
armor = list(melee = 30, bullet = 30, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0)
flags_inv = HIDEEARS
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index f7bdc478466..bf6ce4ade07 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -64,7 +64,7 @@
icon_state = "culthood"
desc = "A hood worn by the followers of a cult."
flags_inv = HIDEFACE
- flags = HEADCOVERSEYES
+ flags_cover = HEADCOVERSEYES
armor = list(melee = 30, bullet = 10, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 0)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
@@ -96,8 +96,9 @@
icon_state = "magus"
item_state = "magus"
desc = "A helm worn by the followers of Nar-Sie."
+ flags = BLOCKHAIR
flags_inv = HIDEFACE
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
armor = list(melee = 30, bullet = 30, laser = 30, energy = 20, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/magusred
@@ -145,8 +146,9 @@
icon_state = "cult_hoodalt"
armor = list(melee = 50, bullet = 40, laser = 50, energy = 30, bomb = 50, bio = 30, rad = 30)
body_parts_covered = HEAD
+ flags = NODROP
flags_inv = HIDEFACE
- flags = NODROP | HEADCOVERSEYES
+ flags_cover = HEADCOVERSEYES
/obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/living/user, slot)
..()
@@ -186,7 +188,7 @@
desc = "Blood-soaked garb infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage."
icon_state = "culthood"
flags_inv = HIDEFACE
- flags = HEADCOVERSEYES
+ flags_cover = HEADCOVERSEYES
armor = list(melee = -100, bullet = -100, laser = -100, energy = -100, bomb = -100, bio = -100, rad = -100)
/obj/item/weapon/whetstone/cult
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index a41f86020d5..e644af03f3c 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -163,9 +163,7 @@
D.hostile_lockdown(src)
addtimer(D, "disable_lockdown", 900)
- var/obj/machinery/computer/communications/C = locate() in machines
- if(C)
- C.post_status("alert", "lockdown")
+ post_status("alert", "lockdown")
verbs -= /mob/living/silicon/ai/proc/lockdown
minor_announcement.Announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.", "Network Alert")
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 2a72f32bedf..2f0e9ab849a 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -74,6 +74,7 @@
/var/const/access_magistrate = 74
/var/const/access_minisat = 75
/var/const/access_mineral_storeroom = 76
+/var/const/access_network = 77
/var/const/access_weapons = 99 //Weapon authorization for secbots
@@ -244,7 +245,7 @@ var/const/access_trade_sol = 160
access_theatre, access_research, access_mining, access_mailsorting,
access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce,
access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_paramedic, access_blueshield, access_mechanic,access_weapons,
- access_pilot, access_ntrep, access_magistrate, access_mineral_storeroom, access_minisat)
+ access_pilot, access_ntrep, access_magistrate, access_mineral_storeroom, access_minisat, access_network)
/proc/get_all_centcom_access()
return list(access_cent_general, access_cent_living, access_cent_medical, access_cent_security, access_cent_storage, access_cent_shuttles, access_cent_telecomms, access_cent_teleporter, access_cent_specops, access_cent_specops_commander, access_cent_blackops, access_cent_thunder, access_cent_bridge, access_cent_commander)
@@ -269,7 +270,7 @@ var/const/access_trade_sol = 160
if(REGION_MEDBAY) //medbay
return list(access_medical, access_genetics, access_morgue, access_chemistry, access_psychiatrist, access_virology, access_surgery, access_cmo, access_paramedic)
if(REGION_RESEARCH) //research
- return list(access_research, access_tox, access_tox_storage, access_genetics, access_robotics, access_xenobiology, access_xenoarch, access_minisat, access_rd)
+ return list(access_research, access_tox, access_tox_storage, access_genetics, access_robotics, access_xenobiology, access_xenoarch, access_minisat, access_rd, access_network)
if(REGION_ENGINEERING) //engineering and maintenance
return list(access_construction, access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_minisat, access_ce, access_mechanic)
if(REGION_SUPPLY) //supply
@@ -429,6 +430,8 @@ var/const/access_trade_sol = 160
return "Keycode Auth. Device"
if(access_tcomsat)
return "Telecommunications"
+ if(access_network)
+ return "Network Access"
if(access_gateway)
return "Gateway"
if(access_sec_doors)
diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
index 2701589b2db..37bb83eedf6 100644
--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -1,28 +1,28 @@
/datum/job/rd
- title = "Research Director"
- flag = RD
- department_flag = MEDSCI
- total_positions = 1
- spawn_positions = 1
- is_science = 1
- supervisors = "the captain"
- selection_color = "#ffddff"
+ title = "Research Director"
+ flag = RD
+ department_flag = MEDSCI
+ total_positions = 1
+ spawn_positions = 1
+ is_science = 1
+ supervisors = "the captain"
+ selection_color = "#ffddff"
req_admin_notify = 1
- access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
+ access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
access_tox_storage, access_tech_storage, access_teleporter, access_sec_doors,
access_research, access_robotics, access_xenobiology, access_ai_upload,
- access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_minisat, access_mineral_storeroom)
- minimal_access = list(access_eva, access_rd, access_heads, access_tox, access_genetics, access_morgue,
+ access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_minisat, access_mineral_storeroom, access_network)
+ minimal_access = list(access_eva, access_rd, access_heads, access_tox, access_genetics, access_morgue,
access_tox_storage, access_tech_storage, access_teleporter, access_sec_doors,
access_research, access_robotics, access_xenobiology, access_ai_upload,
- access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_minisat, access_maint_tunnels, access_mineral_storeroom)
- minimal_player_age = 21
- exp_requirements = 600
- exp_type = EXP_TYPE_CREW
-
- // All science-y guys get bonuses for maxing out their tech.
+ access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_minisat, access_maint_tunnels, access_mineral_storeroom, access_network)
+ minimal_player_age = 21
+ exp_requirements = 600
+ exp_type = EXP_TYPE_CREW
+
+ // All science-y guys get bonuses for maxing out their tech.
required_objectives = list(
- /datum/job_objective/further_research
+ /datum/job_objective/further_research
)
outfit = /datum/outfit/job/rd
@@ -46,24 +46,24 @@
satchel = /obj/item/weapon/storage/backpack/satchel_tox
dufflebag = /obj/item/weapon/storage/backpack/duffel/science
-
-/datum/job/scientist
- title = "Scientist"
- flag = SCIENTIST
- department_flag = MEDSCI
- total_positions = 6
- spawn_positions = 6
- is_science = 1
- supervisors = "the research director"
- selection_color = "#ffeeff"
- access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_mineral_storeroom)
- minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_maint_tunnels, access_mineral_storeroom)
- alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist", "Chemical Researcher")
- minimal_player_age = 3
-
- // All science-y guys get bonuses for maxing out their tech.
+
+/datum/job/scientist
+ title = "Scientist"
+ flag = SCIENTIST
+ department_flag = MEDSCI
+ total_positions = 6
+ spawn_positions = 6
+ is_science = 1
+ supervisors = "the research director"
+ selection_color = "#ffeeff"
+ access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_mineral_storeroom)
+ minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_maint_tunnels, access_mineral_storeroom)
+ alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist", "Chemical Researcher")
+ minimal_player_age = 3
+
+ // All science-y guys get bonuses for maxing out their tech.
required_objectives = list(
- /datum/job_objective/further_research
+ /datum/job_objective/further_research
)
outfit = /datum/outfit/job/scientist
@@ -84,23 +84,23 @@
dufflebag = /obj/item/weapon/storage/backpack/duffel/science
-/datum/job/roboticist
- title = "Roboticist"
- flag = ROBOTICIST
- department_flag = MEDSCI
- total_positions = 2
- spawn_positions = 2
- is_science = 1
- supervisors = "the research director"
- selection_color = "#ffeeff"
- access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research, access_mineral_storeroom) //As a job that handles so many corpses, it makes sense for them to have morgue access.
- minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research, access_maint_tunnels, access_mineral_storeroom) //As a job that handles so many corpses, it makes sense for them to have morgue access.
- alt_titles = list("Biomechanical Engineer","Mechatronic Engineer")
- minimal_player_age = 3
-
+/datum/job/roboticist
+ title = "Roboticist"
+ flag = ROBOTICIST
+ department_flag = MEDSCI
+ total_positions = 2
+ spawn_positions = 2
+ is_science = 1
+ supervisors = "the research director"
+ selection_color = "#ffeeff"
+ access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research, access_mineral_storeroom) //As a job that handles so many corpses, it makes sense for them to have morgue access.
+ minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research, access_maint_tunnels, access_mineral_storeroom) //As a job that handles so many corpses, it makes sense for them to have morgue access.
+ alt_titles = list("Biomechanical Engineer","Mechatronic Engineer")
+ minimal_player_age = 3
+
required_objectives = list(
- /datum/job_objective/make_cyborg,
- /datum/job_objective/make_ripley
+ /datum/job_objective/make_cyborg,
+ /datum/job_objective/make_ripley
)
outfit = /datum/outfit/job/roboticist
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 6087bc68d08..2b3d461da4c 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -69,8 +69,8 @@
feedback_inc("alert_comms_green",1)
if(SEC_LEVEL_BLUE)
feedback_inc("alert_comms_blue",1)
- tmp_alertlevel = 0
-
+ tmp_alertlevel = 0
+
/obj/machinery/computer/communications/Topic(href, href_list)
if(..(href, href_list))
return 1
@@ -196,9 +196,9 @@
var/text = messagetext[id]
messagetitle.Remove(title)
messagetext.Remove(text)
- if(currmsg == id)
+ if(currmsg == id)
currmsg = 0
- if(aicurrmsg == id)
+ if(aicurrmsg == id)
aicurrmsg = 0
setMenuState(usr,COMM_SCREEN_MESSAGES)
@@ -210,11 +210,11 @@
display_type=href_list["statdisp"]
switch(display_type)
if("message")
- post_status("message", stat_msg1, stat_msg2)
+ post_status("message", stat_msg1, stat_msg2, usr)
if("alert")
- post_status("alert", href_list["alert"])
+ post_status("alert", href_list["alert"], user = usr)
else
- post_status(href_list["statdisp"])
+ post_status(href_list["statdisp"], user = usr)
setMenuState(usr,COMM_SCREEN_STAT)
if("setmsg1")
@@ -378,7 +378,7 @@
list("id" = SEC_LEVEL_BLUE, "name" = "Blue"),
//SEC_LEVEL_RED = list("name"="Red"),
)
-
+
var/list/msg_data = list()
for(var/i = 1; i <= messagetext.len; i++)
msg_data.Add(list(list("title" = messagetitle[i], "body" = messagetext[i], "id" = i)))
@@ -499,7 +499,7 @@
message_admins("[key_name_admin(user)] has recalled the shuttle - [formatJumpTo(user)].", 1)
return
-/obj/machinery/computer/communications/proc/post_status(var/command, var/data1, var/data2)
+/proc/post_status(command, data1, data2, mob/user = null)
var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435)
@@ -514,7 +514,7 @@
if("message")
status_signal.data["msg1"] = data1
status_signal.data["msg2"] = data2
- log_admin("STATUS: [src.fingerprintslast] set status screen message with [src]: [data1] [data2]")
+ log_admin("STATUS: [user] set status screen message with [src]: [data1] [data2]")
//message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
if("alert")
status_signal.data["picture_state"] = data1
@@ -527,35 +527,30 @@
shuttle_master.autoEvac()
return ..()
+/obj/item/weapon/circuitboard/communications/New()
+ shuttle_caller_list += src
+ ..()
+
/obj/item/weapon/circuitboard/communications/Destroy()
-
- for(var/obj/machinery/computer/communications/commconsole in world)
- if(istype(commconsole.loc,/turf))
- return ..()
-
- for(var/obj/item/weapon/circuitboard/communications/commboard in world)
- if((istype(commboard.loc,/turf) || istype(commboard.loc,/obj/item/weapon/storage)) && commboard != src)
- return ..()
-
- for(var/mob/living/silicon/ai/shuttlecaller in player_list)
- if(!shuttlecaller.stat && shuttlecaller.client && istype(shuttlecaller.loc,/turf))
- return ..()
-
- if(GAMEMODE_IS_REVOLUTION || sent_strike_team)
- return ..()
-
- shuttle_master.emergency.request(null, 0.3, null, "All communication consoles, boards, and AI's have been destroyed.")
- log_game("All the AI's, communication consoles and boards are destroyed. Shuttle called.")
- message_admins("All the AI's, communication consoles and boards are destroyed. Shuttle called.", 1)
-
+ shuttle_caller_list -= src
+ shuttle_master.autoEvac()
return ..()
-
+
/proc/print_command_report(text = "", title = "Central Command Update")
- for(var/obj/machinery/computer/communications/C in machines)
+ for(var/obj/machinery/computer/communications/C in shuttle_caller_list)
if(!(C.stat & (BROKEN|NOPOWER)) && is_station_contact(C.z))
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(C.loc)
P.name = "paper- '[title]'"
P.info = text
+ P.update_icon()
C.messagetitle.Add("[title]")
C.messagetext.Add(text)
- P.update_icon()
\ No newline at end of file
+ for(var/datum/computer_file/program/comm/P in shuttle_caller_list)
+ var/turf/T = get_turf(P.computer)
+ if(T && P.program_state != PROGRAM_STATE_KILLED && is_station_contact(T.z))
+ if(P.computer)
+ var/obj/item/weapon/computer_hardware/printer/printer = P.computer.all_components[MC_PRINT]
+ if(printer)
+ printer.print_text(text, "paper- '[title]'")
+ P.messagetitle.Add("[title]")
+ P.messagetext.Add(text)
\ No newline at end of file
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 6c9f7fe1feb..4a7155aa6cb 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -55,7 +55,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
var/strip_delay = DEFAULT_ITEM_STRIP_DELAY
var/put_on_delay = DEFAULT_ITEM_PUTON_DELAY
var/breakouttime = 0
-
+ var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES
var/flags_size = 0 //flag, primarily used for clothing to determine if a fatty can wear something or not.
var/block_chance = 0
@@ -432,9 +432,9 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
var/mob/living/carbon/human/H = M
if(istype(H) && ( \
- (H.head && H.head.flags & HEADCOVERSEYES) || \
- (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
- (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
+ (H.head && H.head.flags_cover & HEADCOVERSEYES) || \
+ (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES) || \
+ (H.glasses && H.glasses.flags_cover & GLASSESCOVERSEYES) \
))
// you can't stab someone in the eyes wearing a mask!
to_chat(user, "You're going to need to remove that mask/helmet/glasses first!")
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 216c37e7a51..48e01dba29b 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -54,8 +54,8 @@
return
var/mob/living/carbon/human/H = M //mob has protective eyewear
- if(istype(H) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
- to_chat(user, "You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask" : "glasses"] first.")
+ if(istype(H) && ((H.head && H.head.flags_cover & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES) || (H.glasses && H.glasses.flags_cover & GLASSESCOVERSEYES)))
+ to_chat(user, "You're going to need to remove that [(H.head && H.head.flags_cover & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES) ? "mask" : "glasses"] first.")
return
if(M == user) //they're using it on themselves
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index a28c216da76..514a0bcdf76 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -50,6 +50,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
new /datum/stack_recipe/rods("metal rod", /obj/item/stack/rods, 1, 2, 60),
null,
new /datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, time = 25, one_per_turf = 1, on_floor = 1),
+ new /datum/stack_recipe("modular console", /obj/machinery/modular_computer/console/buildable/, 10, time = 25, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1),
diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm
index a48bc19d512..04470cf7854 100644
--- a/code/game/objects/items/weapons/garrote.dm
+++ b/code/game/objects/items/weapons/garrote.dm
@@ -70,7 +70,7 @@
to_chat(user, "You cannot use [src] on [M] from that angle!")
return
- if(improvised && ((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))) // Improvised garrotes are blocked by mouth-covering items.
+ if(improvised && ((M.head && (M.head.flags_cover & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags_cover & MASKCOVERSMOUTH)))) // Improvised garrotes are blocked by mouth-covering items.
to_chat(user, "[M]'s neck is blocked by something they're wearing!")
if(strangling)
diff --git a/code/modules/alarm/alarm_handler.dm b/code/modules/alarm/alarm_handler.dm
index 9878a4b5e5e..cd09ebe4427 100644
--- a/code/modules/alarm/alarm_handler.dm
+++ b/code/modules/alarm/alarm_handler.dm
@@ -47,6 +47,11 @@
existing.clear(source)
return check_alarm_cleared(existing)
+/datum/alarm_handler/proc/has_major_alarms()
+ if(alarms && alarms.len)
+ return 1
+ return 0
+
/datum/alarm_handler/proc/major_alarms()
return alarms
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index e02a1a8d810..72534169e6d 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -225,6 +225,29 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
"boardui.js" = 'html/browser/boardui.js'
)
+/datum/asset/simple/headers
+ assets = list(
+ "alarm_green.gif" = 'icons/program_icons/alarm_green.gif',
+ "alarm_red.gif" = 'icons/program_icons/alarm_red.gif',
+ "batt_5.gif" = 'icons/program_icons/batt_5.gif',
+ "batt_20.gif" = 'icons/program_icons/batt_20.gif',
+ "batt_40.gif" = 'icons/program_icons/batt_40.gif',
+ "batt_60.gif" = 'icons/program_icons/batt_60.gif',
+ "batt_80.gif" = 'icons/program_icons/batt_80.gif',
+ "batt_100.gif" = 'icons/program_icons/batt_100.gif',
+ "charging.gif" = 'icons/program_icons/charging.gif',
+ "downloader_finished.gif" = 'icons/program_icons/downloader_finished.gif',
+ "downloader_running.gif" = 'icons/program_icons/downloader_running.gif',
+ "ntnrc_idle.gif" = 'icons/program_icons/ntnrc_idle.gif',
+ "ntnrc_new.gif" = 'icons/program_icons/ntnrc_new.gif',
+ "power_norm.gif" = 'icons/program_icons/power_norm.gif',
+ "power_warn.gif" = 'icons/program_icons/power_warn.gif',
+ "sig_high.gif" = 'icons/program_icons/sig_high.gif',
+ "sig_low.gif" = 'icons/program_icons/sig_low.gif',
+ "sig_lan.gif" = 'icons/program_icons/sig_lan.gif',
+ "sig_none.gif" = 'icons/program_icons/sig_none.gif',
+ )
+
/datum/asset/nanoui
var/list/common = list()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 6c6af907ba5..652a53c6af0 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -14,7 +14,7 @@
var/list/sprite_sheets_refit = null
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
-
+ var/alt_desc = null
var/flash_protect = 0 //What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS
var/tint = 0 //Sets the item's level of visual impairment tint, normally set to the same as flash_protect
var/up = 0 //but seperated to allow items to protect but not impair vision, like space helmets
@@ -146,7 +146,7 @@
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
w_class = 2
- flags = GLASSESCOVERSEYES
+ flags_cover = GLASSESCOVERSEYES
slot_flags = SLOT_EYES
materials = list(MAT_GLASS = 250)
var/vision_flags = 0
@@ -312,10 +312,11 @@ BLIND // can't see anything
if(initial(flags_inv) & HIDEFACE) //If the mask is one that hides the face and can be adjusted yet lost that trait when it was adjusted, make it hide the face again.
flags_inv |= HIDEFACE
if(flags != initial(flags))
- if(initial(flags) & MASKCOVERSMOUTH) //If the mask covers the mouth when it's down and can be adjusted yet lost that trait when it was adjusted, make it cover the mouth again.
- flags |= MASKCOVERSMOUTH
if(initial(flags) & AIRTIGHT) //If the mask is airtight and thus, one that you'd be able to run internals from yet can't because it was adjusted, make it airtight again.
flags |= AIRTIGHT
+ if(flags_cover != initial(flags_cover))
+ if(initial(flags_cover) & MASKCOVERSMOUTH) //If the mask covers the mouth when it's down and can be adjusted yet lost that trait when it was adjusted, make it cover the mouth again.
+ flags_cover |= MASKCOVERSMOUTH
if(H.head == src && flags_inv == HIDEFACE) //Means that only things like bandanas and balaclavas will be affected since they obscure the identity of the wearer.
if(H.l_hand && H.r_hand) //If both hands are occupied, drop the object on the ground.
user.unEquip(src)
@@ -338,8 +339,8 @@ BLIND // can't see anything
if(flags_inv & HIDEFACE) //Means that only things like bandanas and balaclavas will be affected since they obscure the identity of the wearer.
flags_inv &= ~HIDEFACE /*Done after the above to avoid having to do a check for initial(src.flags_inv == HIDEFACE).
This reveals the user's face since the bandana will now be going on their head.*/
- if(flags & MASKCOVERSMOUTH) //Mask won't cover the mouth any more since it's been pushed out of the way. Allows for CPRing with adjusted masks.
- flags &= ~MASKCOVERSMOUTH
+ if(flags_cover & MASKCOVERSMOUTH) //Mask won't cover the mouth any more since it's been pushed out of the way. Allows for CPRing with adjusted masks.
+ flags_cover &= ~MASKCOVERSMOUTH
if(flags & AIRTIGHT) //If the mask was airtight, it won't be anymore since you just pushed it off your face.
flags &= ~AIRTIGHT
if(user.wear_mask == src && initial(flags_inv) == HIDEFACE) //Means that you won't have to take off and put back on simple things like breath masks which, realistically, can just be pulled down off your face.
@@ -521,7 +522,8 @@ BLIND // can't see anything
name = "Space helmet"
icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
- flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL
+ flags = BLOCKHAIR | STOPSPRESSUREDMAGE | THICKMATERIAL
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
item_state = "s_helmet"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 50)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 140b5f1a999..d8037901c2a 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -75,6 +75,7 @@
icon_state = "cybereye-green"
item_state = "eyepatch"
flags = NODROP
+ flags_cover = null
prescription_upgradable = 0
/obj/item/clothing/glasses/science
@@ -167,6 +168,7 @@
icon_state = "cybereye-blue"
item_state = "eyepatch"
flags = NODROP
+ flags_cover = null
/obj/item/clothing/glasses/regular
name = "prescription glasses"
@@ -284,7 +286,7 @@
/obj/item/clothing/glasses/sunglasses/lasers
desc = "A peculiar set of sunglasses; they have various chips and other panels attached to the sides of the frames."
name = "high-tech sunglasses"
- flags = GLASSESCOVERSEYES | NODROP
+ flags = NODROP
/obj/item/clothing/glasses/sunglasses/lasers/equipped(mob/user, slot) //grant them laser eyes upon equipping it.
if(slot == slot_glasses)
@@ -312,7 +314,7 @@
/obj/item/clothing/glasses/welding/proc/toggle()
if(up)
up = !up
- flags |= GLASSESCOVERSEYES
+ flags_cover |= GLASSESCOVERSEYES
flags_inv |= HIDEEYES
icon_state = initial(icon_state)
to_chat(usr, "You flip the [src] down to protect your eyes.")
@@ -320,7 +322,7 @@
tint = initial(tint) //better than istype
else
up = !up
- flags &= ~GLASSESCOVERSEYES
+ flags_cover &= ~GLASSESCOVERSEYES
flags_inv &= ~HIDEEYES
icon_state = "[initial(icon_state)]up"
to_chat(usr, "You push the [src] up out of your face.")
@@ -397,7 +399,7 @@
name = "Thermoncle"
desc = "A monocle thermal."
icon_state = "thermoncle"
- flags = null //doesn't protect eyes because it's a monocle, duh
+ flags_cover = null //doesn't protect eyes because it's a monocle, duh
/obj/item/clothing/glasses/thermal/eyepatch
name = "Optical Thermal Eyepatch"
@@ -478,6 +480,7 @@
darkness_view = 8
scan_reagents = 1
flags = NODROP
+ flags_cover = null
invis_view = SEE_INVISIBLE_MINIMUM
/obj/item/clothing/glasses/godeye/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index cb5faac3eda..348ba39f7a9 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -2,7 +2,8 @@
name = "helmet"
desc = "Standard Security gear. Protects the head from impacts."
icon_state = "helmetmaterials"
- flags = HEADCOVERSEYES | HEADBANGPROTECT
+ flags = HEADBANGPROTECT
+ flags_cover = HEADCOVERSEYES
item_state = "helmetmaterials"
armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
flags_inv = HIDEEARS|HIDEEYES
@@ -79,9 +80,9 @@
desc = "It's a helmet specifically designed to protect against close range attacks."
icon_state = "riot"
item_state = "helmet"
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | HEADBANGPROTECT
armor = list(melee = 41, bullet = 15, laser = 5, energy = 5, bomb = 5, bio = 2, rad = 0)
flags_inv = HIDEEARS
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
strip_delay = 80
/obj/item/clothing/head/helmet/riot/knight
@@ -89,7 +90,7 @@
desc = "A classic metal helmet."
icon_state = "knight_green"
item_state = "knight_green"
- flags = BLOCKHAIR|HEADCOVERSEYES|HEADCOVERSMOUTH
+ flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
/obj/item/clothing/head/helmet/justice
@@ -115,9 +116,9 @@
name = "\improper SWAT helmet"
desc = "They're often used by highly trained Swat Members."
icon_state = "swat"
- flags = HEADCOVERSEYES
item_state = "swat"
armor = list(melee = 40, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 90, rad = 20)
+ flags = null
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
@@ -135,7 +136,7 @@
name = "\improper Thunderdome helmet"
desc = "'Let the battle commence!'"
icon_state = "thunderdome"
- flags = HEADCOVERSEYES
+ flags = null
item_state = "thunderdome"
armor = list(melee = 40, bullet = 30, laser = 25, energy = 10, bomb = 25, bio = 10, rad = 0)
cold_protection = HEAD
@@ -147,7 +148,7 @@
/obj/item/clothing/head/helmet/roman
name = "roman helmet"
desc = "An ancient helmet made of bronze and leather."
- flags = HEADCOVERSEYES
+ flags = null
armor = list(melee = 25, bullet = 0, laser = 25, energy = 10, bomb = 10, bio = 0, rad = 0)
icon_state = "roman"
item_state = "roman"
@@ -163,7 +164,7 @@
name = "gladiator helmet"
desc = "Ave, Imperator, morituri te salutant."
icon_state = "gladiator"
- flags = HEADCOVERSEYES | BLOCKHAIR
+ flags = BLOCKHAIR
item_state = "gladiator"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
toggle_message = "You attach the face shield to the"
@@ -177,7 +178,7 @@ obj/item/clothing/head/helmet/redtaghelm
name = "red laser tag helmet"
desc = "They have chosen their own end."
icon_state = "redtaghelm"
- flags = HEADCOVERSEYES
+ flags = null
item_state = "redtaghelm"
armor = list(melee = 15, bullet = 10, laser = 20, energy = 10, bomb = 20, bio = 0, rad = 0)
// Offer about the same protection as a hardhat.
@@ -187,7 +188,7 @@ obj/item/clothing/head/helmet/bluetaghelm
name = "blue laser tag helmet"
desc = "They'll need more men."
icon_state = "bluetaghelm"
- flags = HEADCOVERSEYES
+ flags = null
item_state = "bluetaghelm"
armor = list(melee = 15, bullet = 10, laser = 20, energy = 10, bomb = 20, bio = 0, rad = 0)
// Offer about the same protection as a hardhat.
@@ -198,8 +199,8 @@ obj/item/clothing/head/blob
desc = "A collectible hat handed out at the latest Blob Family Reunion."
icon_state = "blobhat"
item_state = "blobhat"
- flags = HEADCOVERSEYES|HEADCOVERSMOUTH
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi'
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 9eeb7136221..5d6dde79848 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -43,14 +43,16 @@
name = "chaplain's hood"
desc = "It's hood that covers the head. It keeps you warm during the space winters."
icon_state = "chaplain_hood"
- flags = HEADCOVERSEYES | BLOCKHAIR
+ flags = BLOCKHAIR
+ flags_cover = HEADCOVERSEYES
//Chaplain
/obj/item/clothing/head/nun_hood
name = "nun hood"
desc = "Maximum piety in this star system."
icon_state = "nun_hood"
- flags = HEADCOVERSEYES | BLOCKHAIR
+ flags = BLOCKHAIR
+ flags_cover = HEADCOVERSEYES
/obj/item/clothing/head/det_hat
name = "hat"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 6cfce8c0051..220781a8bfb 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -60,7 +60,8 @@
name = "hastur's hood"
desc = "It's unspeakably stylish"
icon_state = "hasturhood"
- flags = HEADCOVERSEYES | BLOCKHAIR
+ flags = BLOCKHAIR
+ flags_cover = HEADCOVERSEYES
/obj/item/clothing/head/nursehat
name = "nurse's hat"
@@ -80,16 +81,18 @@
desc = "A large, featureless white orb meant to be worn on your head. How do you even see out of this thing?"
icon_state = "cueball"
item_state = "cueball"
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
+ flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
/obj/item/clothing/head/snowman
name = "snowman head"
desc = "A ball of white styrofoam. So festive."
icon_state = "snowman_h"
item_state = "snowman_h"
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
+ flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
/obj/item/clothing/head/that
name = "sturdy top-hat"
@@ -111,7 +114,8 @@
desc = "Fight for what's righteous!"
icon_state = "justicered"
item_state = "justicered"
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
+ flags = BLOCKHAIR
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
/obj/item/clothing/head/justice/blue
icon_state = "justiceblue"
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 4d9970adba3..aa5a81c2063 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -15,7 +15,7 @@
name = "welding helmet"
desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye."
icon_state = "welding"
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
item_state = "welding"
materials = list(MAT_METAL=1750, MAT_GLASS=400)
flash_protect = 2
@@ -53,7 +53,7 @@
/obj/item/clothing/head/welding/proc/toggle()
if(up)
up = !up
- flags |= (HEADCOVERSEYES | HEADCOVERSMOUTH)
+ flags_cover |= (HEADCOVERSEYES | HEADCOVERSMOUTH)
flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
icon_state = initial(icon_state)
to_chat(usr, "You flip the [src] down to protect your eyes.")
@@ -61,7 +61,7 @@
tint = 2
else
up = !up
- flags &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH)
+ flags_cover &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH)
flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
icon_state = "[initial(icon_state)]up"
to_chat(usr, "You push the [src] up out of your face.")
@@ -84,7 +84,7 @@
name = "cake-hat"
desc = "It's tasty looking!"
icon_state = "cake0"
- flags = HEADCOVERSEYES
+ flags_cover = HEADCOVERSEYES
var/onfire = 0.0
var/status = 0
var/fire_resist = T0C+1300 //this is the max temp it can stand before you start to cook. although it might not burn away, you take damage
@@ -150,8 +150,9 @@
icon_state = "hardhat0_pumpkin"//Could stand to be renamed
item_state = "hardhat0_pumpkin"
item_color = "pumpkin"
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
+ flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
brightness_on = 2 //luminosity when on
@@ -220,8 +221,8 @@
desc = "A helmet made out of a box."
icon_state = "cardborg_h"
item_state = "cardborg_h"
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
species_disguise = "High-tech robot"
/obj/item/clothing/head/cardborg/equipped(mob/living/user, slot)
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 295ec84c4af..c0ebe33a796 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -3,7 +3,8 @@
name = "breath mask"
icon_state = "breath"
item_state = "breath"
- flags = MASKCOVERSMOUTH | AIRTIGHT
+ flags = AIRTIGHT
+ flags_cover = MASKCOVERSMOUTH
w_class = 2
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index ccf9552a5e6..1983e5094b9 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -2,8 +2,9 @@
name = "gas mask"
desc = "A face-covering mask that can be connected to an air supply."
icon_state = "gas_alt"
- flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
+ flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
+ flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
w_class = 3
item_state = "gas_alt"
gas_transfer_coefficient = 0.01
@@ -38,7 +39,7 @@
/obj/item/clothing/mask/gas/welding/proc/toggle()
if(up)
up = !src.up
- flags |= (MASKCOVERSEYES)
+ flags_cover |= (MASKCOVERSEYES)
flags_inv |= (HIDEEYES)
icon_state = initial(icon_state)
to_chat(usr, "You flip the [src] down to protect your eyes.")
@@ -46,7 +47,7 @@
tint = 2
else
up = !up
- flags &= ~(MASKCOVERSEYES)
+ flags_cover &= ~(MASKCOVERSEYES)
flags_inv &= ~(HIDEEYES)
icon_state = "[initial(icon_state)]up"
to_chat(usr, "You push the [src] up out of your face.")
@@ -65,8 +66,9 @@
name = "bane mask"
desc = "Only when the station is in flames, do you have my permission to robust."
icon_state = "bane_mask"
- flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
+ flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
+ flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
w_class = 3
item_state = "bane_mask"
gas_transfer_coefficient = 0.01
@@ -97,7 +99,7 @@
desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
icon_state = "clown"
item_state = "clown_hat"
- flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
+ flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user)
@@ -121,7 +123,7 @@
desc = "Some pranksters are truly magical."
icon_state = "wizzclown"
item_state = "wizzclown"
- flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
+ flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
/obj/item/clothing/mask/gas/virusclown_hat
name = "clown wig and mask"
@@ -172,12 +174,11 @@
name = "owl mask"
desc = "Twoooo!"
icon_state = "owl"
- flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
burn_state = FLAMMABLE
actions_types = list(/datum/action/item_action/hoot)
/obj/item/clothing/mask/gas/owl_mask/super_hero
- flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | NODROP
+ flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | NODROP
/obj/item/clothing/mask/gas/owl_mask/attack_self()
hoot()
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 427cc071eda..8d031476931 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -3,7 +3,7 @@
desc = "To stop that awful noise."
icon_state = "muzzle"
item_state = "muzzle"
- flags = MASKCOVERSMOUTH
+ flags_cover = MASKCOVERSMOUTH
w_class = 2
gas_transfer_coefficient = 0.90
put_on_delay = 20
@@ -60,7 +60,7 @@
icon_state = "sterile"
item_state = "sterile"
w_class = 1
- flags = MASKCOVERSMOUTH
+ flags_cover = MASKCOVERSMOUTH
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 25, rad = 0)
@@ -108,7 +108,7 @@
desc = "A blue neck scarf."
icon_state = "blueneckscarf"
item_state = "blueneckscarf"
- flags = MASKCOVERSMOUTH
+ flags_cover = MASKCOVERSMOUTH
w_class = 2
gas_transfer_coefficient = 0.90
@@ -117,7 +117,7 @@
desc = "A red and white checkered neck scarf."
icon_state = "redwhite_scarf"
item_state = "redwhite_scarf"
- flags = MASKCOVERSMOUTH
+ flags_cover = MASKCOVERSMOUTH
w_class = 2
gas_transfer_coefficient = 0.90
@@ -126,7 +126,7 @@
desc = "A green neck scarf."
icon_state = "green_scarf"
item_state = "green_scarf"
- flags = MASKCOVERSMOUTH
+ flags_cover = MASKCOVERSMOUTH
w_class = 2
gas_transfer_coefficient = 0.90
@@ -135,7 +135,7 @@
desc = "A stealthy, dark scarf."
icon_state = "ninja_scarf"
item_state = "ninja_scarf"
- flags = MASKCOVERSMOUTH
+ flags_cover = MASKCOVERSMOUTH
w_class = 2
gas_transfer_coefficient = 0.90
@@ -190,8 +190,8 @@
user.real_name = originalname
/obj/item/clothing/mask/face
- flags = MASKCOVERSMOUTH
flags_inv = HIDEFACE
+ flags_cover = MASKCOVERSMOUTH
/obj/item/clothing/mask/face/rat
name = "rat mask"
@@ -255,14 +255,14 @@
icon_state = "pennywise_mask"
item_state = "pennywise_mask"
species_fit = list("Vox")
- flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
+ flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
// Bandanas
/obj/item/clothing/mask/bandana
name = "bandana"
desc = "A colorful bandana."
- flags = MASKCOVERSMOUTH
flags_inv = HIDEFACE
+ flags_cover = MASKCOVERSMOUTH
w_class = 1
slot_flags = SLOT_MASK
adjusted_flags = SLOT_HEAD
@@ -340,7 +340,8 @@
icon_override = 'icons/goonstation/mob/clothing/mask.dmi'
lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
- flags = NODROP | AIRTIGHT | MASKCOVERSMOUTH
+ flags = NODROP | AIRTIGHT
+ flags_cover = MASKCOVERSMOUTH
/obj/item/clothing/mask/cursedclown/equipped(mob/user, slot)
..()
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index ee07c3a7a67..33e08206fd1 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -88,7 +88,8 @@
/obj/item/clothing/head/helmet/space/vox
armor = list(melee = 40, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
- flags = HEADCOVERSEYES|STOPSPRESSUREDMAGE
+ flags = STOPSPRESSUREDMAGE
+ flags_cover = HEADCOVERSEYES
icon = 'icons/obj/clothing/species/vox/hats.dmi'
species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list(
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index ce6b5ebd410..ab601821ef8 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -289,7 +289,6 @@
icon_state = "hardsuit0-mining"
item_state = "mining_helm"
item_color = "mining"
- flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE
armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
/obj/item/clothing/suit/space/hardsuit/mining
@@ -305,13 +304,15 @@
/obj/item/clothing/head/helmet/space/hardsuit/syndi
name = "blood-red hardsuit helmet"
desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders."
+ alt_desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
icon_state = "hardsuit1-syndi"
item_state = "syndie_helm"
item_color = "syndi"
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
on = 1
- flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL
actions_types = list(/datum/action/item_action/toggle_helmet_mode)
+ flags = BLOCKHAIR | STOPSPRESSUREDMAGE | THICKMATERIAL
+ visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE
/obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon()
icon_state = "hardsuit[on]-[item_color]"
@@ -320,20 +321,22 @@
on = !on
if(on)
to_chat(user, "You switch your helmet to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor.")
- name = "blood-red hardsuit helmet"
- desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders."
- flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
- cold_protection = HEAD
+ name = initial(name)
+ desc = initial(desc)
set_light(brightness_on)
+ flags = BLOCKHAIR | STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP
+ flags_cover |= HEADCOVERSEYES | HEADCOVERSMOUTH
+ flags_inv |= visor_flags_inv
+ cold_protection |= HEAD
else
to_chat(user, "You switch your helmet to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight.")
name = "blood-red hardsuit helmet (combat)"
- desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
- flags = BLOCKHAIR | THICKMATERIAL | NODROP
- flags_inv = HIDEEARS
- cold_protection = null
+ desc = alt_desc
set_light(0)
+ flags = BLOCKHAIR | THICKMATERIAL | NODROP
+ flags_cover &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH)
+ flags_inv &= ~visor_flags_inv
+ cold_protection &= ~HEAD
update_icon()
playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index db1511a9a77..22c03c17f76 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -92,7 +92,8 @@
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat"
- flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
+ flags = BLOCKHAIR | STOPSPRESSUREDMAGE
+ flags_cover = HEADCOVERSEYES
/obj/item/clothing/suit/space/santa
name = "Santa's suit"
@@ -111,7 +112,8 @@
icon_state = "pirate"
item_state = "pirate"
armor = list(melee = 30, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
- flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
+ flags = BLOCKHAIR | STOPSPRESSUREDMAGE
+ flags_cover = HEADCOVERSEYES
strip_delay = 40
put_on_delay = 20
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
index 0480490c0ca..ff3b80af1cb 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
@@ -4,7 +4,7 @@
/obj/item/clothing/head/helmet/space/new_rig
name = "helmet"
- flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | THICKMATERIAL | NODROP
+ flags = BLOCKHAIR | THICKMATERIAL | NODROP
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK
body_parts_covered = HEAD
heat_protection = HEAD
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 4286064262f..f0fbfca0cbd 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -4,7 +4,8 @@
icon_state = "bio"
desc = "A hood that protects the head and face from biological comtaminants."
permeability_coefficient = 0.01
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR | THICKMATERIAL
+ flags = BLOCKHAIR | THICKMATERIAL
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
burn_state = FIRE_PROOF
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 77c486590c1..2c7272f92d0 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -727,7 +727,8 @@
icon_state = "mercy_hood"
item_state = "mercy_hood"
permeability_coefficient = 0.01
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
+ flags = BLOCKHAIR
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index cae5fbd28f0..81cc172d0e2 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -64,9 +64,10 @@
name = "bomb hood"
desc = "Use in case of bomb."
icon_state = "bombsuit"
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR | THICKMATERIAL
+ flags = BLOCKHAIR | THICKMATERIAL
armor = list(melee = 20, bullet = 0, laser = 20, energy = 10, bomb = 100, bio = 0, rad = 0)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
heat_protection = HEAD
@@ -125,7 +126,8 @@
name = "Radiation Hood"
icon_state = "rad"
desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
- flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR|THICKMATERIAL
+ flags = BLOCKHAIR|THICKMATERIAL
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 60, rad = 100)
strip_delay = 60
put_on_delay = 60
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 6f51d07ca04..70881dbb5dc 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -625,7 +625,8 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "chronx_hood"
item_state = "chronx_hood"
- flags = HEADCOVERSEYES | BLOCKHAIR
+ flags = BLOCKHAIR
+ flags_cover = HEADCOVERSEYES
actions_types = list(/datum/action/item_action/toggle)
var/adjusted = 0
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 6ea16fc24a1..98d1bec775c 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -17,7 +17,8 @@ var/const/MAX_ACTIVE_TIME = 400
w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
throw_range = 5
tint = 3
- flags = MASKCOVERSMOUTH | MASKCOVERSEYES | AIRTIGHT
+ flags = AIRTIGHT
+ flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
layer = MOB_LAYER
var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
@@ -126,7 +127,7 @@ var/const/MAX_ACTIVE_TIME = 400
"[src] leaps at [M]'s face!")
if(ishuman(M))
var/mob/living/carbon/human/H = M
- if(H.head && H.head.flags & HEADCOVERSMOUTH)
+ if(H.head && H.head.flags_cover & HEADCOVERSMOUTH)
H.visible_message("[src] smashes against [H]'s [H.head]!", \
"[src] smashes against [H]'s [H.head]!")
Die()
@@ -236,7 +237,7 @@ var/const/MAX_ACTIVE_TIME = 400
var/mob/living/carbon/C = M
if(ishuman(C))
var/mob/living/carbon/human/H = C
- if(H.head && H.head.flags & HEADCOVERSMOUTH)
+ if(H.head && H.head.flags_cover & HEADCOVERSMOUTH)
return 0
return 1
return 0
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index a8e075f2433..fac8dbfaf69 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -75,10 +75,10 @@
if(!check_has_mouth())
to_chat(H, "They don't have a mouth, you cannot perform CPR!")
return
- if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH) && !M.wear_mask.mask_adjusted))
+ if((M.head && (M.head.flags_cover & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags_cover & MASKCOVERSMOUTH) && !M.wear_mask.mask_adjusted))
to_chat(M, "Remove your mask!")
return 0
- if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH) && !wear_mask.mask_adjusted))
+ if((head && (head.flags_cover & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && !wear_mask.mask_adjusted))
to_chat(M, "Remove his mask!")
return 0
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index b2e609c92f2..275828fc97e 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1102,7 +1102,7 @@
if(istype(loc,/obj/item/bodybag))
return
var/obj/item/clothing/mask/M = H.wear_mask
- if(M && (M.flags & MASKCOVERSMOUTH))
+ if(M && (M.flags_cover & MASKCOVERSMOUTH))
return
if(H.species && H.species.flags & NO_BREATHE)
return //no puking if you can't smell!
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 446ec797a76..27dfd093f68 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -347,9 +347,9 @@
if(state < GRAB_NECK)
to_chat(assailant, "You require a better grab to do this.")
return
- if((affected.head && affected.head.flags & HEADCOVERSEYES) || \
- (affected.wear_mask && affected.wear_mask.flags & MASKCOVERSEYES) || \
- (affected.glasses && affected.glasses.flags & GLASSESCOVERSEYES))
+ if((affected.head && affected.head.flags_cover & HEADCOVERSEYES) || \
+ (affected.wear_mask && affected.wear_mask.flags_cover & MASKCOVERSEYES) || \
+ (affected.glasses && affected.glasses.flags_cover & GLASSESCOVERSEYES))
to_chat(assailant, "You're going to need to remove the eye covering first.")
return
if(!affected.internal_organs_by_name["eyes"])
diff --git a/code/modules/modular_computers/NTNet/NTNRC/conversation.dm b/code/modules/modular_computers/NTNet/NTNRC/conversation.dm
new file mode 100644
index 00000000000..55998071e71
--- /dev/null
+++ b/code/modules/modular_computers/NTNet/NTNRC/conversation.dm
@@ -0,0 +1,70 @@
+var/global/static/ntnrc_uid = 0
+
+/datum/ntnet_conversation
+ var/id = null
+ var/title = "Untitled Conversation"
+ var/datum/computer_file/program/chatclient/operator // "Administrator" of this channel. Creator starts as channel's operator,
+ var/list/messages = list()
+ var/list/clients = list()
+ var/password
+
+/datum/ntnet_conversation/New()
+ id = ntnrc_uid
+ ntnrc_uid++
+ if(ntnet_global)
+ ntnet_global.chat_channels.Add(src)
+ ..()
+
+/datum/ntnet_conversation/Destroy()
+ if(ntnet_global)
+ ntnet_global.chat_channels.Remove(src)
+ return ..()
+
+/datum/ntnet_conversation/proc/add_message(message, username)
+ message = "[worldtime2text()] [username]: [message]"
+ messages.Add(message)
+ trim_message_list()
+
+/datum/ntnet_conversation/proc/add_status_message(message)
+ messages.Add("[worldtime2text()] -!- [message]")
+ trim_message_list()
+
+/datum/ntnet_conversation/proc/trim_message_list()
+ if(messages.len <= 50)
+ return
+ messages = messages.Copy(messages.len-50 ,0)
+
+/datum/ntnet_conversation/proc/add_client(datum/computer_file/program/chatclient/C)
+ if(!istype(C))
+ return
+ clients.Add(C)
+ add_status_message("[C.username] has joined the channel.")
+ // No operator, so we assume the channel was empty. Assign this user as operator.
+ if(!operator)
+ changeop(C)
+
+/datum/ntnet_conversation/proc/remove_client(datum/computer_file/program/chatclient/C)
+ if(!istype(C) || !(C in clients))
+ return
+ clients.Remove(C)
+ add_status_message("[C.username] has left the channel.")
+
+ // Channel operator left, pick new operator
+ if(C == operator)
+ operator = null
+ if(clients.len)
+ var/datum/computer_file/program/chatclient/newop = pick(clients)
+ changeop(newop)
+
+
+/datum/ntnet_conversation/proc/changeop(datum/computer_file/program/chatclient/newop)
+ if(istype(newop))
+ operator = newop
+ add_status_message("Channel operator status transferred to [newop.username].")
+
+/datum/ntnet_conversation/proc/change_title(newtitle, datum/computer_file/program/chatclient/client)
+ if(operator != client)
+ return 0 // Not Authorised
+
+ add_status_message("[client.username] has changed channel title from [title] to [newtitle]")
+ title = newtitle
diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm
new file mode 100644
index 00000000000..ed69207f0ee
--- /dev/null
+++ b/code/modules/modular_computers/NTNet/NTNet.dm
@@ -0,0 +1,145 @@
+var/global/datum/ntnet/ntnet_global = new()
+
+
+// This is the NTNet datum. There can be only one NTNet datum in game at once. Modular computers read data from this.
+/datum/ntnet
+ var/list/relays = list()
+ var/list/logs = list()
+ var/list/available_station_software = list()
+ var/list/available_antag_software = list()
+ var/list/chat_channels = list()
+ var/list/fileservers = list()
+ // Amount of logs the system tries to keep in memory. Keep below 999 to prevent byond from acting weirdly.
+ // High values make displaying logs much laggier.
+ var/setting_maxlogcount = 100
+
+ // These only affect wireless. LAN (consoles) are unaffected since it would be possible to create scenario where someone turns off NTNet, and is unable to turn it back on since it refuses connections
+ var/setting_softwaredownload = 1
+ var/setting_peertopeer = 1
+ var/setting_communication = 1
+ var/setting_systemcontrol = 1
+ var/setting_disabled = 0 // Setting to 1 will disable all wireless, independently on relays status.
+
+ var/intrusion_detection_enabled = 1 // Whether the IDS warning system is enabled
+ var/intrusion_detection_alarm = 0 // Set when there is an IDS warning due to malicious (antag) software.
+
+
+// If new NTNet datum is spawned, it replaces the old one.
+/datum/ntnet/New()
+ if(ntnet_global && (ntnet_global != src))
+ ntnet_global = src // There can be only one.
+ for(var/obj/machinery/ntnet_relay/R in machines)
+ relays.Add(R)
+ R.NTNet = src
+ build_software_lists()
+ add_log("NTNet logging system activated.")
+
+// Simplified logging: Adds a log. log_string is mandatory parameter, source is optional.
+/datum/ntnet/proc/add_log(log_string, obj/item/weapon/computer_hardware/network_card/source = null)
+ var/log_text = "[worldtime2text()] - "
+ if(source)
+ log_text += "[source.get_network_tag()] - "
+ else
+ log_text += "*SYSTEM* - "
+ log_text += log_string
+ logs.Add(log_text)
+
+
+ // We have too many logs, remove the oldest entries until we get into the limit
+ if(logs.len > setting_maxlogcount)
+ logs = logs.Copy(logs.len-setting_maxlogcount,0)
+
+
+// Checks whether NTNet operates. If parameter is passed checks whether specific function is enabled.
+/datum/ntnet/proc/check_function(specific_action = 0)
+ if(!relays || !relays.len) // No relays found. NTNet is down
+ return 0
+
+ var/operating = 0
+
+ // Check all relays. If we have at least one working relay, network is up.
+ for(var/M in relays)
+ var/obj/machinery/ntnet_relay/R = M
+ if(R.operable())
+ operating = 1
+ break
+
+ if(setting_disabled)
+ return 0
+
+ switch(specific_action)
+ if(NTNET_SOFTWAREDOWNLOAD)
+ return (operating && setting_softwaredownload)
+ if(NTNET_PEERTOPEER)
+ return (operating && setting_peertopeer)
+ if(NTNET_COMMUNICATION)
+ return (operating && setting_communication)
+ if(NTNET_SYSTEMCONTROL)
+ return (operating && setting_systemcontrol)
+ return operating
+
+// Builds lists that contain downloadable software.
+/datum/ntnet/proc/build_software_lists()
+ available_station_software = list()
+ available_antag_software = list()
+ 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)
+ if(!prog || prog.filename == "UnknownProgram" || prog.filetype != "PRG")
+ continue
+ // Check whether the program should be available for station/antag download, if yes, add it to lists.
+ if(prog.available_on_ntnet)
+ available_station_software.Add(prog)
+ if(prog.available_on_syndinet)
+ available_antag_software.Add(prog)
+
+// Attempts to find a downloadable file according to filename var
+/datum/ntnet/proc/find_ntnet_file_by_name(filename)
+ for(var/N in available_station_software)
+ var/datum/computer_file/program/P = N
+ if(filename == P.filename)
+ return P
+ for(var/N in available_antag_software)
+ var/datum/computer_file/program/P = N
+ if(filename == P.filename)
+ return P
+
+// Resets the IDS alarm
+/datum/ntnet/proc/resetIDS()
+ intrusion_detection_alarm = 0
+
+/datum/ntnet/proc/toggleIDS()
+ resetIDS()
+ intrusion_detection_enabled = !intrusion_detection_enabled
+
+// Removes all logs
+/datum/ntnet/proc/purge_logs()
+ logs = list()
+ add_log("-!- LOGS DELETED BY SYSTEM OPERATOR -!-")
+
+// Updates maximal amount of stored logs. Use this instead of setting the number, it performs required checks.
+/datum/ntnet/proc/update_max_log_count(lognumber)
+ if(!lognumber)
+ return 0
+ // Trim the value if necessary
+ lognumber = max(MIN_NTNET_LOGS, min(lognumber, MAX_NTNET_LOGS))
+ setting_maxlogcount = lognumber
+ add_log("Configuration Updated. Now keeping [setting_maxlogcount] logs in system memory.")
+
+/datum/ntnet/proc/toggle_function(function)
+ if(!function)
+ return
+ function = text2num(function)
+ switch(function)
+ if(NTNET_SOFTWAREDOWNLOAD)
+ setting_softwaredownload = !setting_softwaredownload
+ add_log("Configuration Updated. Wireless network firewall now [setting_softwaredownload ? "allows" : "disallows"] connection to software repositories.")
+ if(NTNET_PEERTOPEER)
+ setting_peertopeer = !setting_peertopeer
+ add_log("Configuration Updated. Wireless network firewall now [setting_peertopeer ? "allows" : "disallows"] peer to peer network traffic.")
+ if(NTNET_COMMUNICATION)
+ setting_communication = !setting_communication
+ add_log("Configuration Updated. Wireless network firewall now [setting_communication ? "allows" : "disallows"] instant messaging and similar communication services.")
+ if(NTNET_SYSTEMCONTROL)
+ setting_systemcontrol = !setting_systemcontrol
+ add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of station's systems.")
diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm
new file mode 100644
index 00000000000..5f5325e0364
--- /dev/null
+++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm
@@ -0,0 +1,128 @@
+// Relays don't handle any actual communication. Global NTNet datum does that, relays only tell the datum if it should or shouldn't work.
+/obj/machinery/ntnet_relay
+ name = "NTNet Quantum Relay"
+ desc = "A very complex router and transmitter capable of connecting electronic devices together. Looks fragile."
+ use_power = 2
+ active_power_usage = 10000 //10kW, apropriate for machine that keeps massive cross-Zlevel wireless network operational. Used to be 20 but that actually drained the smes one round
+ idle_power_usage = 100
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "bus"
+ anchored = 1
+ density = 1
+ 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
+ var/list/dos_sources = list() // Backwards reference for qdel() stuff
+
+ // Denial of Service attack variables
+ var/dos_overload = 0 // Amount of DoS "packets" in this relay's buffer
+ var/dos_capacity = 500 // Amount of DoS "packets" in buffer required to crash the relay
+ var/dos_dissipate = 1 // Amount of DoS "packets" dissipated over time.
+
+
+// TODO: Implement more logic here. For now it's only a placeholder.
+/obj/machinery/ntnet_relay/inoperable(additional_flags = 0)
+ if(stat & (BROKEN | NOPOWER | EMPED | additional_flags))
+ return 1
+ if(dos_failure)
+ return 1
+ if(!enabled)
+ return 1
+ return 0
+
+/obj/machinery/ntnet_relay/update_icon()
+ if(operable())
+ icon_state = "bus"
+ else
+ icon_state = "bus_off"
+
+/obj/machinery/ntnet_relay/process()
+ if(operable())
+ use_power = 2
+ else
+ use_power = 1
+
+ update_icon()
+
+ if(dos_overload)
+ dos_overload = max(0, dos_overload - dos_dissipate)
+
+ // If DoS traffic exceeded capacity, crash.
+ if((dos_overload > dos_capacity) && !dos_failure)
+ dos_failure = 1
+ update_icon()
+ ntnet_global.add_log("Quantum relay switched from normal operation mode to overload recovery mode.")
+ // If the DoS buffer reaches 0 again, restart.
+ if((dos_overload == 0) && dos_failure)
+ dos_failure = 0
+ update_icon()
+ ntnet_global.add_log("Quantum relay switched from overload recovery mode to normal operation mode.")
+ ..()
+
+/obj/machinery/ntnet_relay/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "ntnet_relay.tmpl", "NTNet Quantum Relay", 500, 300)
+ ui.open()
+
+/obj/machinery/ntnet_relay/ui_data(mob/user)
+ var/list/data = list()
+ data["enabled"] = enabled
+ data["dos_capacity"] = dos_capacity
+ data["dos_overload"] = dos_overload
+ data["dos_crashed"] = dos_failure
+ return data
+
+
+/obj/machinery/ntnet_relay/Topic(href, list/href_list)
+ if(..())
+ return
+ switch(href_list["action"])
+ if("restart")
+ dos_overload = 0
+ dos_failure = 0
+ update_icon()
+ ntnet_global.add_log("Quantum relay manually restarted from overload recovery mode to normal operation mode.")
+ if("toggle")
+ enabled = !enabled
+ ntnet_global.add_log("Quantum relay manually [enabled ? "enabled" : "disabled"].")
+ update_icon()
+ return 1
+
+
+/obj/machinery/ntnet_relay/attack_hand(mob/living/user)
+ ui_interact(user)
+
+/obj/machinery/ntnet_relay/New()
+ uid = gl_uid
+ gl_uid++
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/machine/ntnet_relay(null)
+ component_parts += new /obj/item/stack/cable_coil(null, 2)
+ component_parts += new /obj/item/weapon/stock_parts/subspace/filter(null)
+
+ if(ntnet_global)
+ ntnet_global.relays.Add(src)
+ NTNet = ntnet_global
+ ntnet_global.add_log("New quantum relay activated. Current amount of linked relays: [NTNet.relays.len]")
+ ..()
+
+/obj/machinery/ntnet_relay/Destroy()
+ if(ntnet_global)
+ ntnet_global.relays.Remove(src)
+ ntnet_global.add_log("Quantum relay connection severed. Current amount of linked relays: [NTNet.relays.len]")
+ NTNet = null
+
+ for(var/datum/computer_file/program/ntnet_dos/D in dos_sources)
+ D.target = null
+ D.error = "Connection to quantum relay severed"
+
+ return ..()
+
+/obj/item/weapon/circuitboard/machine/ntnet_relay
+ name = "NTNet Relay (Machine Board)"
+ build_path = /obj/machinery/ntnet_relay
+ origin_tech = "programming=3;bluespace=3;magnets=2"
+ req_components = list(
+ /obj/item/stack/cable_coil = 2,
+ /obj/item/weapon/stock_parts/subspace/filter = 1)
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
new file mode 100644
index 00000000000..9f867692153
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -0,0 +1,381 @@
+// This is the base type that does all the hardware stuff.
+// Other types expand it - tablets use a direct subtypes, and
+// consoles and laptops use "procssor" item that is held inside machinery piece
+/obj/item/device/modular_computer
+ name = "modular microcomputer"
+ desc = "A small portable microcomputer."
+
+ var/enabled = 0 // Whether the computer is turned on.
+ var/screen_on = 1 // Whether the computer is active/opened/it's screen is on.
+ var/datum/computer_file/program/active_program = null // A currently active program running on the computer.
+ var/hardware_flag = 0 // A flag that describes this device type
+ var/last_power_usage = 0
+ var/last_battery_percent = 0 // Used for deciding if battery percentage has chandged
+ var/last_world_time = "00:00"
+ var/list/last_header_icons
+ var/emagged = 0 // Whether the computer is emagged.
+
+ var/base_active_power_usage = 50 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too.
+ var/base_idle_power_usage = 5 // Power usage when the computer is idle and screen is off (currently only applies to laptops)
+
+ // Modular computers can run on various devices. Each DEVICE (Laptop, Console, Tablet,..)
+ // must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently
+ // If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example.
+
+ icon = 'icons/obj/computer.dmi'
+ icon_state = "laptop-open"
+ var/icon_state_unpowered = null // Icon state when the computer is turned off.
+ var/icon_state_powered = null // Icon state when the computer is turned on.
+ var/icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen.
+ var/max_hardware_size = 0 // Maximal hardware w_class. Tablets/PDAs have 1, laptops 2, consoles 4.
+ var/steel_sheet_cost = 5 // Amount of steel sheets refunded when disassembling an empty frame of this computer.
+
+ var/obj_integrity = 100
+ var/integrity_failure = 50
+ var/max_integrity = 100
+ armor = list(melee = 0, bullet = 20, laser = 20, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 0, acid = 0)
+
+ // Important hardware (must be installed for computer to work)
+
+ // Optional hardware (improves functionality, but is not critical for computer to work)
+
+ var/list/all_components // List of "connection ports" in this computer and the components with which they are plugged
+
+ var/list/idle_threads // Idle programs on background. They still receive process calls but can't be interacted with.
+ var/obj/physical = null // Object that represents our computer. It's used for Adjacent() and UI visibility checks.
+
+
+
+/obj/item/device/modular_computer/New()
+ update_icon()
+ if(!physical)
+ physical = src
+ ..()
+ processing_objects += src
+ all_components = list()
+ idle_threads = list()
+
+/obj/item/device/modular_computer/Destroy()
+ kill_program(forced = TRUE)
+ for(var/H in all_components)
+ var/obj/item/weapon/computer_hardware/CH = all_components[H]
+ if(CH.holder == src)
+ CH.on_remove(src)
+ CH.holder = null
+ all_components.Remove(CH.device_type)
+ qdel(CH)
+ physical = null
+ processing_objects -= src
+ return ..()
+
+
+/obj/item/device/modular_computer/proc/add_verb(var/path)
+ switch(path)
+ if(MC_CARD)
+ verbs += /obj/item/device/modular_computer/proc/eject_id
+ if(MC_SDD)
+ verbs += /obj/item/device/modular_computer/proc/eject_disk
+ if(MC_AI)
+ verbs += /obj/item/device/modular_computer/proc/eject_card
+
+/obj/item/device/modular_computer/proc/remove_verb(path)
+ switch(path)
+ if(MC_CARD)
+ verbs -= /obj/item/device/modular_computer/proc/eject_id
+ if(MC_SDD)
+ verbs -= /obj/item/device/modular_computer/proc/eject_disk
+ if(MC_AI)
+ verbs -= /obj/item/device/modular_computer/proc/eject_card
+
+// Eject ID card from computer, if it has ID slot with card inside.
+/obj/item/device/modular_computer/proc/eject_id()
+ set name = "Eject ID"
+ set category = "Object"
+ set src in view(1)
+
+ if(issilicon(usr))
+ return
+ var/obj/item/weapon/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
+ if(!usr.incapacitated())
+ card_slot.try_eject(null, usr)
+
+// Eject ID card from computer, if it has ID slot with card inside.
+/obj/item/device/modular_computer/proc/eject_card()
+ set name = "Eject Intellicard"
+ set category = "Object"
+ set src in view(1)
+
+ if(issilicon(usr))
+ return
+ var/obj/item/weapon/computer_hardware/ai_slot/ai_slot = all_components[MC_AI]
+ if(!usr.incapacitated())
+ ai_slot.try_eject(null, usr, 1)
+
+
+// Eject ID card from computer, if it has ID slot with card inside.
+/obj/item/device/modular_computer/proc/eject_disk()
+ set name = "Eject Data Disk"
+ set category = "Object"
+ set src in view(1)
+
+ if(issilicon(usr))
+ return
+
+ if(!usr.incapacitated())
+ var/obj/item/weapon/computer_hardware/hard_drive/portable/portable_drive = all_components[MC_SDD]
+ if(uninstall_component(portable_drive, usr))
+ portable_drive.verb_pickup()
+
+/obj/item/device/modular_computer/AltClick(mob/user)
+ ..()
+ if(issilicon(user))
+ return
+
+ if(!user.incapacitated() && Adjacent(user))
+ var/obj/item/weapon/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
+ var/obj/item/weapon/computer_hardware/ai_slot/ai_slot = all_components[MC_AI]
+ var/obj/item/weapon/computer_hardware/hard_drive/portable/portable_drive = all_components[MC_SDD]
+ if(portable_drive)
+ if(uninstall_component(portable_drive, user))
+ portable_drive.verb_pickup()
+ else
+ if(card_slot && card_slot.try_eject(null, user))
+ return
+ if(ai_slot)
+ ai_slot.try_eject(null, user)
+
+
+// Gets IDs/access levels from card slot. Would be useful when/if PDAs would become modular PCs.
+/obj/item/device/modular_computer/GetAccess()
+ var/obj/item/weapon/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
+ if(card_slot)
+ return card_slot.GetAccess()
+ return ..()
+
+/obj/item/device/modular_computer/GetID()
+ var/obj/item/weapon/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
+ if(card_slot)
+ return card_slot.GetID()
+ return ..()
+
+/obj/item/device/modular_computer/attack_ai(mob/user)
+ return attack_self(user)
+
+/obj/item/device/modular_computer/attack_ghost(mob/dead/observer/user)
+ if(enabled)
+ ui_interact(user)
+ else if(user.can_admin_interact())
+ var/response = alert(user, "This computer is turned off. Would you like to turn it on?", "Admin Override", "Yes", "No")
+ if(response == "Yes")
+ turn_on(user)
+
+/obj/item/device/modular_computer/emag_act(mob/user)
+ if(emagged)
+ to_chat(user, "\The [src] was already emagged.")
+ return 0
+ else
+ emagged = 1
+ to_chat(user, "You emag \the [src]. It's screen briefly shows a \"OVERRIDE ACCEPTED: New software downloads available.\" message.")
+ return 1
+
+/obj/item/device/modular_computer/examine(mob/user)
+ ..()
+ if(obj_integrity <= integrity_failure)
+ to_chat(user, "It is heavily damaged!")
+ else if(obj_integrity < max_integrity)
+ to_chat(user, "It is damaged.")
+
+/obj/item/device/modular_computer/update_icon()
+ overlays.Cut()
+ if(!enabled)
+ icon_state = icon_state_unpowered
+ else
+ icon_state = icon_state_powered
+ if(active_program && active_program.program_state != PROGRAM_STATE_KILLED)
+ overlays += active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu
+ else
+ overlays += icon_state_menu
+
+ if(obj_integrity <= integrity_failure)
+ overlays += "bsod"
+ overlays += "broken"
+
+
+// On-click handling. Turns on the computer if it's off and opens the GUI.
+/obj/item/device/modular_computer/attack_self(mob/user)
+ if(enabled)
+ ui_interact(user)
+ else
+ turn_on(user)
+
+/obj/item/device/modular_computer/proc/turn_on(mob/user)
+ var/issynth = issilicon(user) // Robots and AIs get different activation messages.
+ if(obj_integrity <= integrity_failure)
+ if(issynth)
+ to_chat(user, "You send an activation signal to \the [src], but it responds with an error code. It must be damaged.")
+ else
+ to_chat(user, "You press the power button, but the computer fails to boot up, displaying variety of errors before shutting down again.")
+ return
+
+ // If we have a recharger, enable it automatically. Lets computer without a battery work.
+ var/obj/item/weapon/computer_hardware/recharger/recharger = all_components[MC_CHARGE]
+ if(recharger)
+ recharger.enabled = 1
+
+ if(all_components[MC_CPU] && use_power()) // use_power() checks if the PC is powered
+ if(issynth)
+ to_chat(user, "You send an activation signal to \the [src], turning it on.")
+ else
+ to_chat(user, "You press the power button and start up \the [src].")
+ enabled = 1
+ update_icon()
+ ui_interact(user)
+ else // Unpowered
+ if(issynth)
+ to_chat(user, "You send an activation signal to \the [src] but it does not respond.")
+ else
+ to_chat(user, "You press the power button but \the [src] does not respond.")
+
+// Process currently calls handle_power(), may be expanded in future if more things are added.
+/obj/item/device/modular_computer/process()
+ if(!enabled) // The computer is turned off
+ last_power_usage = 0
+ return 0
+
+ if(obj_integrity <= integrity_failure)
+ shutdown_computer()
+ return 0
+
+ if(active_program && active_program.requires_ntnet && !get_ntnet_status(active_program.requires_ntnet_feature))
+ active_program.event_networkfailure(0) // Active program requires NTNet to run but we've just lost connection. Crash.
+
+ if(active_program)
+ if(active_program.program_state != PROGRAM_STATE_KILLED)
+ active_program.process_tick()
+ active_program.ntnet_status = get_ntnet_status()
+ else
+ active_program = null
+
+ for(var/I in idle_threads)
+ var/datum/computer_file/program/P = I
+ if(P.program_state != PROGRAM_STATE_KILLED)
+ if(P.requires_ntnet && !get_ntnet_status(P.requires_ntnet_feature))
+ P.event_networkfailure(1)
+ P.process_tick()
+ P.ntnet_status = get_ntnet_status()
+ else
+ idle_threads.Remove(P)
+
+ handle_power() // Handles all computer power interaction
+
+// Relays kill program request to currently active program. Use this to quit current program.
+/obj/item/device/modular_computer/proc/kill_program(forced = FALSE)
+ if(active_program && active_program.program_state != PROGRAM_STATE_KILLED)
+ active_program.kill_program(forced)
+ active_program = null
+ var/mob/user = usr
+ if(user && istype(user))
+ ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+ update_icon()
+
+// Returns 0 for No Signal, 1 for Low Signal and 2 for Good Signal. 3 is for wired connection (always-on)
+/obj/item/device/modular_computer/proc/get_ntnet_status(specific_action = 0)
+ var/obj/item/weapon/computer_hardware/network_card/network_card = all_components[MC_NET]
+ if(network_card)
+ return network_card.get_signal(specific_action)
+ else
+ return 0
+
+/obj/item/device/modular_computer/proc/add_log(text)
+ if(!get_ntnet_status())
+ return FALSE
+ var/obj/item/weapon/computer_hardware/network_card/network_card = all_components[MC_NET]
+ return ntnet_global.add_log(text, network_card)
+
+/obj/item/device/modular_computer/proc/shutdown_computer(loud = 1)
+ if(enabled)
+ kill_program(forced = TRUE)
+ for(var/datum/computer_file/program/P in idle_threads)
+ P.kill_program(forced = TRUE)
+ idle_threads.Remove(P)
+ if(loud)
+ physical.visible_message("\The [src] shuts down.")
+ enabled = 0
+ update_icon()
+
+
+/obj/item/device/modular_computer/attackby(obj/item/weapon/W, mob/user)
+ // Insert items into the components
+ for(var/h in all_components)
+ var/obj/item/weapon/computer_hardware/H = all_components[h]
+ if(H.try_insert(W, user))
+ return
+
+ // Insert new hardware
+ if(istype(W, /obj/item/weapon/computer_hardware))
+ if(install_component(W, user))
+ return
+
+ if(istype(W, /obj/item/weapon/wrench))
+ if(all_components.len)
+ to_chat(user, "Remove all components from \the [src] before disassembling it.")
+ return
+ new /obj/item/stack/sheet/metal(get_turf(loc), steel_sheet_cost)
+ physical.visible_message("\The [src] has been disassembled by [user].")
+ relay_qdel()
+ qdel(src)
+ return
+
+ if(istype(W, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = W
+ if(!WT.isOn())
+ to_chat(user, "\The [W] is off.")
+ return
+
+ if(obj_integrity == max_integrity)
+ to_chat(user, "\The [src] does not require repairs.")
+ return
+
+ to_chat(user, "You begin repairing damage to \the [src]...")
+ var/dmg = round(max_integrity - obj_integrity)
+ if(WT.remove_fuel(round(dmg/75)) && do_after(usr, dmg/10))
+ obj_integrity = max_integrity
+ to_chat(user, "You repair \the [src].")
+ return
+
+ if(istype(W, /obj/item/weapon/screwdriver))
+ if(!all_components.len)
+ to_chat(user, "This device doesn't have any components installed.")
+ return
+ var/list/component_names = list()
+ for(var/h in all_components)
+ var/obj/item/weapon/computer_hardware/H = all_components[h]
+ component_names.Add(H.name)
+
+ var/choice = input(user, "Which component do you want to uninstall?", "Computer maintenance", null) as null|anything in component_names
+
+ if(!choice)
+ return
+
+ if(!Adjacent(user))
+ return
+
+ var/obj/item/weapon/computer_hardware/H = find_hardware_by_name(choice)
+
+ if(!H)
+ return
+
+ uninstall_component(H, user)
+ return
+
+ ..()
+
+// Used by processor to relay qdel() to machinery type.
+/obj/item/device/modular_computer/proc/relay_qdel()
+ return
+
+// Perform adjacency checks on our physical counterpart, if any.
+/obj/item/device/modular_computer/Adjacent(atom/neighbor)
+ if(physical && physical != src)
+ return physical.Adjacent(neighbor)
+ return ..()
diff --git a/code/modules/modular_computers/computers/item/computer_components.dm b/code/modules/modular_computers/computers/item/computer_components.dm
new file mode 100644
index 00000000000..09f027f2301
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/computer_components.dm
@@ -0,0 +1,58 @@
+/obj/item/device/modular_computer/proc/can_install_component(obj/item/weapon/computer_hardware/H, mob/living/user = null)
+ if(!H.can_install(src, user))
+ return FALSE
+
+ if(H.w_class > max_hardware_size)
+ if(user)
+ to_chat(user, "This component is too large for \the [src]!")
+ return FALSE
+
+ if(all_components[H.device_type])
+ if(user)
+ to_chat(user, "This computer's hardware slot is already occupied by \the [all_components[H.device_type]].")
+ return FALSE
+ return TRUE
+
+
+// Installs component.
+/obj/item/device/modular_computer/proc/install_component(obj/item/weapon/computer_hardware/H, mob/living/user = null)
+ if(!can_install_component(H, user))
+ return FALSE
+
+ if(user && !user.unEquip(H))
+ return FALSE
+ H.forceMove(src)
+
+ all_components[H.device_type] = H
+
+ if(user)
+ to_chat(user, "You install \the [H] into \the [src].")
+ H.holder = src
+ H.on_install(src, user)
+
+
+// Uninstalls component.
+/obj/item/device/modular_computer/proc/uninstall_component(obj/item/weapon/computer_hardware/H, mob/living/user = null)
+ if(H.holder != src) // Not our component at all.
+ return FALSE
+
+ all_components.Remove(H.device_type)
+
+ if(user)
+ to_chat(user, "You remove \the [H] from \the [src].")
+
+ H.forceMove(get_turf(src))
+ H.holder = null
+ H.on_remove(src, user)
+ if(enabled && !use_power())
+ shutdown_computer()
+ update_icon()
+
+
+// Checks all hardware pieces to determine if name matches, if yes, returns the hardware piece, otherwise returns null
+/obj/item/device/modular_computer/proc/find_hardware_by_name(name)
+ for(var/i in all_components)
+ var/obj/O = all_components[i]
+ if(O.name == name)
+ return O
+ return null
diff --git a/code/modules/modular_computers/computers/item/computer_damage.dm b/code/modules/modular_computers/computers/item/computer_damage.dm
new file mode 100644
index 00000000000..689e8c99ab7
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/computer_damage.dm
@@ -0,0 +1,52 @@
+/obj/item/device/modular_computer/emp_act(severity)
+ if(prob(20 / severity))
+ take_damage(obj_integrity, BURN)
+ ..()
+
+/obj/item/device/modular_computer/ex_act(severity)
+ switch(severity)
+ if(1)
+ qdel(src)
+ if(2)
+ if(prob(25))
+ qdel(src)
+ else if(prob(50))
+ obj_integrity = 0
+ if(3)
+ if(prob(25))
+ obj_integrity = 0
+
+/obj/item/device/modular_computer/bullet_act(obj/item/projectile/P)
+ take_damage(P.damage, P.damage_type)
+ ..()
+
+/obj/item/device/modular_computer/blob_act()
+ if(prob(75))
+ take_damage(obj_integrity, BRUTE)
+
+/obj/item/device/modular_computer/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
+ . = ..()
+ var/component_probability = min(50, max(damage_amount*0.1, 1 - obj_integrity/max_integrity))
+ switch(damage_flag)
+ if("bullet")
+ component_probability = damage_amount * 0.5
+ if("laser")
+ component_probability = damage_amount * 0.66
+ if(component_probability)
+ for(var/I in all_components)
+ var/obj/item/weapon/computer_hardware/H = all_components[I]
+ if(prob(component_probability))
+ H.take_damage(round(damage_amount*0.5))
+
+/obj/item/device/modular_computer/proc/break_apart(damage = TRUE)
+ physical.visible_message("\The [src] breaks apart!")
+ var/turf/newloc = get_turf(src)
+ new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2))
+ for(var/C in all_components)
+ var/obj/item/weapon/computer_hardware/H = all_components[C]
+ uninstall_component(H)
+ H.forceMove(newloc)
+ if(damage && prob(25))
+ H.take_damage(rand(10, 30))
+ relay_qdel()
+ qdel(src)
diff --git a/code/modules/modular_computers/computers/item/computer_power.dm b/code/modules/modular_computers/computers/item/computer_power.dm
new file mode 100644
index 00000000000..8483e9c4fc6
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/computer_power.dm
@@ -0,0 +1,73 @@
+// Tries to draw power from charger or, if no operational charger is present, from power cell.
+/obj/item/device/modular_computer/proc/use_power(amount = 0)
+ if(check_power_override())
+ return TRUE
+
+ var/obj/item/weapon/computer_hardware/recharger/recharger = all_components[MC_CHARGE]
+
+ if(recharger && recharger.check_functionality())
+ if(recharger.use_power(amount))
+ return TRUE
+
+ var/obj/item/weapon/computer_hardware/battery/battery_module = all_components[MC_CELL]
+
+ if(battery_module && battery_module.battery && battery_module.battery.charge)
+ var/obj/item/weapon/stock_parts/cell/cell = battery_module.battery
+ if(cell.use(amount * CELLRATE))
+ return TRUE
+ else // Discharge the cell anyway.
+ cell.use(min(amount*CELLRATE, cell.charge))
+ return FALSE
+ return FALSE
+
+/obj/item/device/modular_computer/proc/give_power(amount)
+ var/obj/item/weapon/computer_hardware/battery/battery_module = all_components[MC_CELL]
+ if(battery_module && battery_module.battery)
+ return battery_module.battery.give(amount)
+ return 0
+
+
+// Used in following function to reduce copypaste
+/obj/item/device/modular_computer/proc/power_failure()
+ if(enabled) // Shut down the computer
+ if(active_program)
+ active_program.event_powerfailure(0)
+ for(var/I in idle_threads)
+ var/datum/computer_file/program/PRG = I
+ PRG.event_powerfailure(1)
+ shutdown_computer(0)
+
+// Handles power-related things, such as battery interaction, recharging, shutdown when it's discharged
+/obj/item/device/modular_computer/proc/handle_power()
+ var/obj/item/weapon/computer_hardware/recharger/recharger = all_components[MC_CHARGE]
+ if(recharger)
+ recharger.process()
+
+ var/power_usage = screen_on ? base_active_power_usage : base_idle_power_usage
+
+ for(var/obj/item/weapon/computer_hardware/H in all_components)
+ if(H.enabled)
+ power_usage += H.power_usage
+
+ if(use_power(power_usage))
+ last_power_usage = power_usage
+ return TRUE
+ else
+ power_failure()
+ return FALSE
+
+/obj/item/device/modular_computer/proc/get_power_eta()
+ var/obj/item/weapon/computer_hardware/battery/battery_module = all_components[MC_CELL]
+ if(battery_module && battery_module.battery)
+ var/hours = 0
+ var/minutes = (battery_module.battery.charge) / (last_power_usage / 20) // 20 = obj processing interval
+ if(minutes > 60)
+ hours = minutes/60
+ minutes = (hours - round(hours)) * 60
+ var/seconds = (minutes - round(minutes)) * 60
+ return list("hours" = hours, "minutes" = minutes, "seconds" = seconds)
+ return list()
+
+// Used by child types if they have other power source than battery or recharger
+/obj/item/device/modular_computer/proc/check_power_override()
+ return FALSE
diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm
new file mode 100644
index 00000000000..4044e2530bf
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/computer_ui.dm
@@ -0,0 +1,194 @@
+// Operates NanoUI
+/obj/item/device/modular_computer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ if(!enabled)
+ if(ui)
+ ui.close()
+ return 0
+ if(!use_power())
+ if(ui)
+ ui.close()
+ return 0
+
+ // Robots don't really need to see the screen, their wireless connection works as long as computer is on.
+ if(!screen_on && !issilicon(user))
+ if(ui)
+ ui.close()
+ return 0
+
+ // If we have an active program switch to it now.
+ if(active_program)
+ if(ui) // This is the main laptop screen. Since we are switching to program's UI close it for now.
+ ui.close()
+ active_program.ui_interact(user)
+ return
+
+ // We are still here, that means there is no program loaded. Load the BIOS/ROM/OS/whatever you want to call it.
+ // This screen simply lists available programs and user may select them.
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD]
+ if(!hard_drive || !hard_drive.stored_files || !hard_drive.stored_files.len)
+ to_chat(user, "\The [src] beeps three times, it's screen displaying a \"DISK ERROR\" warning.")
+ return // No HDD, No HDD files list or no stored files. Something is very broken.
+
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
+ assets.send(user)
+ ui = new(user, src, ui_key, "computer_main.tmpl", "NTOS Main menu", 400, 500)
+ ui.set_auto_update(1)
+ ui.set_layout_key("program")
+ ui.open()
+
+
+/obj/item/device/modular_computer/ui_data(mob/user)
+ var/list/data = get_header_data()
+ data["programs"] = list()
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD]
+ for(var/datum/computer_file/program/P in hard_drive.stored_files)
+ var/running = 0
+ if(P in idle_threads)
+ running = 1
+
+ data["programs"] += list(list("name" = P.filename, "desc" = P.filedesc, "running" = running))
+
+ return data
+
+// Function used by NanoUI's to obtain data for header. All relevant entries begin with "PC_"
+/obj/item/device/modular_computer/proc/get_header_data()
+ var/list/data = list()
+
+ var/obj/item/weapon/computer_hardware/battery/battery_module = all_components[MC_CELL]
+ var/obj/item/weapon/computer_hardware/recharger/recharger = all_components[MC_CHARGE]
+
+ if(battery_module && battery_module.battery)
+ switch(battery_module.battery.percent())
+ if(80 to 200) // 100 should be maximal but just in case..
+ data["PC_batteryicon"] = "batt_100.gif"
+ if(60 to 80)
+ data["PC_batteryicon"] = "batt_80.gif"
+ if(40 to 60)
+ data["PC_batteryicon"] = "batt_60.gif"
+ if(20 to 40)
+ data["PC_batteryicon"] = "batt_40.gif"
+ if(5 to 20)
+ data["PC_batteryicon"] = "batt_20.gif"
+ else
+ data["PC_batteryicon"] = "batt_5.gif"
+ data["PC_batterypercent"] = "[round(battery_module.battery.percent())] %"
+ data["PC_showbatteryicon"] = 1
+ else
+ data["PC_batteryicon"] = "batt_5.gif"
+ data["PC_batterypercent"] = "N/C"
+ data["PC_showbatteryicon"] = battery_module ? 1 : 0
+
+ if(recharger && recharger.enabled && recharger.check_functionality() && recharger.use_power(0))
+ data["PC_apclinkicon"] = "charging.gif"
+
+ switch(get_ntnet_status())
+ if(0)
+ data["PC_ntneticon"] = "sig_none.gif"
+ if(1)
+ data["PC_ntneticon"] = "sig_low.gif"
+ if(2)
+ data["PC_ntneticon"] = "sig_high.gif"
+ if(3)
+ data["PC_ntneticon"] = "sig_lan.gif"
+
+ if(idle_threads.len)
+ var/list/program_headers = list()
+ for(var/I in idle_threads)
+ var/datum/computer_file/program/P = I
+ if(!P.ui_header)
+ continue
+ program_headers.Add(list(list(
+ "icon" = P.ui_header
+ )))
+
+ data["PC_programheaders"] = program_headers
+
+ data["PC_stationtime"] = worldtime2text()
+ data["PC_showexitprogram"] = active_program ? 1 : 0 // Hides "Exit Program" button on mainscreen
+ return data
+
+
+// Handles user's GUI input
+/obj/item/device/modular_computer/Topic(href, list/href_list)
+ if(..())
+ return
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD]
+ switch(href_list["action"])
+ if("PC_exit")
+ kill_program()
+ return 1
+ if("PC_shutdown")
+ shutdown_computer()
+ return 1
+ if("PC_minimize")
+ var/mob/user = usr
+ if(!active_program || !all_components[MC_CPU])
+ return 1
+
+ idle_threads.Add(active_program)
+ active_program.program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs
+
+ active_program = null
+ update_icon()
+ if(user && istype(user))
+ ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+
+ if("PC_killprogram")
+ var/prog = href_list["name"]
+ var/datum/computer_file/program/P = null
+ var/mob/user = usr
+ if(hard_drive)
+ P = hard_drive.find_file_by_name(prog)
+
+ if(!istype(P) || P.program_state == PROGRAM_STATE_KILLED)
+ return 1
+
+ P.kill_program(forced = TRUE)
+ to_chat(user, "Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.")
+
+ if("PC_runprogram")
+ var/prog = href_list["name"]
+ var/datum/computer_file/program/P = null
+ var/mob/user = usr
+ if(hard_drive)
+ P = hard_drive.find_file_by_name(prog)
+
+ if(!P || !istype(P)) // Program not found or it's not executable program.
+ to_chat(user, "\The [src]'s screen shows \"I/O ERROR - Unable to run program\" warning.")
+ return 1
+
+ P.computer = src
+
+ if(!P.is_supported_by_hardware(hardware_flag, 1, user))
+ return 1
+
+ // The program is already running. Resume it.
+ if(P in idle_threads)
+ P.program_state = PROGRAM_STATE_ACTIVE
+ active_program = P
+ idle_threads.Remove(P)
+ update_icon()
+ return
+
+ var/obj/item/weapon/computer_hardware/processor_unit/PU = all_components[MC_CPU]
+
+ if(idle_threads.len > PU.max_idle_programs)
+ to_chat(user, "\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error.")
+ return 1
+
+ if(P.requires_ntnet && !get_ntnet_status(P.requires_ntnet_feature)) // The program requires NTNet connection, but we are not connected to NTNet.
+ to_chat(user, "\The [src]'s screen shows \"Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning.")
+ return 1
+ if(P.run_program(user))
+ active_program = P
+ update_icon()
+ return 1
+ else
+ return
+
+/obj/item/device/modular_computer/nano_host()
+ if(physical)
+ return physical
+ return src
diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm
new file mode 100644
index 00000000000..7a7d27acd45
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/laptop.dm
@@ -0,0 +1,107 @@
+/obj/item/device/modular_computer/laptop
+ name = "laptop"
+ desc = "A portable laptop computer."
+
+ icon = 'icons/obj/modular_laptop.dmi'
+ icon_state = "laptop-closed"
+ icon_state_powered = "laptop"
+ icon_state_unpowered = "laptop-off"
+ icon_state_menu = "menu"
+
+ hardware_flag = PROGRAM_LAPTOP
+ max_hardware_size = 2
+ w_class = WEIGHT_CLASS_NORMAL
+
+ flags = HANDSLOW // No running around with open laptops in hands.
+
+ screen_on = 0 // Starts closed
+ var/start_open = 1 // unless this var is set to 1
+ var/icon_state_closed = "laptop-closed"
+ var/w_class_open = WEIGHT_CLASS_BULKY
+ var/slowdown_open = 1
+
+/obj/item/device/modular_computer/laptop/New()
+ ..()
+ if(start_open && !screen_on)
+ toggle_open()
+
+/obj/item/device/modular_computer/laptop/update_icon()
+ if(screen_on)
+ ..()
+ else
+ overlays.Cut()
+ icon_state = icon_state_closed
+
+/obj/item/device/modular_computer/laptop/attack_self(mob/user)
+ if(!screen_on)
+ try_toggle_open(user)
+ else
+ return ..()
+
+/obj/item/device/modular_computer/laptop/verb/open_computer()
+ set name = "Toggle Open"
+ set category = "Object"
+ set src in view(1)
+
+ try_toggle_open(usr)
+
+/obj/item/device/modular_computer/laptop/MouseDrop(obj/over_object, src_location, over_location)
+ if(over_object == usr || over_object == src)
+ try_toggle_open(usr)
+ if(ishuman(usr))
+ if(!isturf(loc) || !Adjacent(usr))
+ return
+ if(over_object && !usr.incapacitated())
+ if(!usr.canUnEquip(src))
+ to_chat(usr, "[src] appears stuck on you!")
+ return
+ switch(over_object.name)
+ if("r_hand")
+ usr.unEquip(src)
+ usr.put_in_r_hand(src)
+ if("l_hand")
+ usr.unEquip(src)
+ usr.put_in_l_hand(src)
+
+/obj/item/device/modular_computer/laptop/attack_hand(mob/user)
+ if(screen_on && isturf(loc))
+ return attack_self(user)
+
+ return ..()
+
+
+/obj/item/device/modular_computer/laptop/proc/try_toggle_open(mob/living/user)
+ if(issilicon(user))
+ return
+ if(!isturf(loc) && !ismob(loc)) // No opening it in backpack.
+ return
+ if(user.incapacitated() || !Adjacent(user))
+ return
+
+ toggle_open(user)
+
+
+/obj/item/device/modular_computer/laptop/AltClick(mob/user)
+ if(screen_on) // Close it.
+ try_toggle_open(user)
+ else
+ return ..()
+
+/obj/item/device/modular_computer/laptop/proc/toggle_open(mob/living/user=null)
+ if(screen_on)
+ to_chat(user, "You close \the [src].")
+ slowdown = initial(slowdown)
+ w_class = initial(w_class)
+ else
+ to_chat(user, "You open \the [src].")
+ slowdown = slowdown_open
+ w_class = w_class_open
+
+ screen_on = !screen_on
+ update_icon()
+
+
+
+// Laptop frame, starts empty and closed.
+/obj/item/device/modular_computer/laptop/buildable
+ start_open = 0
diff --git a/code/modules/modular_computers/computers/item/laptop_presets.dm b/code/modules/modular_computers/computers/item/laptop_presets.dm
new file mode 100644
index 00000000000..31519e70d6b
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/laptop_presets.dm
@@ -0,0 +1,21 @@
+/obj/item/device/modular_computer/laptop/preset/New()
+ . = ..()
+ install_component(new /obj/item/weapon/computer_hardware/processor_unit/small)
+ install_component(new /obj/item/weapon/computer_hardware/battery(src, /obj/item/weapon/stock_parts/cell/computer))
+ install_component(new /obj/item/weapon/computer_hardware/hard_drive)
+ install_component(new /obj/item/weapon/computer_hardware/network_card)
+ install_programs()
+
+
+/obj/item/device/modular_computer/laptop/preset/proc/install_programs()
+ return
+
+
+/obj/item/device/modular_computer/laptop/preset/civillian
+ desc = "A low-end laptop often used for personal recreation."
+
+
+/obj/item/device/modular_computer/laptop/preset/civillian/install_programs()
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD]
+ hard_drive.store_file(new/datum/computer_file/program/chatclient())
+ hard_drive.store_file(new/datum/computer_file/program/nttransfer())
\ No newline at end of file
diff --git a/code/modules/modular_computers/computers/item/processor.dm b/code/modules/modular_computers/computers/item/processor.dm
new file mode 100644
index 00000000000..3c81c43e824
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/processor.dm
@@ -0,0 +1,74 @@
+// Held by /obj/machinery/modular_computer to reduce amount of copy-pasted code.
+/obj/item/device/modular_computer/processor
+ name = "processing unit"
+ desc = "You shouldn't see this. If you do, report it."
+ icon = null
+ icon_state = null
+ icon_state_unpowered = null
+ icon_state_menu = null
+ hardware_flag = 0
+
+ var/obj/machinery/modular_computer/machinery_computer = null
+
+/obj/item/device/modular_computer/processor/Destroy()
+ . = ..()
+ if(machinery_computer && (machinery_computer.cpu == src))
+ machinery_computer.cpu = null
+ machinery_computer = null
+
+/obj/item/device/modular_computer/processor/New(comp)
+ if(!comp || !istype(comp, /obj/machinery/modular_computer))
+ CRASH("Inapropriate type passed to obj/item/device/modular_computer/processor/New()! Aborting.")
+ return
+ // Obtain reference to machinery computer
+ all_components = list()
+ idle_threads = list()
+ machinery_computer = comp
+ machinery_computer.cpu = src
+ hardware_flag = machinery_computer.hardware_flag
+ max_hardware_size = machinery_computer.max_hardware_size
+ steel_sheet_cost = machinery_computer.steel_sheet_cost
+ obj_integrity = machinery_computer.obj_integrity
+ max_integrity = machinery_computer.max_integrity
+ integrity_failure = machinery_computer.integrity_failure
+ base_active_power_usage = machinery_computer.base_active_power_usage
+ base_idle_power_usage = machinery_computer.base_idle_power_usage
+
+/obj/item/device/modular_computer/processor/relay_qdel()
+ qdel(machinery_computer)
+
+/obj/item/device/modular_computer/processor/update_icon()
+ if(machinery_computer)
+ return machinery_computer.update_icon()
+
+// This thing is not meant to be used on it's own, get topic data from our machinery owner.
+//obj/item/device/modular_computer/processor/canUseTopic(user, state)
+// if(!machinery_computer)
+// return 0
+
+// return machinery_computer.canUseTopic(user, state)
+
+/obj/item/device/modular_computer/processor/shutdown_computer()
+ if(!machinery_computer)
+ return
+ ..()
+ machinery_computer.update_icon()
+ return
+
+/obj/item/device/modular_computer/processor/add_verb(path)
+ switch(path)
+ if(MC_CARD)
+ machinery_computer.verbs += /obj/machinery/modular_computer/proc/eject_id
+ if(MC_SDD)
+ machinery_computer.verbs += /obj/machinery/modular_computer/proc/eject_disk
+ if(MC_AI)
+ machinery_computer.verbs += /obj/machinery/modular_computer/proc/eject_card
+
+/obj/item/device/modular_computer/processor/remove_verb(path)
+ switch(path)
+ if(MC_CARD)
+ machinery_computer.verbs -= /obj/machinery/modular_computer/proc/eject_id
+ if(MC_SDD)
+ machinery_computer.verbs -= /obj/machinery/modular_computer/proc/eject_disk
+ if(MC_AI)
+ machinery_computer.verbs -= /obj/machinery/modular_computer/proc/eject_card
\ No newline at end of file
diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm
new file mode 100644
index 00000000000..6a2b5674a5b
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/tablet.dm
@@ -0,0 +1,12 @@
+/obj/item/device/modular_computer/tablet //Its called tablet for theme of 90ies but actually its a "big smartphone" sized
+ name = "tablet computer"
+ icon = 'icons/obj/modular_tablet.dmi'
+ icon_state = "tablet"
+ icon_state_unpowered = "tablet"
+ icon_state_powered = "tablet"
+ icon_state_menu = "menu"
+ hardware_flag = PROGRAM_TABLET
+ max_hardware_size = 1
+ w_class = WEIGHT_CLASS_SMALL
+ steel_sheet_cost = 1
+ slot_flags = SLOT_ID | SLOT_BELT
\ No newline at end of file
diff --git a/code/modules/modular_computers/computers/item/tablet_presets.dm b/code/modules/modular_computers/computers/item/tablet_presets.dm
new file mode 100644
index 00000000000..6ac9ed4063b
--- /dev/null
+++ b/code/modules/modular_computers/computers/item/tablet_presets.dm
@@ -0,0 +1,29 @@
+
+// This is literally the worst possible cheap tablet
+/obj/item/device/modular_computer/tablet/preset/cheap
+ desc = "A low-end tablet often seen among low ranked station personnel."
+
+/obj/item/device/modular_computer/tablet/preset/cheap/New()
+ . = ..()
+ install_component(new /obj/item/weapon/computer_hardware/processor_unit/small)
+ install_component(new /obj/item/weapon/computer_hardware/battery(src, /obj/item/weapon/stock_parts/cell/computer/micro))
+ install_component(new /obj/item/weapon/computer_hardware/hard_drive/small)
+ install_component(new /obj/item/weapon/computer_hardware/network_card)
+
+// Alternative version, an average one, for higher ranked positions mostly
+/obj/item/device/modular_computer/tablet/preset/advanced/New()
+ . = ..()
+ install_component(new /obj/item/weapon/computer_hardware/processor_unit/small)
+ install_component(new /obj/item/weapon/computer_hardware/battery(src, /obj/item/weapon/stock_parts/cell/computer))
+ install_component(new /obj/item/weapon/computer_hardware/hard_drive/small)
+ install_component(new /obj/item/weapon/computer_hardware/network_card)
+ install_component(new /obj/item/weapon/computer_hardware/card_slot)
+ install_component(new /obj/item/weapon/computer_hardware/printer/mini)
+
+/obj/item/device/modular_computer/tablet/preset/cargo/New()
+ . = ..()
+ install_component(new /obj/item/weapon/computer_hardware/processor_unit/small)
+ install_component(new /obj/item/weapon/computer_hardware/battery(src, /obj/item/weapon/stock_parts/cell/computer))
+ install_component(new /obj/item/weapon/computer_hardware/hard_drive/small)
+ install_component(new /obj/item/weapon/computer_hardware/network_card)
+ install_component(new /obj/item/weapon/computer_hardware/printer/mini)
diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm
new file mode 100644
index 00000000000..3f9d3de11ca
--- /dev/null
+++ b/code/modules/modular_computers/computers/machinery/console_presets.dm
@@ -0,0 +1,75 @@
+/obj/machinery/modular_computer/console/preset
+ // Can be changed to give devices specific hardware
+ var/_has_id_slot = 0
+ var/_has_printer = 0
+ var/_has_battery = 0
+ var/_has_ai = 0
+
+/obj/machinery/modular_computer/console/preset/New()
+ . = ..()
+ if(!cpu)
+ return
+ cpu.install_component(new /obj/item/weapon/computer_hardware/processor_unit)
+
+ if(_has_id_slot)
+ cpu.install_component(new /obj/item/weapon/computer_hardware/card_slot)
+ if(_has_printer)
+ cpu.install_component(new /obj/item/weapon/computer_hardware/printer)
+ if(_has_battery)
+ cpu.install_component(new /obj/item/weapon/computer_hardware/battery(cpu, /obj/item/weapon/stock_parts/cell/computer/super))
+ if(_has_ai)
+ cpu.install_component(new /obj/item/weapon/computer_hardware/ai_slot)
+ install_programs()
+
+// Override in child types to install preset-specific programs.
+/obj/machinery/modular_computer/console/preset/proc/install_programs()
+ return
+
+
+
+// ===== ENGINEERING CONSOLE =====
+/obj/machinery/modular_computer/console/preset/engineering
+ console_department = "Engineering"
+ desc = "A stationary computer. This one comes preloaded with engineering programs."
+
+/obj/machinery/modular_computer/console/preset/engineering/install_programs()
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
+ hard_drive.store_file(new/datum/computer_file/program/power_monitor())
+ hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())
+
+// ===== RESEARCH CONSOLE =====
+/obj/machinery/modular_computer/console/preset/research
+ console_department = "Research"
+ desc = "A stationary computer. This one comes preloaded with research programs."
+ _has_ai = 1
+
+/obj/machinery/modular_computer/console/preset/research/install_programs()
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
+ hard_drive.store_file(new/datum/computer_file/program/ntnetmonitor())
+ hard_drive.store_file(new/datum/computer_file/program/nttransfer())
+ hard_drive.store_file(new/datum/computer_file/program/chatclient())
+ hard_drive.store_file(new/datum/computer_file/program/aidiag())
+
+
+// ===== COMMAND CONSOLE =====
+/obj/machinery/modular_computer/console/preset/command
+ console_department = "Command"
+ desc = "A stationary computer. This one comes preloaded with command programs."
+ _has_id_slot = 1
+ _has_printer = 1
+
+/obj/machinery/modular_computer/console/preset/command/install_programs()
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
+ hard_drive.store_file(new/datum/computer_file/program/chatclient())
+ hard_drive.store_file(new/datum/computer_file/program/card_mod())
+ hard_drive.store_file(new/datum/computer_file/program/comm())
+
+// ===== CIVILIAN CONSOLE =====
+/obj/machinery/modular_computer/console/preset/civilian
+ console_department = "Civilian"
+ desc = "A stationary computer. This one comes preloaded with generic programs."
+
+/obj/machinery/modular_computer/console/preset/civilian/install_programs()
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
+ hard_drive.store_file(new/datum/computer_file/program/chatclient())
+ hard_drive.store_file(new/datum/computer_file/program/nttransfer())
\ No newline at end of file
diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm
new file mode 100644
index 00000000000..a28184fed7a
--- /dev/null
+++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -0,0 +1,160 @@
+// Global var to track modular computers
+var/list/global_modular_computers = list()
+
+// Modular Computer - device that runs various programs and operates with hardware
+// DO NOT SPAWN THIS TYPE. Use /laptop/ or /console/ instead.
+/obj/machinery/modular_computer
+ name = "modular computer"
+ desc = "An advanced computer."
+
+ use_power = 1
+ idle_power_usage = 5
+ var/hardware_flag = 0 // A flag that describes this device type
+ var/last_power_usage = 0 // Power usage during last tick
+
+ // Modular computers can run on various devices. Each DEVICE (Laptop, Console, Tablet,..)
+ // must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently
+ // If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example.
+
+ icon = null
+ icon_state = null
+ var/icon_state_unpowered = null // Icon state when the computer is turned off.
+ var/icon_state_powered = null // Icon state when the computer is turned on.
+ var/screen_icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen.
+ var/screen_icon_screensaver = "standby" // Icon state overlay when the computer is powered, but not 'switched on'.
+ var/max_hardware_size = 0 // Maximal hardware size. Currently, tablets have 1, laptops 2 and consoles 3. Limits what hardware types can be installed.
+ var/steel_sheet_cost = 10 // Amount of steel sheets refunded when disassembling an empty frame of this computer.
+ var/light_strength = 0 // Light luminosity when turned on
+ var/base_active_power_usage = 100 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too.
+ var/base_idle_power_usage = 10 // Power usage when the computer is idle and screen is off (currently only applies to laptops)
+
+ var/obj_integrity = 300
+ var/integrity_failure = 150
+ var/max_integrity = 300
+
+ var/obj/item/device/modular_computer/processor/cpu = null // CPU that handles most logic while this type only handles power and other specific things.
+
+/obj/machinery/modular_computer/New()
+ ..()
+ cpu = new(src)
+ cpu.physical = src
+ global_modular_computers.Add(src)
+
+/obj/machinery/modular_computer/Destroy()
+ if(cpu)
+ qdel(cpu)
+ cpu = null
+ return ..()
+
+/obj/machinery/modular_computer/attack_ghost(mob/dead/observer/user)
+ if(cpu)
+ cpu.attack_ghost(user)
+
+/obj/machinery/modular_computer/emag_act(mob/user)
+ return cpu ? cpu.emag_act(user) : 1
+
+/obj/machinery/modular_computer/update_icon()
+ overlays.Cut()
+ icon_state = icon_state_powered
+
+ if(!cpu || !cpu.enabled)
+ if (!(stat & NOPOWER) && (cpu && cpu.use_power()))
+ overlays += screen_icon_screensaver
+ else
+ icon_state = icon_state_unpowered
+ set_light(0)
+ else
+ set_light(light_strength)
+ if(cpu.active_program)
+ overlays += cpu.active_program.program_icon_state ? cpu.active_program.program_icon_state : screen_icon_state_menu
+ else
+ overlays += screen_icon_state_menu
+
+ if(cpu && cpu.obj_integrity <= cpu.integrity_failure)
+ overlays += "bsod"
+ overlays += "broken"
+
+// Eject ID card from computer, if it has ID slot with card inside.
+/obj/machinery/modular_computer/proc/eject_id()
+ set name = "Eject ID"
+ set category = "Object"
+
+ if(cpu)
+ cpu.eject_id()
+
+// Eject ID card from computer, if it has ID slot with card inside.
+/obj/machinery/modular_computer/proc/eject_disk()
+ set name = "Eject Data Disk"
+ set category = "Object"
+
+ if(cpu)
+ cpu.eject_disk()
+
+/obj/machinery/modular_computer/proc/eject_card()
+ set name = "Eject Intellicard"
+ set category = "Object"
+ set src in view(1)
+
+ if(cpu)
+ cpu.eject_card()
+
+/obj/machinery/modular_computer/AltClick(mob/user)
+ if(cpu)
+ cpu.AltClick(user)
+
+// On-click handling. Turns on the computer if it's off and opens the GUI.
+/obj/machinery/modular_computer/attack_hand(mob/user)
+ if(cpu)
+ cpu.attack_self(user) // CPU is an item, that's why we route attack_hand to attack_self
+
+// Process currently calls handle_power(), may be expanded in future if more things are added.
+/obj/machinery/modular_computer/process()
+ if(cpu)
+ // Keep names in sync.
+ cpu.name = src.name
+ cpu.process()
+
+// Used in following function to reduce copypaste
+/obj/machinery/modular_computer/proc/power_failure(malfunction = 0)
+ var/obj/item/weapon/computer_hardware/battery/battery_module = cpu.all_components[MC_CELL]
+ if(cpu && cpu.enabled) // Shut down the computer
+ visible_message("\The [src]'s screen flickers [battery_module ? "\"BATTERY [malfunction ? "MALFUNCTION" : "CRITICAL"]\"" : "\"EXTERNAL POWER LOSS\""] warning as it shuts down unexpectedly.")
+ if(cpu)
+ cpu.shutdown_computer(0)
+ stat |= NOPOWER
+ update_icon()
+
+
+// Modular computers can have battery in them, we handle power in previous proc, so prevent this from messing it up for us.
+/obj/machinery/modular_computer/power_change()
+ if(cpu && cpu.use_power()) // If MC_CPU still has a power source, PC wouldn't go offline.
+ stat &= ~NOPOWER
+ update_icon()
+ return
+ ..()
+ update_icon()
+
+/obj/machinery/modular_computer/attackby(obj/item/weapon/W, mob/user)
+ if(cpu)
+ return cpu.attackby(W, user)
+ return ..()
+
+
+// Stronger explosions cause serious damage to internal components
+// Minor explosions are mostly mitigitated by casing.
+/obj/machinery/modular_computer/ex_act(severity)
+ if(cpu)
+ cpu.ex_act(severity)
+ ..()
+
+// EMPs are similar to explosions, but don't cause physical damage to the casing. Instead they screw up the components
+/obj/machinery/modular_computer/emp_act(severity)
+ if(cpu)
+ cpu.emp_act(severity)
+
+// "Stun" weapons can cause minor damage to components (short-circuits?)
+// "Burn" damage is equally strong against internal components and exterior casing
+// "Brute" damage mostly damages the casing.
+/obj/machinery/modular_computer/bullet_act(obj/item/projectile/Proj)
+ if(cpu)
+ cpu.bullet_act(Proj)
diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm
new file mode 100644
index 00000000000..2c330913353
--- /dev/null
+++ b/code/modules/modular_computers/computers/machinery/modular_console.dm
@@ -0,0 +1,54 @@
+/obj/machinery/modular_computer/console
+ name = "console"
+ desc = "A stationary computer."
+
+ icon = 'icons/obj/modular_console.dmi'
+ icon_state = "console"
+ icon_state_powered = "console"
+ icon_state_unpowered = "console-off"
+ screen_icon_state_menu = "menu"
+ hardware_flag = PROGRAM_CONSOLE
+ anchored = 1
+ density = 1
+ base_idle_power_usage = 100
+ base_active_power_usage = 500
+ max_hardware_size = 4
+ steel_sheet_cost = 10
+ light_strength = 2
+ obj_integrity = 300
+ max_integrity = 300
+ integrity_failure = 150
+
+ var/console_department = "" // Used in New() to set network tag according to our area.
+ var/components = TRUE // Install basic components?
+
+/obj/machinery/modular_computer/console/buildable
+ components = FALSE
+
+/obj/machinery/modular_computer/console/New()
+ ..()
+ var/obj/item/weapon/computer_hardware/battery/battery_module = cpu.all_components[MC_CELL]
+ if(battery_module)
+ qdel(battery_module)
+
+ if(components)
+ var/obj/item/weapon/computer_hardware/network_card/wired/network_card = new()
+
+ cpu.install_component(network_card)
+ cpu.install_component(new /obj/item/weapon/computer_hardware/recharger/APC)
+ cpu.install_component(new /obj/item/weapon/computer_hardware/hard_drive/super) // Consoles generally have better HDDs due to lower space limitations
+
+ var/area/A = get_area(src)
+ // Attempts to set this console's tag according to our area. Since some areas have stuff like "XX - YY" in their names we try to remove that too.
+ if(A && console_department)
+ network_card.identification_string = replacetext(replacetext(replacetext("[A.name] [console_department] Console", " ", "_"), "-", ""), "__", "_") // Replace spaces with "_"
+ else if(A)
+ network_card.identification_string = replacetext(replacetext(replacetext("[A.name] Console", " ", "_"), "-", ""), "__", "_")
+ else if(console_department)
+ network_card.identification_string = replacetext(replacetext(replacetext("[console_department] Console", " ", "_"), "-", ""), "__", "_")
+ else
+ network_card.identification_string = "Unknown Console"
+
+ if(cpu)
+ cpu.screen_on = 1
+ update_icon()
\ No newline at end of file
diff --git a/code/modules/modular_computers/documentation.md b/code/modules/modular_computers/documentation.md
new file mode 100644
index 00000000000..88d8602729d
--- /dev/null
+++ b/code/modules/modular_computers/documentation.md
@@ -0,0 +1,45 @@
+
+
+#Modular computer programs
+Ok. so a quick rundown on how to make a program. This is kind of a shitty documentation, but oh well I was asked to.
+
+
+## Base setup
+This is how the base program is setup. the rest is mostly tgui stuff. I'll use the ntnetmonitor as a base
+
+
+```DM
+/datum/computer_file/program/ntnetmonitor
+ filename = "ntmonitor" //This is obviously the name of the file itself. not much to be said
+ filedesc = "NTNet Diagnostics and Monitoring" // This is sort of the official name. it's what shows up on the main menu
+ program_icon_state = "comm_monitor" // This is what the screen will look like when the program is active
+ extended_desc = "This program is a dummy. // This is a sort of a description, visible when looking on the ntnet
+ size = 12 // size of the program. Big programs need more hard drive space. Don't make it too big though.
+ requires_ntnet = 1 // If this is set, the program will not run without an ntnet connection, and will close if the connection is lost. Mainly for primarily online programs.
+ required_access = access_network //This is access required to run the program itself. ONLY SET THIS FOR SUPER SECURE SHIT. This also acts as transfer_access as well.
+ transfer_access = access_change_ids // This is the access needed to download from ntnet or host on the ptp program. This is what you want to use most of the time.
+ available_on_ntnet = 1 //If it's available to download on ntnet. pretty self explanatory.
+ available_on_syndinet = 0 // ditto but on emagged syndie net. Use this for antag programs
+ usage_flags = PROGRAM_ALL // Bitflags (PROGRAM_CONSOLE, PROGRAM_LAPTOP, PROGRAM_TABLET combination) or PROGRAM_ALL
+ //^^- The comment above sorta explains it. Use this to limit what kind of machines can run the program. For example, comms program should be limited to consoles and laptops.
+ var/ui_header = "downloader_finished.gif" //This one is kinda cool. If you have the program minimized, this will show up in the header of the computer screen.
+ //you can even have the program change what the header is based on the situation! see alarm.dm for an example.
+```
+
+##Preinstalls
+Now. for pre-installing stuff.
+
+Primarily done for consoles, there's an install_programs() proc in the console presets file in the machines folder.
+
+for example, the command console one.
+
+```DM
+/obj/machinery/modular_computer/console/preset/command/install_programs()
+ cpu.hard_drive.store_file(new/datum/computer_file/program/chatclient())
+ cpu.hard_drive.store_file(new/datum/computer_file/program/card_mod())
+```
+Basically, you want to do cpu.hard_drive.store_file(new/*program path here*()) and put it in the subtype's install_programs().
+Probably pretty self explanatory, but just in case.
+
+Will probably be expanded when new features come around or I get asked to mention something.
+
diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm
new file mode 100644
index 00000000000..15ae12a2859
--- /dev/null
+++ b/code/modules/modular_computers/file_system/computer_file.dm
@@ -0,0 +1,39 @@
+var/global/file_uid = 0
+
+/datum/computer_file
+ 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/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
+
+/datum/computer_file/New()
+ ..()
+ uid = file_uid
+ file_uid++
+
+/datum/computer_file/Destroy()
+ if(!holder)
+ return ..()
+
+ holder.remove_file(src)
+ // holder.holder is the computer that has drive installed. If we are Destroy()ing program that's currently running kill it.
+ if(holder.holder && holder.holder.active_program == src)
+ holder.holder.kill_program(forced = TRUE)
+ holder = null
+ ..()
+
+// Returns independent copy of this file.
+/datum/computer_file/proc/clone(rename = 0)
+ var/datum/computer_file/temp = new type
+ temp.unsendable = unsendable
+ temp.undeletable = undeletable
+ temp.size = size
+ if(rename)
+ temp.filename = filename + "(Copy)"
+ else
+ temp.filename = filename
+ temp.filetype = filetype
+ return temp
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/data.dm b/code/modules/modular_computers/file_system/data.dm
new file mode 100644
index 00000000000..32ef6f53dd1
--- /dev/null
+++ b/code/modules/modular_computers/file_system/data.dm
@@ -0,0 +1,20 @@
+// /data/ files store data in string format.
+// They don't contain other logic for now.
+/datum/computer_file/data
+ var/stored_data = "" // Stored data in string format.
+ filetype = "DAT"
+ var/block_size = 250
+ var/do_not_edit = 0 // Whether the user will be reminded that the file probably shouldn't be edited.
+
+/datum/computer_file/data/clone()
+ var/datum/computer_file/data/temp = ..()
+ temp.stored_data = stored_data
+ return temp
+
+// Calculates file size from amount of characters in saved string
+/datum/computer_file/data/proc/calculate_size()
+ size = max(1, round(length(stored_data) / block_size))
+
+/datum/computer_file/data/logfile
+ filetype = "LOG"
+
diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm
new file mode 100644
index 00000000000..8d917e4cb81
--- /dev/null
+++ b/code/modules/modular_computers/file_system/program.dm
@@ -0,0 +1,200 @@
+// /program/ files are executable programs that do things.
+/datum/computer_file/program
+ filetype = "PRG"
+ filename = "UnknownProgram" // File name. FILE NAME MUST BE UNIQUE IF YOU WANT THE PROGRAM TO BE DOWNLOADABLE FROM NTNET!
+ var/required_access = null // List of required accesses to *run* the program.
+ var/transfer_access = null // List of required access to download or file host the program
+ var/program_state = PROGRAM_STATE_KILLED// PROGRAM_STATE_KILLED or PROGRAM_STATE_BACKGROUND or PROGRAM_STATE_ACTIVE - specifies whether this program is running.
+ var/obj/item/device/modular_computer/computer // Device that runs this program.
+ var/filedesc = "Unknown Program" // User-friendly name of this program.
+ var/extended_desc = "N/A" // Short description of this program's function.
+ var/program_icon_state = null // Program-specific screen icon state
+ var/requires_ntnet = 0 // Set to 1 for program to require nonstop NTNet connection to run. If NTNet connection is lost program crashes.
+ var/requires_ntnet_feature = 0 // Optional, if above is set to 1 checks for specific function of NTNet (currently NTNET_SOFTWAREDOWNLOAD, NTNET_PEERTOPEER, NTNET_SYSTEMCONTROL and NTNET_COMMUNICATION)
+ var/ntnet_status = 1 // NTNet status, updated every tick by computer running this program. Don't use this for checks if NTNet works, computers do that. Use this for calculations, etc.
+ var/usage_flags = PROGRAM_ALL // Bitflags (PROGRAM_CONSOLE, PROGRAM_LAPTOP, PROGRAM_TABLET combination) or PROGRAM_ALL
+ var/network_destination = null // Optional string that describes what NTNet server/system this program connects to. Used in default logging.
+ var/available_on_ntnet = 1 // Whether the program can be downloaded from NTNet. Set to 0 to disable.
+ var/available_on_syndinet = 0 // Whether the program can be downloaded from SyndiNet (accessible via emagging the computer). Set to 1 to enable.
+ var/ui_header = null // Example: "something.gif" - a header image that will be rendered in computer's UI when this program is running at background. Images are taken from /icons/program_icons. Be careful not to use too large images!
+
+/datum/computer_file/program/New(obj/item/device/modular_computer/comp = null)
+ ..()
+ if(comp && istype(comp))
+ computer = comp
+
+/datum/computer_file/program/Destroy()
+ computer = null
+ . = ..()
+
+/datum/computer_file/program/clone()
+ var/datum/computer_file/program/temp = ..()
+ temp.required_access = required_access
+ temp.filedesc = filedesc
+ temp.program_icon_state = program_icon_state
+ temp.requires_ntnet = requires_ntnet
+ temp.requires_ntnet_feature = requires_ntnet_feature
+ temp.usage_flags = usage_flags
+ return temp
+
+// Relays icon update to the computer.
+/datum/computer_file/program/proc/update_computer_icon()
+ if(computer)
+ computer.update_icon()
+
+// Attempts to create a log in global ntnet datum. Returns 1 on success, 0 on fail.
+/datum/computer_file/program/proc/generate_network_log(text)
+ if(computer)
+ return computer.add_log(text)
+ return 0
+
+/datum/computer_file/program/proc/is_supported_by_hardware(hardware_flag = 0, loud = 0, mob/user = null)
+ if(!(hardware_flag & usage_flags))
+ if(loud && computer && user)
+ to_chat(user, "\The [computer] flashes an \"Hardware Error - Incompatible software\" warning.")
+ return 0
+ return 1
+
+/datum/computer_file/program/proc/get_signal(specific_action = 0)
+ if(computer)
+ return computer.get_ntnet_status(specific_action)
+ return 0
+
+// Called by Process() on device that runs us, once every tick.
+/datum/computer_file/program/proc/process_tick()
+ return 1
+
+// Check if the user can run program. Only humans can operate computer. Automatically called in run_program()
+// User has to wear their ID for ID Scan to work.
+// Can also be called manually, with optional parameter being access_to_check to scan the user's ID
+/datum/computer_file/program/proc/can_run(mob/user, loud = 0, access_to_check, transfer = 0)
+ // Defaults to required_access
+ if(!access_to_check)
+ if(transfer && transfer_access)
+ access_to_check = transfer_access
+ else
+ access_to_check = required_access
+ if(!access_to_check) // No required_access, allow it.
+ return 1
+
+ if(!transfer && computer && computer.emagged) //emags can bypass the execution locks but not the download ones.
+ return 1
+
+ if(user.can_admin_interact())
+ return 1
+
+ if(issilicon(user))
+ return 1
+
+ if(ishuman(user))
+ var/obj/item/weapon/card/id/D
+ var/obj/item/weapon/computer_hardware/card_slot/card_slot
+ if(computer && card_slot)
+ card_slot = computer.all_components[MC_CARD]
+ D = card_slot.GetID()
+ var/mob/living/carbon/human/h = user
+ var/obj/item/weapon/card/id/I = h.get_idcard()
+ var/obj/item/weapon/card/id/C = h.get_active_hand()
+ if(C)
+ C = C.GetID()
+ if(!(C && istype(C)))
+ C = null
+
+ if(!I && !C && !D)
+ if(loud)
+ to_chat(user, "\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.")
+ return 0
+
+ if(I)
+ if(access_to_check in I.GetAccess())
+ return 1
+ else if(C)
+ if(access_to_check in C.GetAccess())
+ return 1
+ else if(D)
+ if(access_to_check in D.GetAccess())
+ return 1
+ if(loud)
+ to_chat(user, "\The [computer] flashes an \"Access Denied\" warning.")
+ return 0
+
+// This attempts to retrieve header data for UIs. If implementing completely new device of different type than existing ones
+// always include the device here in this proc. This proc basically relays the request to whatever is running the program.
+/datum/computer_file/program/proc/get_header_data()
+ if(computer)
+ return computer.get_header_data()
+ return list()
+
+// This is performed on program startup. May be overriden to add extra logic. Remember to include ..() call. Return 1 on success, 0 on failure.
+// When implementing new program based device, use this to run the program.
+/datum/computer_file/program/proc/run_program(mob/living/user)
+ if(can_run(user, 1))
+ if(requires_ntnet && network_destination)
+ generate_network_log("Connection opened to [network_destination].")
+ program_state = PROGRAM_STATE_ACTIVE
+ return 1
+ return 0
+
+// Use this proc to kill the program. Designed to be implemented by each program if it requires on-quit logic, such as the NTNRC client.
+/datum/computer_file/program/proc/kill_program(forced = FALSE)
+ program_state = PROGRAM_STATE_KILLED
+ computer.update_icon()
+ if(network_destination)
+ generate_network_log("Connection to [network_destination] closed.")
+ return 1
+
+// This is called every tick when the program is enabled. Ensure you do parent call if you override it. If parent returns 1 continue with UI initialisation.
+
+/datum/computer_file/program/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ if(program_state != PROGRAM_STATE_ACTIVE) // Our program was closed. Close the ui if it exists.
+ return computer.ui_interact(user)
+ return 1
+
+
+// CONVENTIONS, READ THIS WHEN CREATING NEW PROGRAM AND OVERRIDING THIS PROC:
+// Topic calls are automagically forwarded from NanoModule this program contains.
+// Calls beginning with "PRG_" are reserved for programs handling.
+// Calls beginning with "PC_" are reserved for computer handling (by whatever runs the program)
+// ALWAYS INCLUDE PARENT CALL ..() OR DIE IN FIRE.
+/datum/computer_file/program/Topic(href, list/href_list)
+ if(..())
+ return 1
+
+ var/datum/nanoui/ui = nanomanager.get_open_ui(usr, src, "main")
+
+ if(computer)
+ switch(href_list["action"])
+ if("PC_exit")
+ computer.kill_program()
+ ui.close()
+ return 1
+ if("PC_shutdown")
+ computer.shutdown_computer()
+ ui.close()
+ return 1
+ if("PC_minimize")
+ var/mob/user = usr
+ if(!computer.active_program || !computer.all_components[MC_CPU])
+ return
+
+ computer.idle_threads.Add(computer.active_program)
+ program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs
+
+ computer.active_program = null
+ computer.update_icon()
+ ui.close()
+
+ if(user && istype(user))
+ computer.ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+
+
+/datum/computer_file/program/nano_host()
+ if(computer.physical)
+ return computer.physical
+ else
+ return computer
+
+/datum/computer_file/program/CanUseTopic(mob/user)
+ if(program_state != PROGRAM_STATE_ACTIVE) // Our program was closed. Close the ui if it exists.
+ return STATUS_CLOSE
+ return ..()
diff --git a/code/modules/modular_computers/file_system/program_events.dm b/code/modules/modular_computers/file_system/program_events.dm
new file mode 100644
index 00000000000..279d646cfd7
--- /dev/null
+++ b/code/modules/modular_computers/file_system/program_events.dm
@@ -0,0 +1,18 @@
+// Events are sent to the program by the computer.
+// Always include a parent call when overriding an event.
+
+// Called when the ID card is removed from computer. ID is removed AFTER this proc.
+/datum/computer_file/program/proc/event_idremoved(background, slot)
+ return
+
+// Called when the computer fails due to power loss. Override when program wants to specifically react to power loss.
+/datum/computer_file/program/proc/event_powerfailure(background)
+ kill_program(forced = TRUE)
+
+// Called when the network connectivity fails. Computer does necessary checks and only calls this when requires_ntnet_feature and similar variables are not met.
+/datum/computer_file/program/proc/event_networkfailure(background)
+ kill_program(forced = TRUE)
+ if(background)
+ computer.visible_message("\The [computer]'s screen displays an \"Process [filename].[filetype] (PID [rand(100,999)]) terminated - Network Error\" error")
+ else
+ computer.visible_message("\The [computer]'s screen briefly freezes and then shows \"NETWORK ERROR - NTNet connection lost. Please retry. If problem persists contact your system administrator.\" error.")
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm
new file mode 100644
index 00000000000..feaee3be63d
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm
@@ -0,0 +1,103 @@
+/datum/computer_file/program/ntnet_dos
+ filename = "ntn_dos"
+ filedesc = "DoS Traffic Generator"
+ program_icon_state = "hostile"
+ extended_desc = "This advanced script can perform denial of service attacks against NTNet quantum relays. The system administrator will probably notice this. Multiple devices can run this program together against same relay for increased effect"
+ size = 20
+ requires_ntnet = 1
+ available_on_ntnet = 0
+ available_on_syndinet = 1
+ var/obj/machinery/ntnet_relay/target = null
+ var/dos_speed = 0
+ var/error = ""
+ var/executed = 0
+
+/datum/computer_file/program/ntnet_dos/process_tick()
+ dos_speed = 0
+ switch(ntnet_status)
+ if(1)
+ dos_speed = NTNETSPEED_LOWSIGNAL * 10
+ if(2)
+ dos_speed = NTNETSPEED_HIGHSIGNAL * 10
+ if(3)
+ dos_speed = NTNETSPEED_ETHERNET * 10
+ if(target && executed)
+ target.dos_overload += dos_speed
+ if(target.inoperable())
+ target.dos_sources.Remove(src)
+ target = null
+ error = "Connection to destination relay lost."
+
+/datum/computer_file/program/ntnet_dos/kill_program(forced = FALSE)
+ if(target)
+ target.dos_sources.Remove(src)
+ target = null
+ executed = 0
+ ..()
+
+/datum/computer_file/program/ntnet_dos/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
+ assets.send(user)
+ ui = new(user, src, ui_key, "ntnet_dos.tmpl", "DoS Traffic Generator", 575, 250)
+ ui.set_auto_update(1)
+ ui.set_layout_key("program")
+ ui.open()
+
+
+/datum/computer_file/program/ntnet_dos/Topic(href, list/href_list)
+ if(..())
+ return 1
+ switch(href_list["action"])
+ if("PRG_target_relay")
+ for(var/obj/machinery/ntnet_relay/R in ntnet_global.relays)
+ if("[R.uid]" == href_list["targid"])
+ target = R
+ return 1
+ if("PRG_reset")
+ if(target)
+ target.dos_sources.Remove(src)
+ target = null
+ executed = 0
+ error = ""
+ return 1
+ if("PRG_execute")
+ if(target)
+ executed = 1
+ target.dos_sources.Add(src)
+ if(ntnet_global.intrusion_detection_enabled)
+ var/obj/item/weapon/computer_hardware/network_card/network_card = computer.all_components[MC_NET]
+ 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 = 1
+ return 1
+
+/datum/computer_file/program/ntnet_dos/ui_data(mob/user)
+ if(!ntnet_global)
+ return
+
+ var/list/data = get_header_data()
+
+ if(error)
+ data["error"] = error
+ else if(target && executed)
+ data["target"] = 1
+ data["speed"] = dos_speed
+
+ // This is mostly visual, generate some strings of 1s and 0s
+ // Probability of 1 is equal of completion percentage of DoS attack on this relay.
+ // Combined with UI updates this adds quite nice effect to the UI
+ var/percentage = target.dos_overload * 100 / target.dos_capacity
+ data["dos_strings"] = list()
+ for(var/j, j<10, j++)
+ var/string = ""
+ for(var/i, i<20, i++)
+ string = "[string][prob(percentage)]"
+ data["dos_strings"] += list(list("nums" = string))
+ else
+ data["relays"] = list()
+ for(var/obj/machinery/ntnet_relay/R in ntnet_global.relays)
+ data["relays"] += list(list("id" = R.uid))
+ data["focus"] = target ? target.uid : null
+
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
new file mode 100644
index 00000000000..148766ef59d
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
@@ -0,0 +1,78 @@
+/datum/computer_file/program/revelation
+ filename = "revelation"
+ filedesc = "Revelation"
+ program_icon_state = "hostile"
+ extended_desc = "This virus can destroy hard drive of system it is executed on. It may be obfuscated to look like another non-malicious program. Once armed, it will destroy the system upon next execution."
+ size = 13
+ requires_ntnet = 0
+ available_on_ntnet = 0
+ available_on_syndinet = 1
+ var/armed = 0
+
+/datum/computer_file/program/revelation/run_program(var/mob/living/user)
+ . = ..(user)
+ if(armed)
+ activate()
+
+/datum/computer_file/program/revelation/proc/activate()
+ if(computer)
+ computer.visible_message("\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.")
+ computer.enabled = 0
+ computer.update_icon()
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
+ var/obj/item/weapon/computer_hardware/battery/battery_module = computer.all_components[MC_CELL]
+ var/obj/item/weapon/computer_hardware/recharger/recharger = computer.all_components[MC_CHARGE]
+ qdel(hard_drive)
+ computer.take_damage(25, BRUTE, 0, 0)
+ if(battery_module && prob(25))
+ qdel(battery_module)
+ computer.visible_message("\The [computer]'s battery explodes in rain of sparks.")
+ var/datum/effect/system/spark_spread/spark_system = new /datum/effect/system/spark_spread()
+ spark_system.set_up(5, 0, computer.loc)
+ spark_system.start()
+
+ if(recharger && prob(50))
+ qdel(recharger)
+ computer.visible_message("\The [computer]'s recharger explodes in rain of sparks.")
+ var/datum/effect/system/spark_spread/spark_system = new /datum/effect/system/spark_spread()
+ spark_system.set_up(5, 0, computer.loc)
+ spark_system.start()
+
+
+/datum/computer_file/program/revelation/Topic(href, list/href_list)
+ if(..())
+ return 1
+ switch(href_list["action"])
+ if("PRG_arm")
+ armed = !armed
+ if("PRG_activate")
+ activate()
+ if("PRG_obfuscate")
+ var/mob/living/user = usr
+ var/newname = sanitize(input(user, "Enter new program name: "))
+ if(!newname)
+ return
+ filedesc = newname
+
+
+/datum/computer_file/program/revelation/clone()
+ var/datum/computer_file/program/revelation/temp = ..()
+ temp.armed = armed
+ return temp
+
+/datum/computer_file/program/revelation/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
+ assets.send(user)
+ ui = new(user, src, ui_key, "revelation.tmpl", "Revelation Virus", 575, 250)
+ ui.set_auto_update(1)
+ ui.set_layout_key("program")
+ ui.open()
+
+/datum/computer_file/program/revelation/ui_data(mob/user)
+ var/list/data = get_header_data()
+
+ data["armed"] = armed
+
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm
new file mode 100644
index 00000000000..8cd1043bea6
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/command/card.dm
@@ -0,0 +1,413 @@
+/datum/computer_file/program/card_mod
+ filename = "cardmod"
+ filedesc = "ID card modification program"
+ program_icon_state = "id"
+ extended_desc = "Program for programming employee ID cards to access parts of the station."
+ transfer_access = access_change_ids
+ requires_ntnet = 0
+ size = 8
+ var/is_centcom = 0
+ var/mode = 0
+ var/printing = 0
+
+ //Cooldown for closing positions in seconds
+ //if set to -1: No cooldown... probably a bad idea
+ //if set to 0: Not able to close "original" positions. You can only close positions that you have opened before
+ var/change_position_cooldown = 60
+ //Jobs you cannot open new positions for
+ var/list/blacklisted = list(
+ /datum/job/ai,
+ /datum/job/cyborg,
+ /datum/job/captain,
+ /datum/job/hop,
+ /datum/job/hos,
+ /datum/job/chief_engineer,
+ /datum/job/rd,
+ /datum/job/cmo,
+ /datum/job/judge,
+ /datum/job/blueshield,
+ /datum/job/nanotrasenrep,
+ /datum/job/pilot,
+ /datum/job/brigdoc,
+ /datum/job/mechanic,
+ /datum/job/barber,
+ /datum/job/chaplain,
+ /datum/job/ntnavyofficer,
+ /datum/job/ntspecops,
+ /datum/job/civilian
+ )
+
+ //The scaling factor of max total positions in relation to the total amount of people on board the station in %
+ var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players
+
+ //This is used to keep track of opened positions for jobs to allow instant closing
+ //Assoc array: "JobName" = (int)Crew Manifest
[data_core ? data_core.get_manifest(0) : ""]" + else if(modify && !mode) + title = "access report" + content = {"
Access Report
+ Prepared By: [scan && scan.registered_name ? scan.registered_name : "Unknown"]+ For: [modify.registered_name ? modify.registered_name : "Unregistered"]
+
+ Assignment: [modify.assignment]
+ Account Number: #[modify.associated_account_number]
+ Blood Type: [modify.blood_type]
+ Access:
"}
+
+ var/first = 1
+ for(var/A in modify.access)
+ content += "[first ? "" : ", "][get_access_desc(A)]"
+ first = 0
+ content += "
"
+
+ if(content)
+ if(!printer.print_text(content, title))
+ to_chat(user, "Hardware error: Printer was unable to print the file. It may be out of paper.")
+ return 1
+ else
+ computer.visible_message("\The [computer] prints out paper.")
+
+ if("PRG_terminate")
+ if(is_authenticated(usr))
+ modify.assignment = "Terminated"
+ modify.access = list()
+
+ callHook("terminate_employee", list(modify))
+
+ if("PRG_make_job_available")
+ // MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS
+ if(is_authenticated(usr))
+ var/edit_job_target = href_list["job"]
+ var/datum/job/j = job_master.GetJob(edit_job_target)
+ if(!j)
+ return 1
+ if(can_open_job(j) != 1)
+ return 1
+ if(opened_positions[edit_job_target] >= 0)
+ time_last_changed_position = world.time / 10
+ j.total_positions++
+ opened_positions[edit_job_target]++
+ log_game("[key_name(usr)] has opened a job slot for job \"[j]\".")
+
+ if("PRG_make_job_unavailable")
+ // MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS
+ if(is_authenticated(usr))
+ var/edit_job_target = href_list["job"]
+ var/datum/job/j = job_master.GetJob(edit_job_target)
+ if(!j)
+ return 1
+ if(can_close_job(j) != 1)
+ return 1
+ //Allow instant closing without cooldown if a position has been opened before
+ if(opened_positions[edit_job_target] <= 0)
+ time_last_changed_position = world.time / 10
+ j.total_positions--
+ opened_positions[edit_job_target]--
+ log_game("[key_name(usr)] has closed a job slot for job \"[j]\".")
+
+ if(modify)
+ modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
+
+ nanomanager.update_uis(src)
+ return 1
+
+/datum/computer_file/program/card_mod/ui_data(mob/user)
+ var/list/data = get_header_data()
+
+ var/obj/item/weapon/card/id/modify = null
+ var/obj/item/weapon/card/id/scan = null
+
+ var/obj/item/weapon/computer_hardware/card_slot/card_slot
+ var/obj/item/weapon/computer_hardware/printer/printer
+ if(computer)
+ card_slot = computer.all_components[MC_CARD]
+ printer = computer.all_components[MC_PRINT]
+ if(card_slot)
+ modify = card_slot.stored_card
+ scan = card_slot.stored_card2
+
+ data["src"] = UID()
+ data["station_name"] = station_name()
+ data["mode"] = mode
+ data["printing"] = printing
+ data["printer"] = printer ? TRUE : FALSE
+ data["manifest"] = data_core ? data_core.get_manifest(0) : null
+ data["target_name"] = modify ? modify.name : "-----"
+ data["target_owner"] = modify && modify.registered_name ? modify.registered_name : "-----"
+ data["target_rank"] = get_target_rank()
+ data["scan_name"] = scan ? scan.name : "-----"
+ data["authenticated"] = is_authenticated(user)
+ data["has_modify"] = !!modify
+ data["account_number"] = modify ? modify.associated_account_number : null
+ data["centcom_access"] = is_centcom
+ data["all_centcom_access"] = null
+ data["regions"] = null
+
+ data["engineering_jobs"] = format_jobs(engineering_positions)
+ data["medical_jobs"] = format_jobs(medical_positions)
+ data["science_jobs"] = format_jobs(science_positions)
+ data["security_jobs"] = format_jobs(security_positions)
+ data["support_jobs"] = format_jobs(support_positions)
+ data["civilian_jobs"] = format_jobs(civilian_positions)
+ data["special_jobs"] = format_jobs(whitelisted_positions)
+ data["centcom_jobs"] = format_jobs(get_all_centcom_jobs())
+ data["card_skins"] = format_card_skins(get_station_card_skins())
+
+ data["job_slots"] = format_job_slots()
+
+ var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - time_last_changed_position), 1)
+ var/mins = round(time_to_wait / 60)
+ var/seconds = time_to_wait - (60*mins)
+ data["cooldown_mins"] = mins
+ data["cooldown_secs"] = (seconds < 10) ? "0[seconds]" : seconds
+
+ if(modify)
+ data["current_skin"] = modify.icon_state
+
+ if(modify && is_centcom)
+ var/list/all_centcom_access = list()
+ for(var/access in get_all_centcom_access())
+ all_centcom_access.Add(list(list(
+ "desc" = replacetext(get_centcom_access_desc(access), " ", " "),
+ "ref" = access,
+ "allowed" = (access in modify.access) ? 1 : 0)))
+
+ data["all_centcom_access"] = all_centcom_access
+ data["all_centcom_skins"] = format_card_skins(get_centcom_card_skins())
+
+ else if(modify)
+ var/list/regions = list()
+ for(var/i = 1; i <= 7; i++)
+ var/list/accesses = list()
+ for(var/access in get_region_accesses(i))
+ if(get_access_desc(access))
+ accesses.Add(list(list(
+ "desc" = replacetext(get_access_desc(access), " ", " "),
+ "ref" = access,
+ "allowed" = (access in modify.access) ? 1 : 0)))
+
+ regions.Add(list(list(
+ "name" = get_region_accesses_name(i),
+ "accesses" = accesses)))
+
+ data["regions"] = regions
+
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/command/comms.dm b/code/modules/modular_computers/file_system/programs/command/comms.dm
new file mode 100644
index 00000000000..84cc2ec130a
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/command/comms.dm
@@ -0,0 +1,402 @@
+/datum/computer_file/program/comm
+ filename = "comm"
+ filedesc = "Command and communications"
+ program_icon_state = "comm"
+ extended_desc = "Used to command and control the station. Can relay long-range communications. This program can not be run on tablet computers."
+ required_access = access_heads
+ requires_ntnet = 1
+ size = 12
+ usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
+ network_destination = "station long-range communication array"
+
+ var/authenticated = COMM_AUTHENTICATION_NONE
+ var/list/messagetitle = list()
+ var/list/messagetext = list()
+ var/currmsg = 0
+ var/aicurrmsg = 0
+ var/menu_state = COMM_SCREEN_MAIN
+ var/ai_menu_state = COMM_SCREEN_MAIN
+ var/message_cooldown = 0
+ var/centcomm_message_cooldown = 0
+ var/tmp_alertlevel = 0
+
+ var/status_display_freq = "1435"
+ var/stat_msg1
+ var/stat_msg2
+ var/display_type="blank"
+
+ var/datum/announcement/priority/crew_announcement = new
+
+/datum/computer_file/program/comm/New()
+ shuttle_caller_list += src
+ ..()
+ crew_announcement.newscast = 0
+
+/datum/computer_file/program/comm/Destroy()
+ shuttle_caller_list -= src
+ shuttle_master.autoEvac()
+ return ..()
+
+/datum/computer_file/program/comm/proc/is_authenticated(mob/user, loud = 1)
+ if(authenticated == COMM_AUTHENTICATION_MAX)
+ return COMM_AUTHENTICATION_MAX
+ else if(user.can_admin_interact())
+ return COMM_AUTHENTICATION_MAX
+ else if(authenticated)
+ return COMM_AUTHENTICATION_MIN
+ else
+ if(loud)
+ to_chat(user, "Access denied.")
+ return COMM_AUTHENTICATION_NONE
+
+/datum/computer_file/program/comm/proc/change_security_level(mob/user, new_level)
+ tmp_alertlevel = new_level
+ var/old_level = security_level
+ if(!tmp_alertlevel)
+ tmp_alertlevel = SEC_LEVEL_GREEN
+ if(tmp_alertlevel < SEC_LEVEL_GREEN)
+ tmp_alertlevel = SEC_LEVEL_GREEN
+ if(tmp_alertlevel > SEC_LEVEL_BLUE)
+ tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this
+ set_security_level(tmp_alertlevel)
+ if(security_level != old_level)
+ log_game("[key_name(user)] has changed the security level to [get_security_level()].")
+ message_admins("[key_name_admin(user)] has changed the security level to [get_security_level()].")
+ switch(security_level)
+ if(SEC_LEVEL_GREEN)
+ feedback_inc("alert_comms_green", 1)
+ if(SEC_LEVEL_BLUE)
+ feedback_inc("alert_comms_blue", 1)
+ tmp_alertlevel = 0
+
+/datum/computer_file/program/comm/proc/setCurrentMessage(mob/user, value)
+ if(isAI(user) || isrobot(user))
+ aicurrmsg = value
+ else
+ currmsg = value
+
+/datum/computer_file/program/comm/proc/getCurrentMessage(mob/user)
+ if(isAI(user) || isrobot(user))
+ return aicurrmsg
+ else
+ return currmsg
+
+/datum/computer_file/program/comm/proc/setMenuState(mob/user, value)
+ if(isAI(user) || isrobot(user))
+ ai_menu_state=value
+ else
+ menu_state=value
+
+/datum/computer_file/program/comm/proc/getMenuState(mob/user)
+ if(isAI(user) || isrobot(user))
+ return ai_menu_state
+ else
+ return menu_state
+
+/datum/computer_file/program/comm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui)
+ if(!ui)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
+ assets.send(user)
+ ui = new(user, src, ui_key, "comm_program.tmpl", "Command and communications program", 575, 500)
+ ui.set_layout_key("program")
+ ui.open()
+
+/datum/computer_file/program/comm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+ var/list/data = get_header_data()
+ data["is_ai"] = isAI(user) || isrobot(user)
+ data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state
+ data["emagged"] = computer ? computer.emagged : null
+ data["authenticated"] = is_authenticated(user, 0)
+ data["screen"] = getMenuState(usr)
+
+ data["stat_display"] = list(
+ "type" = display_type,
+ "line_1" = (stat_msg1 ? stat_msg1 : "-----"),
+ "line_2" = (stat_msg2 ? stat_msg2 : "-----"),
+
+ "presets" = list(
+ list("name" = "blank", "label" = "Clear", "desc" = "Blank slate"),
+ list("name" = "shuttle", "label" = "Shuttle ETA", "desc" = "Display how much time is left."),
+ list("name" = "message", "label" = "Message", "desc" = "A custom message.")
+ ),
+
+ "alerts"=list(
+ list("alert" = "default", "label" = "Nanotrasen", "desc" = "Oh god."),
+ list("alert" = "redalert", "label" = "Red Alert", "desc" = "Nothing to do with communists."),
+ list("alert" = "lockdown", "label" = "Lockdown", "desc" = "Let everyone know they're on lockdown."),
+ list("alert" = "biohazard", "label" = "Biohazard", "desc" = "Great for virus outbreaks and parties."),
+ )
+ )
+
+ data["security_level"] = security_level
+ data["str_security_level"] = capitalize(get_security_level())
+ data["levels"] = list(
+ list("id" = SEC_LEVEL_GREEN, "name" = "Green"),
+ list("id" = SEC_LEVEL_BLUE, "name" = "Blue"),
+ )
+
+ var/list/msg_data = list()
+ for(var/i = 1; i <= messagetext.len; i++)
+ msg_data.Add(list(list("title" = messagetitle[i], "body" = messagetext[i], "id" = i)))
+
+ data["messages"] = msg_data
+ if((data["is_ai"] && aicurrmsg) || (!data["is_ai"] && currmsg))
+ data["current_message"] = data["is_ai"] ? messagetext[aicurrmsg] : messagetext[currmsg]
+ data["current_message_title"] = data["is_ai"] ? messagetitle[aicurrmsg] : messagetitle[currmsg]
+
+ data["lastCallLoc"] = shuttle_master.emergencyLastCallLoc ? format_text(shuttle_master.emergencyLastCallLoc.name) : null
+
+ var/shuttle[0]
+ switch(shuttle_master.emergency.mode)
+ if(SHUTTLE_IDLE, SHUTTLE_RECALL)
+ shuttle["callStatus"] = 2 //#define
+ else
+ shuttle["callStatus"] = 1
+ if(shuttle_master.emergency.mode == SHUTTLE_CALL)
+ var/timeleft = shuttle_master.emergency.timeLeft()
+ shuttle["eta"] = "[timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]"
+
+ data["shuttle"] = shuttle
+
+ if(trade_dockrequest_timelimit > world.time)
+ data["dock_request"] = 1
+ else
+ data["dock_request"] = 0
+
+ return data
+
+/datum/computer_file/program/comm/Topic(href, href_list)
+ if(..())
+ return 1
+
+ var/turf/T = get_turf(computer)
+ if(!is_secure_level(T.z))
+ to_chat(usr, "Unable to establish a connection: You're too far away from the station!")
+ return 1
+
+ if(href_list["PRG_login"])
+ if(!ishuman(usr))
+ to_chat(usr, "Access denied.")
+ return
+
+ var/list/access = usr.get_access()
+ if(access_heads in access)
+ authenticated = COMM_AUTHENTICATION_MIN
+
+ if(access_captain in access)
+ authenticated = COMM_AUTHENTICATION_MAX
+ var/mob/living/carbon/human/H = usr
+ var/obj/item/weapon/card/id = H.get_idcard(TRUE)
+ if(istype(id))
+ crew_announcement.announcer = GetNameAndAssignmentFromId(id)
+
+ nanomanager.update_uis(src)
+ return 1
+
+ if(href_list["PRG_logout"])
+ authenticated = COMM_AUTHENTICATION_NONE
+ crew_announcement.announcer = ""
+ setMenuState(usr, COMM_SCREEN_MAIN)
+ nanomanager.update_uis(src)
+ return 1
+
+ if(is_authenticated(usr))
+ switch(href_list["PRG_operation"])
+ if("main")
+ setMenuState(usr, COMM_SCREEN_MAIN)
+
+ if("changeseclevel")
+ setMenuState(usr,COMM_SCREEN_SECLEVEL)
+
+ if("newalertlevel")
+ if(isAI(usr) || isrobot(usr))
+ to_chat(usr, "Firewalls prevent you from changing the alert level.")
+ return 1
+ else if(usr.can_admin_interact())
+ change_security_level(usr, text2num(href_list["level"]))
+ return 1
+ else if(!ishuman(usr))
+ to_chat(usr, "Security measures prevent you from changing the alert level.")
+ return 1
+
+ var/mob/living/carbon/human/L = usr
+ var/obj/item/card = L.get_active_hand()
+ var/obj/item/weapon/card/id/I = (card && card.GetID()) || L.wear_id || L.wear_pda
+ if(istype(I, /obj/item/device/pda))
+ var/obj/item/device/pda/pda = I
+ I = pda.id
+ if(I && istype(I))
+ if(access_captain in I.access)
+ change_security_level(usr, text2num(href_list["level"]))
+ else
+ to_chat(usr, "You are not authorized to do this.")
+ setMenuState(usr, COMM_SCREEN_MAIN)
+ else
+ to_chat(usr, "You need to swipe your ID.")
+
+ if("announce")
+ if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)
+ if(message_cooldown)
+ to_chat(usr, "Please allow at least one minute to pass between announcements.")
+ nanomanager.update_uis(src)
+ return 1
+ var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement")
+ if(!input || message_cooldown || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
+ nanomanager.update_uis(src)
+ return 1
+ crew_announcement.Announce(input)
+ message_cooldown = 1
+ spawn(600)//One minute cooldown
+ message_cooldown = 0
+
+ if("callshuttle")
+ var/input = input(usr, "Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
+ if(!input || ..() || !is_authenticated(usr))
+ nanomanager.update_uis(src)
+ return 1
+
+ call_shuttle_proc(usr, input)
+ if(shuttle_master.emergency.timer)
+ post_status("shuttle")
+ setMenuState(usr, COMM_SCREEN_MAIN)
+
+ if("cancelshuttle")
+ if(isAI(usr) || isrobot(usr))
+ to_chat(usr, "Firewalls prevent you from recalling the shuttle.")
+ nanomanager.update_uis(src)
+ return 1
+ var/response = alert("Are you sure you wish to recall the shuttle?", "Confirm", "Yes", "No")
+ if(response == "Yes")
+ cancel_call_proc(usr)
+ if(shuttle_master.emergency.timer)
+ post_status("shuttle")
+ setMenuState(usr, COMM_SCREEN_MAIN)
+
+ if("messagelist")
+ currmsg = 0
+ if(href_list["msgid"])
+ setCurrentMessage(usr, text2num(href_list["msgid"]))
+ setMenuState(usr,COMM_SCREEN_MESSAGES)
+
+ if("delmessage")
+ if(href_list["msgid"])
+ currmsg = text2num(href_list["msgid"])
+ var/response = alert("Are you sure you wish to delete this message?", "Confirm", "Yes", "No")
+ if(response == "Yes")
+ if(currmsg)
+ var/id = getCurrentMessage()
+ var/title = messagetitle[id]
+ var/text = messagetext[id]
+ messagetitle.Remove(title)
+ messagetext.Remove(text)
+ if(currmsg == id)
+ currmsg = 0
+ if(aicurrmsg == id)
+ aicurrmsg = 0
+ setMenuState(usr,COMM_SCREEN_MESSAGES)
+
+ if("status")
+ setMenuState(usr,COMM_SCREEN_STAT)
+
+ // Status display stuff
+ if("setstat")
+ display_type=href_list["statdisp"]
+ switch(display_type)
+ if("message")
+ post_status("message", stat_msg1, stat_msg2, usr)
+ if("alert")
+ post_status("alert", href_list["alert"], user = usr)
+ else
+ post_status(href_list["statdisp"], user = usr)
+ setMenuState(usr, COMM_SCREEN_STAT)
+
+ if("setmsg1")
+ stat_msg1 = input("Line 1", "Enter Message Text", stat_msg1) as text|null
+ setMenuState(usr, COMM_SCREEN_STAT)
+
+ if("setmsg2")
+ stat_msg2 = input("Line 2", "Enter Message Text", stat_msg2) as text|null
+ setMenuState(usr, COMM_SCREEN_STAT)
+
+ if("nukerequest")
+ if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)
+ if(centcomm_message_cooldown)
+ to_chat(usr, "Arrays recycling. Please stand by.")
+ nanomanager.update_uis(src)
+ return 1
+ var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") as text|null
+ if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
+ nanomanager.update_uis(src)
+ return 1
+ Nuke_request(input, usr)
+ to_chat(usr, "Request sent.")
+ log_say("[key_name(usr)] has requested the nuclear codes from Centcomm")
+ priority_announcement.Announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/AI/commandreport.ogg')
+ centcomm_message_cooldown = 1
+ spawn(6000)//10 minute cooldown
+ centcomm_message_cooldown = 0
+ setMenuState(usr,COMM_SCREEN_MAIN)
+
+ if("MessageCentcomm")
+ if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)
+ if(centcomm_message_cooldown)
+ to_chat(usr, "Arrays recycling. Please stand by.")
+ nanomanager.update_uis(src)
+ return 1
+ var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null
+ if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
+ nanomanager.update_uis(src)
+ return 1
+ Centcomm_announce(input, usr)
+ to_chat(usr, "Message transmitted.")
+ log_say("[key_name(usr)] has made a Centcomm announcement: [input]")
+ centcomm_message_cooldown = 1
+ spawn(6000)//10 minute cooldown
+ centcomm_message_cooldown = 0
+ setMenuState(usr,COMM_SCREEN_MAIN)
+
+ // OMG SYNDICATE ...LETTERHEAD
+ if("MessageSyndicate")
+ if((is_authenticated(usr) == COMM_AUTHENTICATION_MAX) && (computer && computer.emagged))
+ if(centcomm_message_cooldown)
+ to_chat(usr, "Arrays recycling. Please stand by.")
+ nanomanager.update_uis(src)
+ return 1
+ var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null
+ if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
+ nanomanager.update_uis(src)
+ return 1
+ Syndicate_announce(input, usr)
+ to_chat(usr, "Message transmitted.")
+ log_say("[key_name(usr)] has made a Syndicate announcement: [input]")
+ centcomm_message_cooldown = 1
+ spawn(6000)//10 minute cooldown
+ centcomm_message_cooldown = 0
+ setMenuState(usr,COMM_SCREEN_MAIN)
+
+ if("RestartNanoMob")
+ if(mob_hunt_server)
+ if(mob_hunt_server.manual_reboot())
+ var/loading_msg = pick("Respawning spawns", "Reticulating splines", "Flipping hat",
+ "Capturing all of them", "Fixing minor text issues", "Being the very best",
+ "Nerfing this", "Not communicating with playerbase", "Coding a ripoff in a 2D spaceman game")
+ to_chat(usr, "Restarting Nano-Mob Hunter GO! game server. [loading_msg]...")
+ else
+ to_chat(usr, "Nano-Mob Hunter GO! game server reboot failed due to recent restart. Please wait before re-attempting.")
+ else
+ to_chat(usr, "Nano-Mob Hunter GO! game server is offline for extended maintenance. Contact your Central Command administrators for more info if desired.")
+
+ if("AcceptDocking")
+ to_chat(usr, "Docking request accepted!")
+ trade_dock_timelimit = world.time + 1200
+ trade_dockrequest_timelimit = 0
+ event_announcement.Announce("Docking request for trading ship approved, please dock at port bay 4.", "Docking Request")
+ if("DenyDocking")
+ to_chat(usr, "Docking requeset denied!")
+ trade_dock_timelimit = 0
+ trade_dockrequest_timelimit = 0
+ event_announcement.Announce("Docking request for trading ship denied.", "Docking request")
+
+ nanomanager.update_uis(src)
+ return 1
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/engineering/alarm.dm b/code/modules/modular_computers/file_system/programs/engineering/alarm.dm
new file mode 100644
index 00000000000..db5966314da
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/engineering/alarm.dm
@@ -0,0 +1,72 @@
+/datum/computer_file/program/alarm_monitor
+ filename = "alarmmonitor"
+ filedesc = "Alarm Monitoring"
+ ui_header = "alarm_green.gif"
+ program_icon_state = "alert-green"
+ extended_desc = "This program provides visual interface for station's alarm system."
+ requires_ntnet = 1
+ network_destination = "alarm monitoring network"
+ size = 5
+ var/list/datum/alarm_handler/alarm_handlers
+
+/datum/computer_file/program/alarm_monitor/New()
+ ..()
+ alarm_handlers = list(atmosphere_alarm, fire_alarm, power_alarm)
+ for(var/datum/alarm_handler/AH in alarm_handlers)
+ AH.register(src, /datum/computer_file/program/alarm_monitor/proc/update_icon)
+
+/datum/computer_file/program/alarm_monitor/Destroy()
+ ..()
+ for(var/datum/alarm_handler/AH in alarm_handlers)
+ AH.unregister(src)
+ qdel(alarm_handlers)
+ alarm_handlers = null
+
+/datum/computer_file/program/alarm_monitor/proc/update_icon()
+ for(var/datum/alarm_handler/AH in alarm_handlers)
+ if(AH.has_major_alarms())
+ program_icon_state = "alert-red"
+ ui_header = "alarm_red.gif"
+ update_computer_icon()
+ return 1
+ program_icon_state = "alert-green"
+ ui_header = "alarm_green.gif"
+ update_computer_icon()
+ return 0
+
+/datum/computer_file/program/alarm_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
+ assets.send(user)
+ ui = new(user, src, ui_key, "alarm_monitor.tmpl", "Alarm Monitoring", 575, 700)
+ ui.set_auto_update(1)
+ ui.set_layout_key("program")
+ ui.open()
+
+/datum/computer_file/program/alarm_monitor/ui_data(mob/user)
+ var/list/data = get_header_data()
+
+ var/categories[0]
+ for(var/datum/alarm_handler/AH in alarm_handlers)
+ categories[++categories.len] = list("category" = AH.category, "alarms" = list())
+ for(var/datum/alarm/A in AH.major_alarms())
+ var/cameras[0]
+ var/lost_sources[0]
+
+ if(isAI(user))
+ for(var/obj/machinery/camera/C in A.cameras())
+ cameras[++cameras.len] = C.nano_structure()
+ for(var/datum/alarm_source/AS in A.sources)
+ if(!AS.source)
+ lost_sources[++lost_sources.len] = AS.source_name
+
+ categories[categories.len]["alarms"] += list(list(
+ "name" = sanitize(A.alarm_name()),
+ "origin_lost" = A.origin == null,
+ "has_cameras" = cameras.len,
+ "cameras" = cameras,
+ "lost_sources" = lost_sources.len ? sanitize(english_list(lost_sources, nothing_text = "", and_text = ", ")) : ""))
+ data["categories"] = categories
+
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm
new file mode 100644
index 00000000000..dca2fabd499
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm
@@ -0,0 +1,48 @@
+/datum/computer_file/program/power_monitor
+ filename = "powermonitor"
+ filedesc = "Power Monitoring"
+ program_icon_state = "power_monitor"
+ extended_desc = "This program connects to sensors around the station to provide information about electrical systems"
+ ui_header = "power_norm.gif"
+ transfer_access = access_engine
+ usage_flags = PROGRAM_CONSOLE
+ requires_ntnet = 0
+ network_destination = "power monitoring system"
+ size = 9
+ var/obj/structure/cable/attached
+
+/datum/computer_file/program/power_monitor/run_program(mob/living/user)
+ . = ..(user)
+ search()
+
+/datum/computer_file/program/power_monitor/process_tick()
+ if(!attached)
+ search()
+
+/datum/computer_file/program/power_monitor/proc/search()
+ var/turf/T = get_turf(computer)
+ attached = locate() in T
+
+/datum/computer_file/program/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
+ assets.send(user)
+ ui = new(user, src, ui_key, "power_monitor.tmpl", "Alarm Monitoring", 800, 700)
+ ui.set_auto_update(1)
+ ui.set_layout_key("program")
+ ui.open()
+
+/datum/computer_file/program/power_monitor/ui_data()
+ var/list/data = get_header_data()
+
+ data["powermonitor"] = attached ? TRUE : FALSE
+
+ if(attached)
+ var/datum/powernet/powernet = attached.get_powernet()
+ data["poweravail"] = powernet.avail
+ data["powerload"] = powernet.viewload
+ data["powerdemand"] = powernet.load
+ data["apcs"] = apc_repository.apc_data(powernet)
+
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/generic/configurator.dm b/code/modules/modular_computers/file_system/programs/generic/configurator.dm
new file mode 100644
index 00000000000..0630d1a129a
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/generic/configurator.dm
@@ -0,0 +1,68 @@
+// This is special hardware configuration program.
+// It is to be used only with modular computers.
+// It allows you to toggle components of your device.
+
+/datum/computer_file/program/computerconfig
+ filename = "compconfig"
+ filedesc = "Computer Configuration Tool"
+ extended_desc = "This program allows configuration of computer's hardware"
+ program_icon_state = "generic"
+ unsendable = 1
+ undeletable = 1
+ size = 4
+ available_on_ntnet = 0
+ requires_ntnet = 0
+
+
+/datum/computer_file/program/computerconfig/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
+ assets.send(user)
+ ui = new(user, src, ui_key, "laptop_configuration.tmpl", "NTOS Configuration Utility", 575, 700)
+ ui.set_auto_update(1)
+ ui.set_layout_key("program")
+ ui.open()
+
+/datum/computer_file/program/computerconfig/ui_data(mob/user)
+ var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
+ var/obj/item/weapon/computer_hardware/battery/battery_module = computer.all_components[MC_CELL]
+
+ var/list/data = get_header_data()
+
+ data["disk_size"] = hard_drive.max_capacity
+ data["disk_used"] = hard_drive.used_capacity
+ data["power_usage"] = computer.last_power_usage
+ data["battery_exists"] = battery_module ? 1 : 0
+ if(battery_module && battery_module.battery)
+ data["battery_rating"] = battery_module.battery.maxcharge
+ data["battery_percent"] = round(battery_module.battery.percent())
+ data["eta"] = computer.get_power_eta()
+
+ if(battery_module && battery_module.battery)
+ data["battery"] = list("max" = battery_module.battery.maxcharge, "charge" = round(battery_module.battery.charge))
+
+ var/list/all_entries[0]
+ for(var/I in computer.all_components)
+ var/obj/item/weapon/computer_hardware/H = computer.all_components[I]
+ all_entries.Add(list(list(
+ "name" = H.name,
+ "desc" = H.desc,
+ "enabled" = H.enabled,
+ "critical" = H.critical,
+ "powerusage" = H.power_usage
+ )))
+
+ data["hardware"] = all_entries
+ return data
+
+
+/datum/computer_file/program/computerconfig/Topic(href, list/href_list)
+ if(..())
+ return
+ switch(href_list["action"])
+ if("PC_toggle_component")
+ var/obj/item/weapon/computer_hardware/H = computer.find_hardware_by_name(href_list["name"])
+ if(H && istype(H))
+ H.enabled = !H.enabled
+ . = TRUE
diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
new file mode 100644
index 00000000000..20c4e92fd98
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
@@ -0,0 +1,195 @@
+/datum/computer_file/program/filemanager
+ filename = "filemanager"
+ filedesc = "NTOS File Manager"
+ extended_desc = "This program allows management of files."
+ program_icon_state = "generic"
+ size = 8
+ requires_ntnet = 0
+ available_on_ntnet = 0
+ undeletable = 1
+ var/open_file
+ var/error
+
+/datum/computer_file/program/filemanager/proc/prepare_printjob(t, font = PRINTER_FONT) // Additional stuff to parse if we want to print it and make a happy Head of Personnel. Forms FTW.
+ t = replacetext(t, "\[field\]", "")
+ t = replacetext(t, "\[sign\]", "")
+ t = pencode_to_html(t, sign = 0, fields = 0, deffont = font)
+ return t
+
+/datum/computer_file/program/filemanager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
+ assets.send(user)
+ ui = new(user, src, ui_key, "file_manager.tmpl", "NTOS File Manager", 575, 700)
+ ui.set_auto_update(1)
+ ui.set_layout_key("program")
+ ui.open()
+
+/datum/computer_file/program/filemanager/ui_data(mob/user)
+ var/list/data = get_header_data()
+
+ var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.all_components[MC_HDD]
+ var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.all_components[MC_SDD]
+ if(error)
+ data["error"] = error
+ if(open_file)
+ var/datum/computer_file/data/file
+
+ if(!computer || !HDD)
+ data["error"] = "I/O ERROR: Unable to access hard drive."
+ else
+ file = HDD.find_file_by_name(open_file)
+ if(!istype(file))
+ data["error"] = "I/O ERROR: Unable to open file."
+ else
+ data["filedata"] = pencode_to_html(file.stored_data, sign = 0, fields = 0)
+ data["filename"] = "[file.filename].[file.filetype]"
+ else
+ if(!computer || !HDD)
+ data["error"] = "I/O ERROR: Unable to access hard drive."
+ else
+ var/list/files[0]
+ for(var/datum/computer_file/F in HDD.stored_files)
+ files.Add(list(list(
+ "name" = F.filename,
+ "type" = F.filetype,
+ "size" = F.size,
+ "undeletable" = F.undeletable
+ )))
+ data["files"] = files
+ if(RHDD)
+ data["usbconnected"] = 1
+ var/list/usbfiles[0]
+ for(var/datum/computer_file/F in RHDD.stored_files)
+ usbfiles.Add(list(list(
+ "name" = F.filename,
+ "type" = F.filetype,
+ "size" = F.size,
+ "undeletable" = F.undeletable
+ )))
+ data["usbfiles"] = usbfiles
+
+ return data
+
+/datum/computer_file/program/filemanager/Topic(href, list/href_list)
+ if(..())
+ return 1
+
+ var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.all_components[MC_HDD]
+ var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.all_components[MC_SDD]
+ var/obj/item/weapon/computer_hardware/printer/printer = computer.all_components[MC_PRINT]
+
+ switch(href_list["action"])
+ if("PRG_openfile")
+ . = 1
+ open_file = href_list["name"]
+ if("PRG_newtextfile")
+ . = 1
+ var/newname = stripped_input(usr, "Enter file name or leave blank to cancel:", "File rename", max_length=50)
+ if(!newname)
+ return 1
+ if(!HDD)
+ return 1
+ var/datum/computer_file/data/F = new/datum/computer_file/data()
+ F.filename = newname
+ F.filetype = "TXT"
+ HDD.store_file(F)
+ if("PRG_deletefile")
+ . = 1
+ if(!HDD)
+ return 1
+ var/datum/computer_file/file = HDD.find_file_by_name(href_list["name"])
+ if(!file || file.undeletable)
+ return 1
+ HDD.remove_file(file)
+ if("PRG_usbdeletefile")
+ . = 1
+ if(!RHDD)
+ return 1
+ var/datum/computer_file/file = RHDD.find_file_by_name(href_list["name"])
+ if(!file || file.undeletable)
+ return 1
+ RHDD.remove_file(file)
+ if("PRG_closefile")
+ . = 1
+ open_file = null
+ error = null
+ if("PRG_clone")
+ . = 1
+ if(!HDD)
+ return 1
+ var/datum/computer_file/F = HDD.find_file_by_name(href_list["name"])
+ if(!F || !istype(F))
+ return 1
+ var/datum/computer_file/C = F.clone(1)
+ HDD.store_file(C)
+ if("PRG_rename")
+ . = 1
+ if(!HDD)
+ return 1
+ var/datum/computer_file/file = HDD.find_file_by_name(href_list["name"])
+ if(!file || !istype(file))
+ return 1
+ var/newname = stripped_input(usr, "Enter new file name:", "File rename", file.filename, max_length=50)
+ if(file && newname)
+ file.filename = newname
+ if("PRG_edit")
+ . = 1
+ if(!open_file)
+ return 1
+ if(!HDD)
+ return 1
+ var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
+ if(!F || !istype(F))
+ return 1
+ if(F.do_not_edit && (alert("WARNING: This file is not compatible with editor. Editing it may result in permanently corrupted formatting or damaged data consistency. Edit anyway?", "Incompatible File", "No", "Yes") == "No"))
+ return 1
+ // 16384 is the limit for file length in characters. Currently, papers have value of 2048 so this is 8 times as long, since we can't edit parts of the file independently.
+ var/newtext = stripped_multiline_input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", html_decode(F.stored_data), 16384, TRUE)
+ if(!newtext)
+ return
+ if(F)
+ var/datum/computer_file/data/backup = F.clone()
+ HDD.remove_file(F)
+ F.stored_data = newtext
+ F.calculate_size()
+ // We can't store the updated file, it's probably too large. Print an error and restore backed up version.
+ // This is mostly intended to prevent people from losing texts they spent lot of time working on due to running out of space.
+ // They will be able to copy-paste the text from error screen and store it in notepad or something.
+ if(!HDD.store_file(F))
+ error = "I/O error: Unable to overwrite file. Hard drive is probably full. You may want to backup your changes before closing this window:[F.stored_data]
" + HDD.store_file(backup) + if("PRG_printfile") + . = 1 + if(!open_file) + return 1 + if(!HDD) + return 1 + var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) + if(!F || !istype(F)) + return 1 + if(!printer) + error = "Missing Hardware: Your computer does not have required hardware to complete this operation." + return 1 + if(!printer.print_text(prepare_printjob(F.stored_data, computer.emagged ? CRAYON_FONT : PRINTER_FONT), open_file)) + error = "Hardware error: Printer was unable to print the file. It may be out of paper." + return 1 + if("PRG_copytousb") + . = 1 + if(!HDD || !RHDD) + return 1 + var/datum/computer_file/F = HDD.find_file_by_name(href_list["name"]) + if(!F || !istype(F)) + return 1 + var/datum/computer_file/C = F.clone(0) + RHDD.store_file(C) + if("PRG_copyfromusb") + . = 1 + if(!HDD || !RHDD) + return 1 + var/datum/computer_file/F = RHDD.find_file_by_name(href_list["name"]) + if(!F || !istype(F)) + return 1 + var/datum/computer_file/C = F.clone(0) + HDD.store_file(C) \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm new file mode 100644 index 00000000000..1ce9fb38bd1 --- /dev/null +++ b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm @@ -0,0 +1,178 @@ +/datum/computer_file/program/ntnetdownload + filename = "ntndownloader" + filedesc = "NTNet Software Download Tool" + program_icon_state = "generic" + extended_desc = "This program allows downloads of software from official NT repositories" + unsendable = 1 + undeletable = 1 + size = 4 + requires_ntnet = 1 + requires_ntnet_feature = NTNET_SOFTWAREDOWNLOAD + available_on_ntnet = 0 + ui_header = "downloader_finished.gif" + var/datum/computer_file/program/downloaded_file = null + var/hacked_download = 0 + var/download_completion = 0 //GQ of downloaded data. + var/download_netspeed = 0 + var/downloaderror = "" + var/obj/item/device/modular_computer/my_computer = null + +/datum/computer_file/program/ntnetdownload/proc/begin_file_download(filename) + if(downloaded_file) + return 0 + + var/datum/computer_file/program/PRG = ntnet_global.find_ntnet_file_by_name(filename) + + if(!PRG || !istype(PRG)) + return 0 + + // Attempting to download antag only program, but without having emagged computer. No. + if(PRG.available_on_syndinet && !computer.emagged) + return 0 + + var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] + + if(!computer || !hard_drive || !hard_drive.can_store_file(PRG)) + return 0 + + ui_header = "downloader_running.gif" + + if(PRG in ntnet_global.available_station_software) + generate_network_log("Began downloading file [PRG.filename].[PRG.filetype] from NTNet Software Repository.") + hacked_download = 0 + else if(PRG in ntnet_global.available_antag_software) + generate_network_log("Began downloading file **ENCRYPTED**.[PRG.filetype] from unspecified server.") + hacked_download = 1 + else + generate_network_log("Began downloading file [PRG.filename].[PRG.filetype] from unspecified server.") + hacked_download = 0 + + downloaded_file = PRG.clone() + +/datum/computer_file/program/ntnetdownload/proc/abort_file_download() + if(!downloaded_file) + return + generate_network_log("Aborted download of file [hacked_download ? "**ENCRYPTED**" : "[downloaded_file.filename].[downloaded_file.filetype]"].") + downloaded_file = null + download_completion = 0 + ui_header = "downloader_finished.gif" + +/datum/computer_file/program/ntnetdownload/proc/complete_file_download() + if(!downloaded_file) + return + generate_network_log("Completed download of file [hacked_download ? "**ENCRYPTED**" : "[downloaded_file.filename].[downloaded_file.filetype]"].") + var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] + if(!computer || !hard_drive || !hard_drive.store_file(downloaded_file)) + // The download failed + downloaderror = "I/O ERROR - Unable to save file. Check whether you have enough free space on your hard drive and whether your hard drive is properly connected. If the issue persists contact your system administrator for assistance." + downloaded_file = null + download_completion = 0 + ui_header = "downloader_finished.gif" + +/datum/computer_file/program/ntnetdownload/process_tick() + if(!downloaded_file) + return + if(download_completion >= downloaded_file.size) + complete_file_download() + // Download speed according to connectivity state. NTNet server is assumed to be on unlimited speed so we're limited by our local connectivity + download_netspeed = 0 + // Speed defines are found in misc.dm + switch(ntnet_status) + if(1) + download_netspeed = NTNETSPEED_LOWSIGNAL + if(2) + download_netspeed = NTNETSPEED_HIGHSIGNAL + if(3) + download_netspeed = NTNETSPEED_ETHERNET + download_completion += download_netspeed + +/datum/computer_file/program/ntnetdownload/Topic(href, list/href_list) + if(..()) + return 1 + switch(href_list["action"]) + if("PRG_downloadfile") + if(!downloaded_file) + begin_file_download(href_list["filename"]) + return 1 + if("PRG_reseterror") + if(downloaderror) + download_completion = 0 + download_netspeed = 0 + downloaded_file = null + downloaderror = "" + return 1 + return 0 + +/datum/computer_file/program/ntnetdownload/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) + assets.send(user) + ui = new(user, src, ui_key, "ntnet_downloader.tmpl", "NTNet Download Program", 575, 700) + ui.set_auto_update(1) + ui.set_layout_key("program") + ui.open() + +/datum/computer_file/program/ntnetdownload/ui_data(mob/user) + my_computer = computer + + if(!istype(my_computer)) + return + + var/list/data = get_header_data() + + // This IF cuts on data transferred to client, so i guess it's worth it. + if(downloaderror) // Download errored. Wait until user resets the program. + data["error"] = downloaderror + else if(downloaded_file) // Download running. Wait please.. + data["downloadname"] = downloaded_file.filename + data["downloaddesc"] = downloaded_file.filedesc + data["downloadsize"] = downloaded_file.size + data["downloadspeed"] = download_netspeed + data["downloadcompletion"] = round(min(download_completion, downloaded_file.size), 0.1) + else // No download running, pick file. + var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = my_computer.all_components[MC_HDD] + data["disk_size"] = hard_drive.max_capacity + data["disk_used"] = hard_drive.used_capacity + var/list/all_entries[0] + for(var/A in ntnet_global.available_station_software) + var/datum/computer_file/program/P = A + // Only those programs our user can run will show in the list + if(!P.can_run(user,transfer = 1)) + continue + all_entries.Add(list(list( + "filename" = P.filename, + "filedesc" = P.filedesc, + "fileinfo" = P.extended_desc, + "compatibility" = check_compatibility(P), + "size" = P.size, + "status" = !hard_drive || !hard_drive.can_store_file(P) ? "disabled" : null + ))) + data["hackedavailable"] = 0 + if(computer.emagged) // If we are running on emagged computer we have access to some "bonus" software + var/list/hacked_programs[0] + for(var/S in ntnet_global.available_antag_software) + var/datum/computer_file/program/P = S + data["hackedavailable"] = 1 + hacked_programs.Add(list(list( + "filename" = P.filename, + "filedesc" = P.filedesc, + "fileinfo" = P.extended_desc, + "size" = P.size + ))) + data["hacked_programs"] = hacked_programs + + data["downloadable_programs"] = all_entries + + return data + +/datum/computer_file/program/ntnetdownload/proc/check_compatibility(datum/computer_file/program/P) + var/hardflag = computer.hardware_flag + + if(P && P.is_supported_by_hardware(hardflag,0)) + return "Compatible" + return "Incompatible!" + +/datum/computer_file/program/ntnetdownload/kill_program(forced) + abort_file_download() + return ..(forced) \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm new file mode 100644 index 00000000000..bfb90ab881b --- /dev/null +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -0,0 +1,231 @@ +/datum/computer_file/program/chatclient + filename = "ntnrc_client" + filedesc = "NTNet Relay Chat Client" + program_icon_state = "command" + extended_desc = "This program allows communication over NTNRC network" + size = 8 + requires_ntnet = 1 + requires_ntnet_feature = NTNET_COMMUNICATION + network_destination = "NTNRC server" + ui_header = "ntnrc_idle.gif" + available_on_ntnet = 1 + var/last_message = null // Used to generate the toolbar icon + var/username + var/datum/ntnet_conversation/channel = null + var/operator_mode = 0 // Channel operator mode + var/netadmin_mode = 0 // Administrator mode (invisible to other users + bypasses passwords) + +/datum/computer_file/program/chatclient/New() + ..() + username = "DefaultUser[rand(100, 999)]" + +/datum/computer_file/program/chatclient/process_tick() + ..() + if(program_state != PROGRAM_STATE_KILLED) + ui_header = "ntnrc_idle.gif" + if(channel) + // Remember the last message. If there is no message in the channel remember null. + last_message = channel.messages.len ? channel.messages[channel.messages.len - 1] : null + else + last_message = null + return 1 + if(channel && channel.messages && channel.messages.len) + ui_header = last_message == channel.messages[channel.messages.len - 1] ? "ntnrc_idle.gif" : "ntnrc_new.gif" + else + ui_header = "ntnrc_idle.gif" + +/datum/computer_file/program/chatclient/kill_program(forced = FALSE) + if(channel) + channel.remove_client(src) + channel = null + ..() + +/datum/computer_file/program/chatclient/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) + assets.send(user) + ui = new(user, src, ui_key, "ntnet_chat.tmpl", "NTNet Relay Chat Client", 575, 700) + ui.set_auto_update(1) + ui.set_layout_key("program") + ui.open() + + +/datum/computer_file/program/chatclient/ui_data(mob/user) + if(!ntnet_global || !ntnet_global.chat_channels) + return + + var/list/data = get_header_data() + + data["adminmode"] = netadmin_mode + if(channel) + data["title"] = channel.title + var/list/messages[0] + for(var/M in channel.messages) + messages.Add(list(list( + "msg" = M + ))) + data["messages"] = messages + var/list/clients[0] + for(var/C in channel.clients) + var/datum/computer_file/program/chatclient/cl = C + clients.Add(list(list( + "name" = cl.username + ))) + data["clients"] = clients + operator_mode = (channel.operator == src) ? 1 : 0 + data["is_operator"] = operator_mode || netadmin_mode + + else // Channel selection screen + var/list/all_channels[0] + for(var/C in ntnet_global.chat_channels) + var/datum/ntnet_conversation/conv = C + if(conv && conv.title) + all_channels.Add(list(list( + "chan" = conv.title, + "id" = conv.id + ))) + data["all_channels"] = all_channels + + return data + +/datum/computer_file/program/chatclient/Topic(href, list/href_list) + if(..()) + return 1 + + switch(href_list["action"]) + if("PRG_speak") + . = 1 + if(!channel) + return 1 + var/mob/living/user = usr + var/message = reject_bad_text(input(user, "Enter message or leave blank to cancel: ")) + if(!message || !channel) + return + channel.add_message(message, username) + log_chat("[user]/([user.ckey]) as [username] sent to [channel.title]: [message]") + + if("PRG_joinchannel") + . = 1 + var/datum/ntnet_conversation/C + for(var/datum/ntnet_conversation/chan in ntnet_global.chat_channels) + if(chan.id == text2num(href_list["id"])) + C = chan + break + + if(!C) + return 1 + + if(netadmin_mode) + channel = C // Bypasses normal leave/join and passwords. Technically makes the user invisible to others. + return 1 + + if(C.password) + var/mob/living/user = usr + var/password = reject_bad_text(input(user,"Access Denied. Enter password:")) + if(C && (password == C.password)) + C.add_client(src) + channel = C + return 1 + C.add_client(src) + channel = C + if("PRG_leavechannel") + . = 1 + if(channel) + channel.remove_client(src) + channel = null + if("PRG_newchannel") + . = 1 + var/mob/living/user = usr + var/channel_title = reject_bad_text(input(user,"Enter channel name or leave blank to cancel:")) + if(!channel_title) + return 1 + var/datum/ntnet_conversation/C = new/datum/ntnet_conversation() + C.add_client(src) + C.operator = src + channel = C + C.title = channel_title + if("PRG_toggleadmin") + . = 1 + if(netadmin_mode) + netadmin_mode = 0 + if(channel) + channel.remove_client(src) // We shouldn't be in channel's user list, but just in case... + channel = null + return 1 + var/mob/living/user = usr + if(can_run(user, 1, access_network)) + if(channel) + var/response = alert(user, "Really engage admin-mode? You will be disconnected from your current channel!", "NTNRC Admin mode", "Yes", "No") + if(response == "Yes") + if(channel) + channel.remove_client(src) + channel = null + else + return 1 + netadmin_mode = 1 + if("PRG_changename") + . = 1 + var/mob/living/user = usr + var/newname = sanitize(input(user,"Enter new nickname or leave blank to cancel:")) + if(!newname) + return 1 + if(channel) + channel.add_status_message("[username] is now known as [newname].") + username = newname + + if("PRG_savelog") + . = 1 + if(!channel) + return 1 + var/mob/living/user = usr + var/logname = input(user,"Enter desired logfile name (.log) or leave blank to cancel:") + if(!logname || !channel) + return 1 + var/datum/computer_file/data/logfile = new/datum/computer_file/data/logfile() + // Now we will generate HTML-compliant file that can actually be viewed/printed. + logfile.filename = logname + logfile.stored_data = "\[b\]Logfile dump from NTNRC channel [channel.title]\[/b\]\[BR\]" + for(var/logstring in channel.messages) + logfile.stored_data += "[logstring]\[BR\]" + logfile.stored_data += "\[b\]Logfile dump completed.\[/b\]" + logfile.calculate_size() + var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] + if(!computer || !hard_drive || !hard_drive.store_file(logfile)) + if(!computer) + // This program shouldn't even be runnable without computer. + CRASH("Var computer is null!") + return 1 + if(!hard_drive) + computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.") + else // In 99.9% cases this will mean our HDD is full + computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.") + if("PRG_renamechannel") + . = 1 + if(!operator_mode || !channel) + return 1 + var/mob/living/user = usr + var/newname = reject_bad_text(input(user, "Enter new channel name or leave blank to cancel:")) + if(!newname || !channel) + return 1 + channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.") + channel.title = newname + if("PRG_deletechannel") + . = 1 + if(channel && ((channel.operator == src) || netadmin_mode)) + qdel(channel) + channel = null + if("PRG_setpassword") + . = 1 + if(!channel || ((channel.operator != src) && !netadmin_mode)) + return 1 + + var/mob/living/user = usr + var/newpassword = sanitize(input(user, "Enter new password for this channel. Leave blank to cancel, enter 'nopassword' to remove password completely:")) + if(!channel || !newpassword || ((channel.operator != src) && !netadmin_mode)) + return 1 + + if(newpassword == "nopassword") + channel.password = "" + else + channel.password = newpassword \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm new file mode 100644 index 00000000000..1ddabcd1151 --- /dev/null +++ b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm @@ -0,0 +1,195 @@ +var/global/nttransfer_uid = 0 + +/datum/computer_file/program/nttransfer + filename = "nttransfer" + filedesc = "NTNet P2P Transfer Client" + extended_desc = "This program allows for simple file transfer via direct peer to peer connection." + program_icon_state = "comm_logs" + size = 7 + requires_ntnet = 1 + requires_ntnet_feature = NTNET_PEERTOPEER + network_destination = "other device via P2P tunnel" + available_on_ntnet = 1 + + var/error = "" // Error screen + var/server_password = "" // Optional password to download the file. + var/datum/computer_file/provided_file = null // File which is provided to clients. + var/datum/computer_file/downloaded_file = null // File which is being downloaded + var/list/connected_clients = list() // List of connected clients. + var/datum/computer_file/program/nttransfer/remote // Client var, specifies who are we downloading from. + var/download_completion = 0 // Download progress in GQ + var/download_netspeed = 0 // Our connectivity speed in GQ/s + var/actual_netspeed = 0 // Displayed in the UI, this is the actual transfer speed. + var/unique_token // UID of this program + var/upload_menu = 0 // Whether we show the program list and upload menu + +/datum/computer_file/program/nttransfer/New() + unique_token = nttransfer_uid + nttransfer_uid++ + ..() + +/datum/computer_file/program/nttransfer/process_tick() + // Server mode + update_netspeed() + if(provided_file) + for(var/datum/computer_file/program/nttransfer/C in connected_clients) + // Transfer speed is limited by device which uses slower connectivity. + // We can have multiple clients downloading at same time, but let's assume we use some sort of multicast transfer + // so they can all run on same speed. + C.actual_netspeed = min(C.download_netspeed, download_netspeed) + C.download_completion += C.actual_netspeed + if(C.download_completion >= provided_file.size) + C.finish_download() + else if(downloaded_file) // Client mode + if(!remote) + crash_download("Connection to remote server lost") + +/datum/computer_file/program/nttransfer/kill_program(forced = FALSE) + if(downloaded_file) // Client mode, clean up variables for next use + finalize_download() + + if(provided_file) // Server mode, disconnect all clients + for(var/datum/computer_file/program/nttransfer/P in connected_clients) + P.crash_download("Connection terminated by remote server") + downloaded_file = null + ..(forced) + +/datum/computer_file/program/nttransfer/proc/update_netspeed() + download_netspeed = 0 + switch(ntnet_status) + if(1) + download_netspeed = NTNETSPEED_LOWSIGNAL + if(2) + download_netspeed = NTNETSPEED_HIGHSIGNAL + if(3) + download_netspeed = NTNETSPEED_ETHERNET + +// Finishes download and attempts to store the file on HDD +/datum/computer_file/program/nttransfer/proc/finish_download() + var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] + if(!computer || !hard_drive || !hard_drive.store_file(downloaded_file)) + error = "I/O Error: Unable to save file. Check your hard drive and try again." + finalize_download() + +// Crashes the download and displays specific error message +/datum/computer_file/program/nttransfer/proc/crash_download(var/message) + error = message ? message : "An unknown error has occurred during download" + finalize_download() + +// Cleans up variables for next use +/datum/computer_file/program/nttransfer/proc/finalize_download() + if(remote) + remote.connected_clients.Remove(src) + downloaded_file = null + remote = null + download_completion = 0 + + +/datum/computer_file/program/nttransfer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) + assets.send(user) + ui = new(user, src, ui_key, "ntnet_transfer.tmpl", "NTNet P2P Transfer Client", 575, 700) + ui.set_auto_update(1) + ui.set_layout_key("program") + ui.open() + +/datum/computer_file/program/nttransfer/Topic(href, list/href_list) + if(..()) + return 1 + switch(href_list["action"]) + if("PRG_downloadfile") + for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers) + if("[P.unique_token]" == href_list["id"]) + remote = P + break + if(!remote || !remote.provided_file) + return + if(remote.server_password) + var/pass = reject_bad_text(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required")) + if(pass != remote.server_password) + error = "Incorrect Password" + return 1 + downloaded_file = remote.provided_file.clone() + remote.connected_clients.Add(src) + return 1 + if("PRG_reset") + error = "" + upload_menu = 0 + finalize_download() + if(src in ntnet_global.fileservers) + ntnet_global.fileservers.Remove(src) + for(var/datum/computer_file/program/nttransfer/T in connected_clients) + T.crash_download("Remote server has forcibly closed the connection") + provided_file = null + return 1 + if("PRG_setpassword") + var/pass = reject_bad_text(input(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none")) + if(!pass) + return + if(pass == "none") + server_password = "" + return + server_password = pass + return 1 + if("PRG_uploadfile") + var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] + for(var/datum/computer_file/F in hard_drive.stored_files) + if("[F.uid]" == href_list["id"]) + if(F.unsendable) + error = "I/O Error: File locked." + return + if(istype(F, /datum/computer_file/program)) + var/datum/computer_file/program/P = F + if(!P.can_run(usr,transfer = 1)) + error = "Access Error: Insufficient rights to upload file." + provided_file = F + ntnet_global.fileservers.Add(src) + return + error = "I/O Error: Unable to locate file on hard drive." + return 1 + if("PRG_uploadmenu") + upload_menu = 1 + + +/datum/computer_file/program/nttransfer/ui_data(mob/user) + + var/list/data = get_header_data() + + if(error) + data["error"] = error + else if(downloaded_file) + data["downloading"] = 1 + data["download_size"] = downloaded_file.size + data["download_progress"] = download_completion + data["download_netspeed"] = actual_netspeed + data["download_name"] = "[downloaded_file.filename].[downloaded_file.filetype]" + else if (provided_file) + data["uploading"] = 1 + data["upload_uid"] = unique_token + data["upload_clients"] = connected_clients.len + data["upload_haspassword"] = server_password ? 1 : 0 + data["upload_filename"] = "[provided_file.filename].[provided_file.filetype]" + else if (upload_menu) + var/list/all_files[0] + var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] + for(var/datum/computer_file/F in hard_drive.stored_files) + all_files.Add(list(list( + "uid" = F.uid, + "filename" = "[F.filename].[F.filetype]", + "size" = F.size + ))) + data["upload_filelist"] = all_files + else + var/list/all_servers[0] + for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers) + all_servers.Add(list(list( + "uid" = P.unique_token, + "filename" = "[P.provided_file.filename].[P.provided_file.filetype]", + "size" = P.provided_file.size, + "haspassword" = P.server_password ? 1 : 0 + ))) + data["servers"] = all_servers + + return data \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/research/airestorer.dm b/code/modules/modular_computers/file_system/programs/research/airestorer.dm new file mode 100644 index 00000000000..55bbcb3b2b2 --- /dev/null +++ b/code/modules/modular_computers/file_system/programs/research/airestorer.dm @@ -0,0 +1,137 @@ +/datum/computer_file/program/aidiag + filename = "aidiag" + filedesc = "AI Maintenance Utility" + program_icon_state = "generic" + extended_desc = "This program is capable of reconstructing damaged AI systems. Requires direct AI connection via intellicard slot." + size = 12 + requires_ntnet = 0 + usage_flags = PROGRAM_CONSOLE + transfer_access = access_heads + available_on_ntnet = 1 + var/restoring = FALSE + +/datum/computer_file/program/aidiag/proc/get_ai(cardcheck) + + var/obj/item/weapon/computer_hardware/ai_slot/ai_slot + + if(computer) + ai_slot = computer.all_components[MC_AI] + + if(computer && ai_slot && ai_slot.check_functionality()) + if(cardcheck == 1) + return ai_slot + if(ai_slot.enabled && ai_slot.stored_card) + if(cardcheck == 2) + return ai_slot.stored_card + if(locate(/mob/living/silicon/ai) in ai_slot.stored_card) + return locate(/mob/living/silicon/ai) in ai_slot.stored_card + + return null + +/datum/computer_file/program/aidiag/Topic(href, list/href_list) + if(..()) + return TRUE + + var/mob/living/silicon/ai/A = get_ai() + if(!A) + restoring = FALSE + + switch(href_list["action"]) + if("PRG_beginReconstruction") + if(A && A.health < 100) + restoring = TRUE + return TRUE + if("PRG_eject") + if(computer.all_components[MC_AI]) + var/obj/item/weapon/computer_hardware/ai_slot/ai_slot = computer.all_components[MC_AI] + if(ai_slot && ai_slot.stored_card) + ai_slot.try_eject(0,usr) + return TRUE + +/datum/computer_file/program/aidiag/process_tick() + ..() + if(!restoring) //Put the check here so we don't check for an ai all the time + return + var/obj/item/device/aicard/cardhold = get_ai(2) + + var/obj/item/weapon/computer_hardware/ai_slot/ai_slot = get_ai(1) + + + var/mob/living/silicon/ai/A = get_ai() + if(!A || !cardhold) + restoring = FALSE // If the AI was removed, stop the restoration sequence. + if(ai_slot) + ai_slot.locked = FALSE + return + + if(cardhold.flush) + ai_slot.locked = FALSE + restoring = FALSE + return + ai_slot.locked = TRUE + A.adjustOxyLoss(-1) + A.adjustFireLoss(-1) + A.adjustToxLoss(-1) + A.adjustBruteLoss(-1) + A.updatehealth() + if(A.health >= 0 && A.stat == DEAD) + A.stat = CONSCIOUS + A.lying = 0 + dead_mob_list -= A + living_mob_list += A + // Finished restoring + if(A.health >= 100) + ai_slot.locked = FALSE + restoring = FALSE + + return TRUE + + +/datum/computer_file/program/aidiag/ui_data(mob/user) + var/list/data = get_header_data() + var/mob/living/silicon/ai/AI + // A shortcut for getting the AI stored inside the computer. The program already does necessary checks. + AI = get_ai() + + var/obj/item/device/aicard/aicard = get_ai(2) + + if(!aicard) + data["nocard"] = TRUE + data["error"] = "Please insert an intelliCard." + else + if(!AI) + data["error"] = "No AI located" + else + var/obj/item/device/aicard/cardhold = AI.loc + if(cardhold.flush) + data["error"] = "Flush in progress" + else + data["name"] = AI.name + data["restoring"] = restoring + data["health"] = (AI.health + 100) / 2 + data["isDead"] = AI.stat == DEAD + + var/list/all_laws[0] + for(var/datum/ai_law/L in AI.laws.all_laws()) + all_laws.Add(list(list( + "index" = L.index, + "text" = L.law + ))) + + data["ai_laws"] = all_laws + + return data + +/datum/computer_file/program/aidiag/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) + assets.send(user) + ui = new(user, src, ui_key, "ai_restorer.tmpl", "Integrity Restorer", 600, 400) + ui.set_auto_update(1) + ui.set_layout_key("program") + ui.open() + +/datum/computer_file/program/aidiag/kill_program(forced) + restoring = FALSE + return ..(forced) \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm new file mode 100644 index 00000000000..e3809cdcc37 --- /dev/null +++ b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm @@ -0,0 +1,90 @@ +/datum/computer_file/program/ntnetmonitor + filename = "ntmonitor" + filedesc = "NTNet Diagnostics and Monitoring" + program_icon_state = "comm_monitor" + extended_desc = "This program monitors stationwide NTNet network, provides access to logging systems, and allows for configuration changes" + size = 12 + requires_ntnet = 1 + required_access = access_network //Network control is a more secure program. + available_on_ntnet = 1 + +/datum/computer_file/program/ntnetmonitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) + assets.send(user) + ui = new(user, src, ui_key, "ntnet_monitor.tmpl", "NTNet Diagnostics and Monitoring Tool", 575, 700) + ui.set_auto_update(1) + ui.set_layout_key("program") + ui.open() + +/datum/computer_file/program/ntnetmonitor/Topic(href, list/href_list) + if(..()) + return 1 + switch(href_list["action"]) + if("resetIDS") + . = 1 + if(ntnet_global) + ntnet_global.resetIDS() + return 1 + if("toggleIDS") + . = 1 + if(ntnet_global) + ntnet_global.toggleIDS() + return 1 + if("toggleWireless") + . = 1 + if(!ntnet_global) + return 1 + + // NTNet is disabled. Enabling can be done without user prompt + if(ntnet_global.setting_disabled) + ntnet_global.setting_disabled = 0 + return 1 + + // NTNet is enabled and user is about to shut it down. Let's ask them if they really want to do it, as wirelessly connected computers won't connect without NTNet being enabled (which may prevent people from turning it back on) + var/mob/user = usr + if(!user) + return 1 + var/response = alert(user, "Really disable NTNet wireless? If your computer is connected wirelessly you won't be able to turn it back on! This will affect all connected wireless devices.", "NTNet shutdown", "Yes", "No") + if(response == "Yes") + ntnet_global.setting_disabled = 1 + return 1 + if("purgelogs") + . = 1 + if(ntnet_global) + ntnet_global.purge_logs() + if("updatemaxlogs") + . = 1 + var/mob/user = usr + var/logcount = text2num(input(user,"Enter amount of logs to keep in memory ([MIN_NTNET_LOGS]-[MAX_NTNET_LOGS]):")) + if(ntnet_global) + ntnet_global.update_max_log_count(logcount) + if("toggle_function") + . = 1 + if(!ntnet_global) + return 1 + ntnet_global.toggle_function(text2num(href_list["id"])) + +/datum/computer_file/program/ntnetmonitor/ui_data(mob/user) + if(!ntnet_global) + return + var/list/data = get_header_data() + + data["ntnetstatus"] = ntnet_global.check_function() + data["ntnetrelays"] = ntnet_global.relays.len + data["idsstatus"] = ntnet_global.intrusion_detection_enabled + data["idsalarm"] = ntnet_global.intrusion_detection_alarm + + data["config_softwaredownload"] = ntnet_global.setting_softwaredownload + data["config_peertopeer"] = ntnet_global.setting_peertopeer + data["config_communication"] = ntnet_global.setting_communication + data["config_systemcontrol"] = ntnet_global.setting_systemcontrol + + data["ntnetlogs"] = list() + + for(var/i in ntnet_global.logs) + data["ntnetlogs"] += list(list("entry" = i)) + data["ntnetmaxlogs"] = ntnet_global.setting_maxlogcount + + return data \ No newline at end of file diff --git a/code/modules/modular_computers/hardware/CPU.dm b/code/modules/modular_computers/hardware/CPU.dm new file mode 100644 index 00000000000..614ad35da9d --- /dev/null +++ b/code/modules/modular_computers/hardware/CPU.dm @@ -0,0 +1,44 @@ +// 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 + name = "processor board" + desc = "A standard CPU board used in most computers. It can run up to three programs simultaneously." + icon_state = "cpuboard" + w_class = WEIGHT_CLASS_SMALL + power_usage = 50 + critical = 1 + malfunction_probability = 1 + origin_tech = "programming=3;engineering=2" + var/max_idle_programs = 2 // 2 idle, + 1 active = 3 as said in description. + device_type = MC_CPU + +/obj/item/weapon/computer_hardware/processor_unit/on_remove(obj/item/device/modular_computer/MC, mob/user) + MC.shutdown_computer() + +/obj/item/weapon/computer_hardware/processor_unit/small + name = "microprocessor" + desc = "A miniaturised CPU used in portable devices. It can run up to two programs simultaneously." + icon_state = "cpu" + w_class = WEIGHT_CLASS_TINY + power_usage = 25 + max_idle_programs = 1 + origin_tech = "programming=2;engineering=2" + +/obj/item/weapon/computer_hardware/processor_unit/photonic + name = "photonic processor board" + desc = "An advanced experimental CPU board that uses photonic core instead of regular circuitry. It can run up to five programs simultaneously, but uses a lot of power." + icon_state = "cpuboard_super" + w_class = WEIGHT_CLASS_SMALL + power_usage = 250 + max_idle_programs = 4 + origin_tech = "programming=5;engineering=4" + +/obj/item/weapon/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_super" + w_class = WEIGHT_CLASS_TINY + power_usage = 75 + max_idle_programs = 2 + origin_tech = "programming=4;engineering=3" \ No newline at end of file diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm new file mode 100644 index 00000000000..4f752fdac10 --- /dev/null +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -0,0 +1,110 @@ +/obj/item/weapon/computer_hardware + name = "hardware" + desc = "Unknown Hardware." + icon = 'icons/obj/module.dmi' + icon_state = "std_mod" + + w_class = WEIGHT_CLASS_TINY // w_class limits which devices can contain this component. + // 1: PDAs/Tablets, 2: Laptops, 3-4: Consoles only + var/obj/item/device/modular_computer/holder = null + // Computer that holds this hardware, if any. + + var/obj_integrity = 200 + var/max_integrity = 200 + + var/power_usage = 0 // If the hardware uses extra power, change this. + var/enabled = 1 // If the hardware is turned off set this to 0. + var/critical = 0 // Prevent disabling for important component, like the CPU. + var/can_install = 1 // Prevents direct installation of removable media. + var/damage = 0 // Current damage level + var/max_damage = 100 // Maximal damage level. + var/damage_malfunction = 20 // "Malfunction" threshold. When damage exceeds this value the hardware piece will semi-randomly fail and do !!FUN!! things + 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 + var/device_type + +/obj/item/weapon/computer_hardware/New(var/obj/L) + ..() + pixel_x = rand(-8, 8) + pixel_y = rand(-8, 8) + +/obj/item/weapon/computer_hardware/Destroy() + if(holder) + holder.uninstall_component(src) + return ..() + + +/obj/item/weapon/computer_hardware/attackby(obj/item/I, mob/living/user) + // Multitool. Runs diagnostics + if(istype(I, /obj/item/device/multitool)) + to_chat(user, "***** DIAGNOSTICS REPORT *****") + diagnostics(user) + to_chat(user, "******************************") + return 1 + + // Cable coil. Works as repair method, but will probably require multiple applications and more cable. + if(istype(I, /obj/item/stack/cable_coil)) + var/obj/item/stack/S = I + if(obj_integrity == max_integrity) + to_chat(user, "\The [src] doesn't seem to require repairs.") + return 1 + if(S.use(1)) + to_chat(user, "You patch up \the [src] with a bit of \the [I].") + obj_integrity = min(obj_integrity + 10, max_integrity) + return 1 + + if(try_insert(I, user)) + return 1 + + return ..() + +// Called on multitool click, prints diagnostic information to the user. +/obj/item/weapon/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"]") + +// Handles damage checks +/obj/item/weapon/computer_hardware/proc/check_functionality() + if(!enabled) // Disabled. + return FALSE + + if(damage > damage_failure) // Too damaged to work at all. + return FALSE + + if(damage > damage_malfunction) // Still working. Well, sometimes... + if(prob(malfunction_probability)) + return FALSE + + return TRUE // Good to go. + +// Handles damage checks +/obj/item/weapon/computer_hardware/proc/take_damage(damage_amount) + obj_integrity = max(obj_integrity - damage_amount, 0) + +/obj/item/weapon/computer_hardware/examine(var/mob/user) + . = ..() + if(damage > damage_failure) + to_chat(user, "It seems to be severely damaged!") + else if(damage > damage_malfunction) + to_chat(user, "It seems to be damaged!") + else if(damage) + to_chat(user, "It seems to be slightly damaged.") + +// Component-side compatibility check. +/obj/item/weapon/computer_hardware/proc/can_install(obj/item/device/modular_computer/M, mob/living/user = null) + return can_install + +// Called when component is installed into PC. +/obj/item/weapon/computer_hardware/proc/on_install(obj/item/device/modular_computer/M, mob/living/user = null) + return + +// Called when component is removed from PC. +/obj/item/weapon/computer_hardware/proc/on_remove(obj/item/device/modular_computer/M, mob/living/user = null) + try_eject(forced = 1) + +// Called when someone tries to insert something in it - paper in printer, card in card reader, etc. +/obj/item/weapon/computer_hardware/proc/try_insert(obj/item/I, mob/living/user = null) + return FALSE + +// Called when someone tries to eject something from it - card from card reader, etc. +/obj/item/weapon/computer_hardware/proc/try_eject(slot=0, mob/living/user = null, forced = 0) + return FALSE diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm new file mode 100644 index 00000000000..5fd3ca1fc6b --- /dev/null +++ b/code/modules/modular_computers/hardware/ai_slot.dm @@ -0,0 +1,82 @@ +/obj/item/weapon/computer_hardware/ai_slot + name = "intelliCard interface slot" + desc = "A module allowing this computer to interface with most common intelliCard modules. Necessary for some programs to run properly." + power_usage = 100 //W + icon_state = "card_mini" + w_class = WEIGHT_CLASS_SMALL + origin_tech = "programming=2" + device_type = MC_AI + + var/obj/item/device/aicard/stored_card = null + var/locked = FALSE + +/obj/item/weapon/computer_hardware/ai_slot/Destroy() + if(stored_card) + qdel(stored_card) + stored_card = null + return ..() + + +/obj/item/weapon/computer_hardware/ai_slot/examine(mob/user) + ..() + if(stored_card) + to_chat(user, "There appears to be an intelliCard loaded. There appears to be a pinhole protecting a manual eject button. A screwdriver could probably press it") + +/obj/item/weapon/computer_hardware/ai_slot/on_install(obj/item/device/modular_computer/M, mob/living/user = null) + M.add_verb(device_type) + +/obj/item/weapon/computer_hardware/ai_slot/on_remove(obj/item/device/modular_computer/M, mob/living/user = null) + M.remove_verb(device_type) + try_eject(0, forced = 1) + +/obj/item/weapon/computer_hardware/ai_slot/try_insert(obj/item/I, mob/living/user = null) + if(!holder) + return FALSE + + if(!istype(I, /obj/item/device/aicard)) + return FALSE + + if(stored_card) + if(user) + to_chat(user, "You try to insert \the [I] into \the [src], but the slot is occupied.") + return FALSE + if(user && !user.unEquip(I)) + return FALSE + + I.forceMove(src) + stored_card = I + if(user) + to_chat(user, "You insert \the [I] into \the [src].") + + return TRUE + + +/obj/item/weapon/computer_hardware/ai_slot/try_eject(slot=0, mob/living/user = null, forced = 0) + if(!stored_card) + if(user) + to_chat(user, "There is no card in \the [src].") + return FALSE + + if(locked && !forced) + if(user) + to_chat(user, "Safeties prevent you from removing the card until reconstruction is complete...") + return FALSE + + if(stored_card) + stored_card.forceMove(get_turf(src)) + locked = FALSE + stored_card.verb_pickup() + stored_card = null + + if(user) + to_chat(user, "You remove the card from \the [src].") + return TRUE + return FALSE + +/obj/item/weapon/computer_hardware/ai_slot/attackby(obj/item/I, mob/living/user) + if(..()) + return + if(istype(I, /obj/item/weapon/screwdriver)) + to_chat(user, "You press down on the manual eject button with \the [I].") + try_eject(0, user, 1) + return \ No newline at end of file diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm new file mode 100644 index 00000000000..5ef74b74f4b --- /dev/null +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -0,0 +1,108 @@ +/obj/item/weapon/computer_hardware/battery + name = "power cell controller" + desc = "A charge controller for standard power cells, used in all kinds of modular computers." + icon_state = "cell_con" + critical = 1 + malfunction_probability = 1 + origin_tech = "powerstorage=1;engineering=1" + var/obj/item/weapon/stock_parts/cell/battery = null + device_type = MC_CELL + +/obj/item/weapon/computer_hardware/battery/New(loc, battery_type = null) + if(battery_type) + battery = new battery_type(src) + ..() + +/obj/item/weapon/computer_hardware/battery/Destroy() + if(battery) + qdel(battery) + battery = null + return ..() + +/obj/item/weapon/computer_hardware/battery/on_remove(obj/item/device/modular_computer/M, mob/living/user = null) + try_eject(0, forced = 1) + +/obj/item/weapon/computer_hardware/battery/try_insert(obj/item/I, mob/living/user = null) + if(!holder) + return FALSE + + if(!istype(I, /obj/item/weapon/stock_parts/cell)) + return FALSE + + if(battery) + if(user) + to_chat(user, "You try to connect \the [I] to \the [src], but its connectors are occupied.") + return FALSE + + if(I.w_class > holder.max_hardware_size) + if(user) + to_chat(user, "This power cell is too large for \the [holder]!") + return FALSE + + if(user && !user.unEquip(I)) + return FALSE + + I.forceMove(src) + battery = I + if(user) + to_chat(user, "You connect \the [I] to \the [src].") + + return TRUE + + +/obj/item/weapon/computer_hardware/battery/try_eject(slot=0, mob/living/user = null, forced = 0) + if(!battery) + if(user) + to_chat(user, "There is no power cell connected to \the [src].") + return FALSE + else + battery.forceMove(get_turf(src)) + if(user) + to_chat(user, "You detach \the [battery] from \the [src].") + battery = null + + if(holder) + if(holder.enabled && !holder.use_power()) + holder.shutdown_computer() + + return TRUE + return FALSE + + +// Stock parts +/obj/item/weapon/stock_parts/cell/computer + name = "standard battery" + desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops." + icon = 'icons/obj/module.dmi' + icon_state = "cell_mini" + origin_tech = "powerstorage=2;engineering=1" + w_class = WEIGHT_CLASS_TINY + maxcharge = 750 + +/obj/item/weapon/stock_parts/cell/computer/advanced + name = "advanced battery" + desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices." + icon_state = "cell" + origin_tech = "powerstorage=2;engineering=2" + maxcharge = 1500 + +/obj/item/weapon/stock_parts/cell/computer/super + name = "super battery" + desc = "An advanced power cell, often used in high-end laptops." + icon_state = "cell" + origin_tech = "powerstorage=3;engineering=3" + maxcharge = 2000 + +/obj/item/weapon/stock_parts/cell/computer/micro + name = "micro battery" + desc = "A small power cell, commonly seen in most portable microcomputers." + icon_state = "cell_micro" + w_class = WEIGHT_CLASS_TINY + maxcharge = 500 + +/obj/item/weapon/stock_parts/cell/computer/nano + name = "nano battery" + desc = "A tiny power cell, commonly seen in low-end portable microcomputers." + icon_state = "cell_micro" + w_class = WEIGHT_CLASS_TINY + maxcharge = 300 \ No newline at end of file diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm new file mode 100644 index 00000000000..6d323bb7fca --- /dev/null +++ b/code/modules/modular_computers/hardware/card_slot.dm @@ -0,0 +1,116 @@ +/obj/item/weapon/computer_hardware/card_slot + name = "identification card authentication module" // \improper breaks the find_hardware_by_name proc + desc = "A module allowing this computer to read or write data on ID cards. Necessary for some programs to run properly." + power_usage = 10 //W + icon_state = "card_mini" + w_class = WEIGHT_CLASS_TINY + origin_tech = "programming=2" + device_type = MC_CARD + + var/obj/item/weapon/card/id/stored_card = null + var/obj/item/weapon/card/id/stored_card2 = null + +/obj/item/weapon/computer_hardware/card_slot/Destroy() + if(stored_card) + qdel(stored_card) + stored_card = null + if(stored_card2) + qdel(stored_card2) + stored_card2 = null + return ..() + +/obj/item/weapon/computer_hardware/card_slot/GetAccess() + if(stored_card && stored_card2) // Best of both worlds + return (stored_card.GetAccess() | stored_card2.GetAccess()) + else if(stored_card) + return stored_card.GetAccess() + else if(stored_card2) + return stored_card2.GetAccess() + return ..() + +/obj/item/weapon/computer_hardware/card_slot/GetID() + if(stored_card) + return stored_card + else if(stored_card2) + return stored_card2 + return ..() + +/obj/item/weapon/computer_hardware/card_slot/on_install(obj/item/device/modular_computer/M, mob/living/user = null) + M.add_verb(device_type) + +/obj/item/weapon/computer_hardware/card_slot/on_remove(obj/item/device/modular_computer/M, mob/living/user = null) + M.remove_verb(device_type) + try_eject(0, forced = 1) + +/obj/item/weapon/computer_hardware/card_slot/try_insert(obj/item/I, mob/living/user = null) + if(!holder) + return FALSE + + if(!istype(I, /obj/item/weapon/card/id)) + return FALSE + + if(stored_card && stored_card2) + if(user) + to_chat(user, "You try to insert \the [I] into \the [src], but its slots are occupied.") + return FALSE + if(user && !user.unEquip(I)) + return FALSE + + I.forceMove(src) + + if(!stored_card) + stored_card = I + else + stored_card2 = I + + if(user) + to_chat(user, "You insert \the [I] into \the [src].") + + return TRUE + + +/obj/item/weapon/computer_hardware/card_slot/try_eject(slot = 0, mob/living/user = null, forced = 0) + if(!stored_card && !stored_card2) + if(user) + to_chat(user, "There are no cards in \the [src].") + return FALSE + + var/ejected = 0 + if(stored_card && (!slot || slot == 1)) + stored_card.forceMove(get_turf(src)) + stored_card.verb_pickup() + stored_card = null + ejected++ + + if(stored_card2 && (!slot || slot == 2)) + stored_card2.forceMove(get_turf(src)) + stored_card2.verb_pickup() + stored_card2 = null + ejected++ + + if(ejected) + if(holder) + if(holder.active_program) + holder.active_program.event_idremoved(0, slot) + + for(var/I in holder.idle_threads) + var/datum/computer_file/program/P = I + P.event_idremoved(1, slot) + + if(user) + to_chat(user, "You remove the card[ejected>1 ? "s" : ""] from \the [src].") + return TRUE + return FALSE + +/obj/item/weapon/computer_hardware/card_slot/attackby(obj/item/I, mob/living/user) + if(..()) + return + if(istype(I, /obj/item/weapon/screwdriver)) + to_chat(user, "You press down on the manual eject button with \the [I].") + try_eject(0,user) + return + +/obj/item/weapon/computer_hardware/card_slot/examine(mob/user) + ..() + if(stored_card || stored_card2) + to_chat(user, "There appears to be something loaded in the card slots.") diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm new file mode 100644 index 00000000000..707e16e22ac --- /dev/null +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -0,0 +1,176 @@ +/obj/item/weapon/computer_hardware/hard_drive + name = "hard disk drive" + desc = "A small HDD, for use in basic computers where power efficiency is desired." + power_usage = 25 + icon_state = "harddisk_mini" + critical = 1 + w_class = WEIGHT_CLASS_TINY + origin_tech = "programming=1;engineering=1" + device_type = MC_HDD + var/max_capacity = 128 + 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/on_remove(obj/item/device/modular_computer/MC, mob/user) + MC.shutdown_computer() + +/obj/item/weapon/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. + +/obj/item/weapon/computer_hardware/hard_drive/examine(user) + ..() + to_chat(user, "It has [max_capacity] GQ of storage capacity.") + +/obj/item/weapon/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) + if(!F || !istype(F)) + return 0 + + if(!can_store_file(F)) + return 0 + + if(!check_functionality()) + return 0 + + if(!stored_files) + return 0 + + // This file is already stored. Don't store it again. + if(F in stored_files) + return 0 + + F.holder = src + stored_files.Add(F) + recalculate_size() + return 1 + +// 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) + if(!F || !istype(F)) + return 0 + + if(!stored_files) + return 0 + + if(!check_functionality()) + return 0 + + if(F in stored_files) + stored_files -= F + qdel(F) + recalculate_size() + return 1 + else + return 0 + +// Loops through all stored files and recalculates used_capacity of this drive +/obj/item/weapon/computer_hardware/hard_drive/proc/recalculate_size() + var/total_size = 0 + for(var/datum/computer_file/F in stored_files) + total_size += F.size + + used_capacity = total_size + +// Checks whether file can be stored on the hard drive. 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/can_store_file(var/datum/computer_file/F) + if(!F || !istype(F)) + return 0 + + if(F in stored_files) + return 0 + + var/name = F.filename + "." + F.filetype + for(var/datum/computer_file/file in stored_files) + if((file.filename + "." + file.filetype) == name) + return 0 + + // 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) + return 0 + if((used_capacity + F.size) > max_capacity) + return 0 + else + return 1 + + +// 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) + if(!check_functionality()) + return null + + if(!filename) + return null + + if(!stored_files) + return null + + for(var/datum/computer_file/F in stored_files) + if(F.filename == filename) + return F + return null + +/obj/item/weapon/computer_hardware/hard_drive/Destroy() + for(var/file in stored_files) + qdel(file) + stored_files = null + return ..() + +/obj/item/weapon/computer_hardware/hard_drive/New() + install_default_programs() + ..() + + +/obj/item/weapon/computer_hardware/hard_drive/advanced + name = "advanced hard disk drive" + desc = "A hybrid HDD, for use in higher grade computers where balance between power efficiency and capacity is desired." + max_capacity = 256 + origin_tech = "programming=2;engineering=2" + power_usage = 50 // Hybrid, medium capacity and medium power storage + icon_state = "harddisk_mini" + w_class = WEIGHT_CLASS_SMALL + +/obj/item/weapon/computer_hardware/hard_drive/super + name = "super hard disk drive" + desc = "A high capacity HDD, for use in cluster storage solutions where capacity is more important than power efficiency." + max_capacity = 512 + origin_tech = "programming=3;engineering=3" + power_usage = 100 // High-capacity but uses lots of power, shortening battery life. Best used with APC link. + icon_state = "harddisk_mini" + w_class = WEIGHT_CLASS_SMALL + +/obj/item/weapon/computer_hardware/hard_drive/cluster + name = "cluster hard disk drive" + desc = "A large storage cluster consisting of multiple HDDs for usage in dedicated storage systems." + power_usage = 500 + origin_tech = "programming=4;engineering=4" + max_capacity = 2048 + icon_state = "harddisk" + w_class = WEIGHT_CLASS_NORMAL + +// For tablets, etc. - highly power efficient. +/obj/item/weapon/computer_hardware/hard_drive/small + name = "solid state drive" + desc = "An efficient SSD for portable devices." + power_usage = 10 + origin_tech = "programming=2;engineering=2" + max_capacity = 64 + icon_state = "ssd_mini" + w_class = WEIGHT_CLASS_TINY + +/obj/item/weapon/computer_hardware/hard_drive/micro + name = "micro solid state drive" + desc = "A highly efficient SSD chip for portable devices." + power_usage = 2 + origin_tech = "programming=1;engineering=1" + max_capacity = 32 + icon_state = "ssd_micro" + w_class = WEIGHT_CLASS_TINY \ No newline at end of file diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm new file mode 100644 index 00000000000..bf918a86b99 --- /dev/null +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -0,0 +1,82 @@ +var/global/ntnet_card_uid = 1 + +/obj/item/weapon/computer_hardware/network_card + name = "network card" + desc = "A basic wireless network card for usage with standard NTNet frequencies." + power_usage = 50 + origin_tech = "programming=2;engineering=1" + icon_state = "radio_mini" + var/identification_id = null // Identification ID. Technically MAC address of this device. Can't be changed by user. + var/identification_string = "" // Identification string, technically nickname seen in the network. Can be set by user. + var/long_range = 0 + var/ethernet = 0 // Hard-wired, therefore always on, ignores NTNet wireless checks. + malfunction_probability = 1 + device_type = MC_NET + +/obj/item/weapon/computer_hardware/network_card/diagnostics(var/mob/user) + ..() + to_chat(user, "NIX Unique ID: [identification_id]") + to_chat(user, "NIX User Tag: [identification_string]") + to_chat(user, "Supported protocols:") + to_chat(user, "511.m SFS (Subspace) - Standard Frequency Spread") + if(long_range) + to_chat(user, "511.n WFS/HB (Subspace) - Wide Frequency Spread/High Bandiwdth") + if(ethernet) + to_chat(user, "OpenEth (Physical Connection) - Physical network connection port") + +/obj/item/weapon/computer_hardware/network_card/New(var/l) + ..(l) + identification_id = ntnet_card_uid + ntnet_card_uid++ + +// Returns a string identifier of this network card +/obj/item/weapon/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) + if(!holder) // Hardware is not installed in anything. No signal. How did this even get called? + return 0 + + if(!check_functionality()) + return 0 + + if(ethernet) // Computer is connected via wired connection. + return 3 + + if(!ntnet_global || !ntnet_global.check_function(specific_action)) // NTNet is down and we are not connected via wired connection. No signal. + return 0 + + if(holder) + + var/turf/T = get_turf(holder) + if((T && istype(T)) && is_station_contact(T.z)) + // Computer is on station. Low/High signal depending on what type of network card you have + if(long_range) + return 2 + else + return 1 + + if(long_range) // Computer is not on station, but it has upgraded network card. Low signal. + return 1 + + return 0 // Computer is not on station and does not have upgraded network card. No signal. + + +/obj/item/weapon/computer_hardware/network_card/advanced + name = "advanced network card" + desc = "An advanced network card for usage with standard NTNet frequencies. Its transmitter is strong enough to connect even off-station." + long_range = 1 + origin_tech = "programming=4;engineering=2" + power_usage = 100 // Better range but higher power usage. + icon_state = "radio" + w_class = WEIGHT_CLASS_TINY + +/obj/item/weapon/computer_hardware/network_card/wired + name = "wired network card" + desc = "An advanced network card for usage with standard NTNet frequencies. This one also supports wired connection." + ethernet = 1 + origin_tech = "programming=5;engineering=3" + power_usage = 100 // Better range but higher power usage. + icon_state = "net_wired" + w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/modular_computers/hardware/portable_disk.dm b/code/modules/modular_computers/hardware/portable_disk.dm new file mode 100644 index 00000000000..4bdf0b35493 --- /dev/null +++ b/code/modules/modular_computers/hardware/portable_disk.dm @@ -0,0 +1,35 @@ +/obj/item/weapon/computer_hardware/hard_drive/portable + name = "data disk" + desc = "Removable disk used to store data." + power_usage = 10 + icon_state = "datadisk6" + w_class = WEIGHT_CLASS_TINY + critical = 0 + max_capacity = 16 + origin_tech = "programming=1" + device_type = MC_SDD + +/obj/item/weapon/computer_hardware/hard_drive/portable/on_install(obj/item/device/modular_computer/M, mob/living/user = null) + M.add_verb(device_type) + +/obj/item/weapon/computer_hardware/hard_drive/portable/on_remove(obj/item/device/modular_computer/M, mob/living/user = null) + ..() + M.remove_verb(device_type) + +/obj/item/weapon/computer_hardware/hard_drive/portable/install_default_programs() + return // Empty by default + +/obj/item/weapon/computer_hardware/hard_drive/portable/advanced + name = "advanced data disk" + power_usage = 20 + icon_state = "datadisk5" + max_capacity = 64 + origin_tech = "programming=2" + +/obj/item/weapon/computer_hardware/hard_drive/portable/super + name = "super data disk" + desc = "Removable disk used to store large amounts of data." + power_usage = 40 + icon_state = "datadisk3" + max_capacity = 256 + origin_tech = "programming=4" diff --git a/code/modules/modular_computers/hardware/printer.dm b/code/modules/modular_computers/hardware/printer.dm new file mode 100644 index 00000000000..c5d8ba0cc77 --- /dev/null +++ b/code/modules/modular_computers/hardware/printer.dm @@ -0,0 +1,65 @@ +/obj/item/weapon/computer_hardware/printer + name = "printer" + desc = "Computer-integrated printer with paper recycling module." + power_usage = 100 + origin_tech = "programming=2;engineering=2" + icon_state = "printer" + w_class = WEIGHT_CLASS_NORMAL + device_type = MC_PRINT + var/stored_paper = 20 + var/max_paper = 30 + +/obj/item/weapon/computer_hardware/printer/diagnostics(mob/living/user) + ..() + to_chat(user, "Paper level: [stored_paper]/[max_paper]") + +/obj/item/weapon/computer_hardware/printer/examine(mob/user) + ..() + to_chat(user, "Paper level: [stored_paper]/[max_paper]") + + +/obj/item/weapon/computer_hardware/printer/proc/print_text(var/text_to_print, var/paper_title = "") + if(!stored_paper) + return FALSE + if(!check_functionality()) + return FALSE + + var/obj/item/weapon/paper/P = new/obj/item/weapon/paper(get_turf(holder)) + + // Damaged printer causes the resulting paper to be somewhat harder to read. + if(damage > damage_malfunction) + P.info = stars(text_to_print, 100-malfunction_probability) + else + P.info = text_to_print + if(paper_title) + P.name = paper_title + P.update_icon() + stored_paper-- + P = null + return TRUE + +/obj/item/weapon/computer_hardware/printer/try_insert(obj/item/I, mob/living/user = null) + if(istype(I, /obj/item/weapon/paper)) + if(stored_paper >= max_paper) + if(user) + to_chat(user, "You try to add \the [I] into [src], but its paper bin is full!") + return FALSE + + if(user && !user.unEquip(I)) + return FALSE + + if(user) + to_chat(user, "You insert \the [I] into [src]'s paper recycler.") + qdel(I) + stored_paper++ + return TRUE + return FALSE + +/obj/item/weapon/computer_hardware/printer/mini + name = "miniprinter" + desc = "A small printer with paper recycling module." + power_usage = 50 + icon_state = "printer_mini" + w_class = WEIGHT_CLASS_TINY + stored_paper = 5 + max_paper = 15 \ No newline at end of file diff --git a/code/modules/modular_computers/hardware/recharger.dm b/code/modules/modular_computers/hardware/recharger.dm new file mode 100644 index 00000000000..c7ab6910780 --- /dev/null +++ b/code/modules/modular_computers/hardware/recharger.dm @@ -0,0 +1,94 @@ +/obj/item/weapon/computer_hardware/recharger + critical = 1 + enabled = 1 + var/charge_rate = 100 + device_type = MC_CHARGE + +/obj/item/weapon/computer_hardware/recharger/proc/use_power(amount, charging=0) + if(charging) + return 1 + return 0 + +/obj/item/weapon/computer_hardware/recharger/process() + ..() + var/obj/item/weapon/computer_hardware/battery/battery_module = holder.all_components[MC_CELL] + if(!holder || !battery_module || !battery_module.battery) + return + + var/obj/item/weapon/stock_parts/cell/cell = battery_module.battery + if(cell.charge >= cell.maxcharge) + return + + if(use_power(charge_rate, charging=1)) + holder.give_power(charge_rate * CELLRATE) + + +/obj/item/weapon/computer_hardware/recharger/APC + name = "area power connector" + desc = "A device that wirelessly recharges connected device from nearby APC." + icon_state = "charger_APC" + w_class = WEIGHT_CLASS_SMALL // Can't be installed into tablets/PDAs + origin_tech = "programming=2;engineering=2;powerstorage=3" + +/obj/item/weapon/computer_hardware/recharger/APC/use_power(amount, charging=0) + if(istype(holder.physical, /obj/machinery)) + var/obj/machinery/M = holder.physical + if(M.powered()) + M.use_power(amount) + return 1 + + else + var/area/A = get_area(src) + if(!A || !isarea(A)) + return 0 + + if(A.powered(EQUIP)) + A.use_power(amount, EQUIP) + return 1 + return 0 + +/obj/item/weapon/computer_hardware/recharger/wired + name = "wired power connector" + desc = "A power connector that recharges connected device from nearby power wire. Incompatible with portable computers." + icon_state = "charger_wire" + w_class = WEIGHT_CLASS_NORMAL + origin_tech = "engineering=2;powerstorage=1" + +/obj/item/weapon/computer_hardware/recharger/wired/can_install(obj/item/device/modular_computer/M, mob/living/user = null) + if(istype(M.physical, /obj/machinery) && M.physical.anchored) + return ..() + if(user) + to_chat(user, "\The [src] is incompatible with portable computers!") + return 0 + +/obj/item/weapon/computer_hardware/recharger/wired/use_power(amount, charging=0) + if(istype(holder.physical, /obj/machinery) && holder.physical.anchored) + var/obj/machinery/M = holder.physical + var/turf/T = M.loc + if(!T || !istype(T)) + return 0 + + var/obj/structure/cable/C = T.get_cable_node() + if(!C || !C.powernet) + return 0 + + var/power_in_net = C.powernet.avail-C.powernet.load + + if(power_in_net && power_in_net > amount) + C.powernet.load += amount + return 1 + + return 0 + + + +// This is not intended to be obtainable in-game. Intended for adminbus and debugging purposes. +/obj/item/weapon/computer_hardware/recharger/lambda + name = "lambda coil" + desc = "A very complex device that draws power from its own bluespace dimension." + icon_state = "charger_lambda" + w_class = WEIGHT_CLASS_TINY + charge_rate = 100000 + +/obj/item/weapon/computer_hardware/recharger/lambda/use_power(amount, charging=0) + return 1 diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm new file mode 100644 index 00000000000..2a6cb6f18a6 --- /dev/null +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -0,0 +1,306 @@ +// A vendor machine for modular computer portable devices - Laptops and Tablets + +/obj/machinery/lapvend + name = "computer vendor" + desc = "A vending machine with a built-in microfabricator, capable of dispensing various NT-branded computers." + icon = 'icons/obj/vending.dmi' + icon_state = "robotics" + layer = BELOW_OBJ_LAYER + anchored = 1 + density = 1 + + // The actual laptop/tablet + var/obj/item/device/modular_computer/laptop/fabricated_laptop = null + var/obj/item/device/modular_computer/tablet/fabricated_tablet = null + + // Utility vars + var/state = 0 // 0: Select device type, 1: Select loadout, 2: Payment, 3: Thankyou screen + var/devtype = 0 // 0: None(unselected), 1: Laptop, 2: Tablet + var/total_price = 0 // Price of currently vended device. + + // Device loadout + var/dev_cpu = 1 // 1: Default, 2: Upgraded + var/dev_battery = 1 // 1: Default, 2: Upgraded, 3: Advanced + var/dev_disk = 1 // 1: Default, 2: Upgraded, 3: Advanced + var/dev_netcard = 0 // 0: None, 1: Basic, 2: Long-Range + var/dev_apc_recharger = 0 // 0: None, 1: Standard (LAPTOP ONLY) + var/dev_printer = 0 // 0: None, 1: Standard + var/dev_card = 0 // 0: None, 1: Standard + +// Removes all traces of old order and allows you to begin configuration from scratch. +/obj/machinery/lapvend/proc/reset_order() + state = 0 + devtype = 0 + if(fabricated_laptop) + qdel(fabricated_laptop) + fabricated_laptop = null + if(fabricated_tablet) + qdel(fabricated_tablet) + fabricated_tablet = null + dev_cpu = 1 + dev_battery = 1 + dev_disk = 1 + dev_netcard = 0 + dev_apc_recharger = 0 + dev_printer = 0 + dev_card = 0 + +// Recalculates the price and optionally even fabricates the device. +/obj/machinery/lapvend/proc/fabricate_and_recalc_price(fabricate = 0) + total_price = 0 + if(devtype == 1) // Laptop, generally cheaper to make it accessible for most station roles + var/obj/item/weapon/computer_hardware/battery/battery_module = null + if(fabricate) + fabricated_laptop = new /obj/item/device/modular_computer/laptop/buildable(src) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/battery) + battery_module = fabricated_laptop.all_components[MC_CELL] + total_price = 99 + switch(dev_cpu) + if(1) + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/processor_unit/small) + if(2) + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/processor_unit) + total_price += 299 + switch(dev_battery) + if(1) // Basic(750C) + if(fabricate) + battery_module.try_insert(new /obj/item/weapon/stock_parts/cell/computer) + if(2) // Upgraded(1100C) + if(fabricate) + battery_module.try_insert(new /obj/item/weapon/stock_parts/cell/computer/advanced) + total_price += 199 + if(3) // Advanced(1500C) + if(fabricate) + battery_module.try_insert(new /obj/item/weapon/stock_parts/cell/computer/super) + total_price += 499 + switch(dev_disk) + if(1) // Basic(128GQ) + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/hard_drive) + if(2) // Upgraded(256GQ) + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/hard_drive/advanced) + total_price += 99 + if(3) // Advanced(512GQ) + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/hard_drive/super) + total_price += 299 + switch(dev_netcard) + if(1) // Basic(Short-Range) + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/network_card) + total_price += 99 + if(2) // Advanced (Long Range) + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/network_card/advanced) + total_price += 299 + if(dev_apc_recharger) + total_price += 399 + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/recharger/APC) + if(dev_printer) + total_price += 99 + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/printer/mini) + if(dev_card) + total_price += 199 + if(fabricate) + fabricated_laptop.install_component(new /obj/item/weapon/computer_hardware/card_slot) + + return total_price + else if(devtype == 2) // Tablet, more expensive, not everyone could probably afford this. + var/obj/item/weapon/computer_hardware/battery/battery_module = null + if(fabricate) + fabricated_tablet = new(src) + fabricated_tablet.install_component(new /obj/item/weapon/computer_hardware/battery) + fabricated_tablet.install_component(new /obj/item/weapon/computer_hardware/processor_unit/small) + battery_module = fabricated_tablet.all_components[MC_CELL] + total_price = 199 + switch(dev_battery) + if(1) // Basic(300C) + if(fabricate) + battery_module.try_insert(new /obj/item/weapon/stock_parts/cell/computer/nano) + if(2) // Upgraded(500C) + if(fabricate) + battery_module.try_insert(new /obj/item/weapon/stock_parts/cell/computer/micro) + total_price += 199 + if(3) // Advanced(750C) + if(fabricate) + battery_module.try_insert(new /obj/item/weapon/stock_parts/cell/computer) + total_price += 499 + switch(dev_disk) + if(1) // Basic(32GQ) + if(fabricate) + fabricated_tablet.install_component(new /obj/item/weapon/computer_hardware/hard_drive/micro) + if(2) // Upgraded(64GQ) + if(fabricate) + fabricated_tablet.install_component(new /obj/item/weapon/computer_hardware/hard_drive/small) + total_price += 99 + if(3) // Advanced(128GQ) + if(fabricate) + fabricated_tablet.install_component(new /obj/item/weapon/computer_hardware/hard_drive) + total_price += 299 + switch(dev_netcard) + if(1) // Basic(Short-Range) + if(fabricate) + fabricated_tablet.install_component(new/obj/item/weapon/computer_hardware/network_card) + total_price += 99 + if(2) // Advanced (Long Range) + if(fabricate) + fabricated_tablet.install_component(new/obj/item/weapon/computer_hardware/network_card/advanced) + total_price += 299 + if(dev_printer) + total_price += 99 + if(fabricate) + fabricated_tablet.install_component(new/obj/item/weapon/computer_hardware/printer) + if(dev_card) + total_price += 199 + if(fabricate) + fabricated_tablet.install_component(new/obj/item/weapon/computer_hardware/card_slot) + return total_price + return 0 + + +/obj/machinery/lapvend/Topic(href, href_list) + if(..()) + return 1 + + switch(href_list["action"]) + if("pick_device") + if(state) // We've already picked a device type + return 0 + devtype = text2num(href_list["pick"]) + state = 1 + fabricate_and_recalc_price(0) + return 1 + if("clean_order") + reset_order() + return 1 + if((state != 1) && devtype) // Following IFs should only be usable when in the Select Loadout mode + return 0 + switch(href_list["action"]) + if("confirm_order") + state = 2 // Wait for ID swipe for payment processing + fabricate_and_recalc_price(0) + return 1 + if("hw_cpu") + dev_cpu = text2num(href_list["cpu"]) + fabricate_and_recalc_price(0) + return 1 + if("hw_battery") + dev_battery = text2num(href_list["battery"]) + fabricate_and_recalc_price(0) + return 1 + if("hw_disk") + dev_disk = text2num(href_list["disk"]) + fabricate_and_recalc_price(0) + return 1 + if("hw_netcard") + dev_netcard = text2num(href_list["netcard"]) + fabricate_and_recalc_price(0) + return 1 + if("hw_tesla") + dev_apc_recharger = text2num(href_list["tesla"]) + fabricate_and_recalc_price(0) + return 1 + if("hw_nanoprint") + dev_printer = text2num(href_list["print"]) + fabricate_and_recalc_price(0) + return 1 + if("hw_card") + dev_card = text2num(href_list["card"]) + fabricate_and_recalc_price(0) + return 1 + return 0 + +/obj/machinery/lapvend/attack_hand(mob/user) + ui_interact(user) + +/obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "computer_fabricator.tmpl", "Personal Computer Vendor", 500, 700) + ui.set_auto_update(1) + ui.open() + +/obj/machinery/lapvend/ui_data(mob/user) + var/list/data[0] + data["state"] = state + if(state == 1) + data["devtype"] = devtype + data["hw_battery"] = dev_battery + data["hw_disk"] = dev_disk + data["hw_netcard"] = dev_netcard + data["hw_tesla"] = dev_apc_recharger + data["hw_nanoprint"] = dev_printer + data["hw_card"] = dev_card + data["hw_cpu"] = dev_cpu + if(state == 1 || state == 2) + data["totalprice"] = total_price + return data + +obj/machinery/lapvend/attackby(obj/item/I, mob/user) + var/obj/item/weapon/card/id/C + if(istype(I, /obj/item/weapon/card/id)) + C = I + if(istype(I, /obj/item/device/pda)) + var/obj/item/device/pda/PDA = I + if(PDA.id) + C = PDA.id + + if(C && istype(C) && state == 2) + if(process_payment(C, I)) + fabricate_and_recalc_price(1) + if((devtype == 1) && fabricated_laptop) + fabricated_laptop.forceMove(loc) + fabricated_laptop = null + else if((devtype == 2) && fabricated_tablet) + fabricated_tablet.forceMove(loc) + fabricated_tablet = null + atom_say("Enjoy your new product!") + state = 3 + return 1 + return 0 + return ..() + + +// Simplified payment processing, returns 1 on success. +/obj/machinery/lapvend/proc/process_payment(obj/item/weapon/card/id/I, obj/item/ID_container) + visible_message("\The [usr] swipes \the [ID_container] through \the [src].") + var/datum/money_account/customer_account = get_card_account(I) + if(!customer_account || customer_account.suspended) + atom_say("Connection error. Unable to connect to account.") + return 0 + + if(customer_account.security_level != 0) //If card requires pin authentication (ie seclevel 1 or 2) + var/attempt_pin = input("Enter pin code", "Vendor transaction") as num + customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2) + + if(!customer_account) + atom_say("Unable to access account: incorrect credentials.") + return 0 + + if(total_price > customer_account.money) + atom_say("Insufficient funds in account.") + return 0 + else + var/paid = customer_account.charge(total_price, + transaction_purpose = "Purchase of [(devtype == 1) ? "laptop computer" : "tablet microcomputer"].", + terminal_name = name, + terminal_id = name, + dest_name = vendor_account.owner_name) + + if(paid) + vendor_account.money += total_price + var/datum/transaction/T = new() + T.target_name = customer_account.owner_name + T.purpose = "Purchase of [(devtype == 1) ? "laptop computer" : "tablet microcomputer"]" + T.amount = "[total_price]" + T.source_terminal = name + T.date = current_date_string + T.time = worldtime2text() + vendor_account.transaction_log.Add(T) + return 1 + return 0 \ No newline at end of file diff --git a/code/modules/nano/modules/power_monitor.dm b/code/modules/nano/modules/power_monitor.dm index 33e08b00e83..ef052d6a5f6 100644 --- a/code/modules/nano/modules/power_monitor.dm +++ b/code/modules/nano/modules/power_monitor.dm @@ -33,7 +33,7 @@ data["poweravail"] = powermonitor.powernet.avail data["powerload"] = powermonitor.powernet.viewload data["powerdemand"] = powermonitor.powernet.load - data["apcs"] = apc_repository.apc_data(powermonitor) + data["apcs"] = apc_repository.apc_data(powermonitor.powernet) return data diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index e3b16330986..082b6496357 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -169,17 +169,17 @@ var/eyes_covered = 0 var/obj/item/safe_thing = null if( victim.wear_mask ) - if( victim.wear_mask.flags & MASKCOVERSEYES ) + if(victim.wear_mask.flags_cover & MASKCOVERSEYES) eyes_covered = 1 safe_thing = victim.wear_mask - if( victim.wear_mask.flags & MASKCOVERSMOUTH ) + if(victim.wear_mask.flags_cover & MASKCOVERSMOUTH) mouth_covered = 1 safe_thing = victim.wear_mask if( victim.head ) - if( victim.head.flags & MASKCOVERSEYES ) + if(victim.head.flags_cover & MASKCOVERSEYES) eyes_covered = 1 safe_thing = victim.head - if( victim.head.flags & MASKCOVERSMOUTH ) + if(victim.head.flags_cover & MASKCOVERSMOUTH) mouth_covered = 1 safe_thing = victim.head if(victim.glasses) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index b80adc356c7..60b4cefefc1 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -33,10 +33,10 @@ var/obj/item/safe_thing = null if( victim.wear_mask ) - if( victim.wear_mask.flags & MASKCOVERSEYES ) + if(victim.wear_mask.flags_cover & MASKCOVERSEYES) safe_thing = victim.wear_mask if( victim.head ) - if( victim.head.flags & MASKCOVERSEYES ) + if(victim.head.flags_cover & MASKCOVERSEYES) safe_thing = victim.head if(victim.glasses) if( !safe_thing ) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 82bf6b43989..9e411abaee3 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -19,6 +19,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). var/list/categories = list( "AI Modules", "Computer Boards", + "Computer Parts", "Engineering Machinery", "Exosuit Modules", "Hydroponics Machinery", diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 450b0b8982a..9025f4e38a0 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -130,7 +130,7 @@ materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/airlock_electronics category = list("initial", "Electronics") - + /datum/design/firelock_board name = "Firelock Electronics" id = "firelock_board" @@ -170,7 +170,7 @@ materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/firealarm_electronics category = list("initial", "Electronics") - + /datum/design/earmuffs name = "Earmuffs" id = "earmuffs" @@ -744,4 +744,20 @@ build_type = AUTOLATHE materials = list(MAT_METAL = 450, MAT_GLASS = 190) build_path = /obj/item/conveyor_switch_construct - category = list("initial", "Construction") \ No newline at end of file + category = list("initial", "Construction") + +/datum/design/laptop + name = "Laptop Frame" + id = "laptop" + build_type = AUTOLATHE + materials = list(MAT_METAL = 10000, MAT_GLASS = 1000) + build_path = /obj/item/device/modular_computer/laptop/buildable + category = list("initial", "Miscellaneous") + +/datum/design/tablet + name = "Tablet Frame" + id = "tablet" + build_type = AUTOLATHE + materials = list(MAT_METAL = 2000, MAT_GLASS = 1000) + build_path = /obj/item/device/modular_computer/tablet + category = list("initial", "Miscellaneous") \ No newline at end of file diff --git a/code/modules/research/designs/computer_part_designs.dm b/code/modules/research/designs/computer_part_designs.dm new file mode 100644 index 00000000000..278adb3cf25 --- /dev/null +++ b/code/modules/research/designs/computer_part_designs.dm @@ -0,0 +1,251 @@ +//////////////////////////////////////// +///////////Computer Parts/////////////// +//////////////////////////////////////// + +/datum/design/disk/normal + name = "hard disk drive" + id = "hdd_basic" + req_tech = list("programming" = 1, "engineering" = 1) + build_type = PROTOLATHE + materials = list(MAT_METAL = 400, MAT_GLASS = 100) + build_path = /obj/item/weapon/computer_hardware/hard_drive + category = list("Computer Parts") + +/datum/design/disk/advanced + name = "advanced hard disk drive" + id = "hdd_advanced" + req_tech = list("programming" = 2, "engineering" = 2) + build_type = PROTOLATHE + materials = list(MAT_METAL = 800, MAT_GLASS = 200) + build_path = /obj/item/weapon/computer_hardware/hard_drive/advanced + category = list("Computer Parts") + +/datum/design/disk/super + name = "super hard disk drive" + id = "hdd_super" + req_tech = list("programming" = 3, "engineering" = 3) + build_type = PROTOLATHE + materials = list(MAT_METAL = 1600, MAT_GLASS = 400) + build_path = /obj/item/weapon/computer_hardware/hard_drive/super + category = list("Computer Parts") + +/datum/design/disk/cluster + name = "cluster hard disk drive" + id = "hdd_cluster" + req_tech = list("programming" = 4, "engineering" = 4) + build_type = PROTOLATHE + materials = list(MAT_METAL = 3200, MAT_GLASS = 800) + build_path = /obj/item/weapon/computer_hardware/hard_drive/cluster + category = list("Computer Parts") + +/datum/design/disk/small + name = "solid state drive" + id = "ssd_small" + req_tech = list("programming" = 2, "engineering" = 2) + build_type = PROTOLATHE + materials = list(MAT_METAL = 800, MAT_GLASS = 200) + build_path = /obj/item/weapon/computer_hardware/hard_drive/small + category = list("Computer Parts") + +/datum/design/disk/micro + name = "micro solid state drive" + id = "ssd_micro" + req_tech = list("programming" = 1, "engineering" = 1) + build_type = PROTOLATHE + materials = list(MAT_METAL = 400, MAT_GLASS = 100) + build_path = /obj/item/weapon/computer_hardware/hard_drive/micro + category = list("Computer Parts") + + +// Network cards +/datum/design/netcard/basic + name = "network card" + id = "netcard_basic" + req_tech = list("programming" = 2, "engineering" = 1) + build_type = IMPRINTER + materials = list(MAT_GLASS = 100, "sacid" = 20) + build_path = /obj/item/weapon/computer_hardware/network_card + category = list("Computer Parts") + +/datum/design/netcard/advanced + name = "advanced network card" + id = "netcard_advanced" + req_tech = list("programming" = 4, "engineering" = 2) + build_type = IMPRINTER + materials = list(MAT_GLASS = 200, "sacid" = 20) + build_path = /obj/item/weapon/computer_hardware/network_card/advanced + category = list("Computer Parts") + +/datum/design/netcard/wired + name = "wired network card" + id = "netcard_wired" + req_tech = list("programming" = 5, "engineering" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 400, "sacid" = 20) + build_path = /obj/item/weapon/computer_hardware/network_card/wired + category = list("Computer Parts") + + +// Data disks +/datum/design/portabledrive/basic + name = "data disk" + id = "portadrive_basic" + req_tech = list("programming" = 1) + build_type = IMPRINTER + materials = list(MAT_GLASS = 800, "sacid" = 20) + build_path = /obj/item/weapon/computer_hardware/hard_drive/portable + category = list("Computer Parts") + +/datum/design/portabledrive/advanced + name = "advanced data disk" + id = "portadrive_advanced" + req_tech = list("programming" = 2) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1600, "sacid" = 20) + build_path = /obj/item/weapon/computer_hardware/hard_drive/portable/advanced + category = list("Computer Parts") + +/datum/design/portabledrive/super + name = "super data disk" + id = "portadrive_super" + req_tech = list("programming" = 4) + build_type = IMPRINTER + materials = list(MAT_GLASS = 3200, "sacid" = 20) + build_path = /obj/item/weapon/computer_hardware/hard_drive/portable/super + category = list("Computer Parts") + + +// Card slot +/datum/design/cardslot + name = "ID card slot" + id = "cardslot" + req_tech = list("programming" = 2) + build_type = PROTOLATHE + materials = list(MAT_METAL = 600) + build_path = /obj/item/weapon/computer_hardware/card_slot + category = list("Computer Parts") + +// Intellicard slot +/datum/design/aislot + name = "Intellicard slot" + id = "aislot" + req_tech = list("programming" = 2) + build_type = PROTOLATHE + materials = list(MAT_METAL = 600) + build_path = /obj/item/weapon/computer_hardware/ai_slot + category = list("Computer Parts") + +// Mini printer +/datum/design/miniprinter + name = "miniprinter" + id = "miniprinter" + req_tech = list("programming" = 2, "engineering" = 2) + build_type = PROTOLATHE + materials = list(MAT_METAL = 600) + build_path = /obj/item/weapon/computer_hardware/printer/mini + category = list("Computer Parts") + + +// APC Link +/datum/design/APClink + name = "area power connector" + id = "APClink" + req_tech = list("programming" = 2, "powerstorage" = 3, "engineering" = 2) + build_type = PROTOLATHE + materials = list(MAT_METAL = 2000) + build_path = /obj/item/weapon/computer_hardware/recharger/APC + category = list("Computer Parts") + + +// Batteries +/datum/design/battery/controller + name = "power cell controller" + id = "bat_control" + req_tech = list("powerstorage" = 1, "engineering" = 1) + build_type = PROTOLATHE + materials = list(MAT_METAL = 400) + build_path = /obj/item/weapon/computer_hardware/battery + category = list("Computer Parts") + +/datum/design/battery/normal + name = "battery module" + id = "bat_normal" + req_tech = list("powerstorage" = 1, "engineering" = 1) + build_type = PROTOLATHE + materials = list(MAT_METAL = 400) + build_path = /obj/item/weapon/stock_parts/cell/computer + category = list("Computer Parts") + +/datum/design/battery/advanced + name = "advanced battery module" + id = "bat_advanced" + req_tech = list("powerstorage" = 2, "engineering" = 2) + build_type = PROTOLATHE + materials = list(MAT_METAL = 800) + build_path = /obj/item/weapon/stock_parts/cell/computer/advanced + category = list("Computer Parts") + +/datum/design/battery/super + name = "super battery module" + id = "bat_super" + req_tech = list("powerstorage" = 3, "engineering" = 3) + build_type = PROTOLATHE + materials = list(MAT_METAL = 1600) + build_path = /obj/item/weapon/stock_parts/cell/computer/super + category = list("Computer Parts") + +/datum/design/battery/nano + name = "nano battery module" + id = "bat_nano" + req_tech = list("powerstorage" = 1, "engineering" = 1) + build_type = PROTOLATHE + materials = list(MAT_METAL = 200) + build_path = /obj/item/weapon/stock_parts/cell/computer/nano + category = list("Computer Parts") + +/datum/design/battery/micro + name = "micro battery module" + id = "bat_micro" + req_tech = list("powerstorage" = 2, "engineering" = 2) + build_type = PROTOLATHE + materials = list(MAT_METAL = 400) + build_path = /obj/item/weapon/stock_parts/cell/computer/micro + category = list("Computer Parts") + + +// Processor unit +/datum/design/cpu + name = "processor board" + id = "cpu_normal" + req_tech = list("programming" = 3, "engineering" = 2) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1600, "sacid" = 20) + build_path = /obj/item/weapon/computer_hardware/processor_unit + category = list("Computer Parts") + +/datum/design/cpu/small + name = "microprocessor" + id = "cpu_small" + req_tech = list("programming" = 2, "engineering" = 2) + build_type = IMPRINTER + materials = list(MAT_GLASS = 800, "sacid" = 20) + build_path = /obj/item/weapon/computer_hardware/processor_unit/small + category = list("Computer Parts") + +/datum/design/cpu/photonic + name = "photonic processor board" + id = "pcpu_normal" + req_tech = list("programming" = 5, "engineering" = 4) + build_type = IMPRINTER + materials = list(MAT_GLASS= 6400, MAT_GOLD = 2000, "sacid" = 40) + build_path = /obj/item/weapon/computer_hardware/processor_unit/photonic + category = list("Computer Parts") + +/datum/design/cpu/photonic/small + name = "photonic microprocessor" + id = "pcpu_small" + req_tech = list("programming" = 4, "engineering" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 3200, MAT_GOLD = 1000, "sacid" = 20) + build_path = /obj/item/weapon/computer_hardware/processor_unit/photonic/small + category = list("Computer Parts") \ No newline at end of file diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 81392aa99e5..2084e2a93c4 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -18,6 +18,7 @@ Note: Must be placed west/left of and R&D console to function. var/list/categories = list( "Bluespace", + "Computer Parts", "Equipment", "Janitorial", "Medical", diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm index bfa4f7449b6..0d25330177c 100644 --- a/code/modules/security_levels/security levels.dm +++ b/code/modules/security_levels/security levels.dm @@ -32,9 +32,7 @@ security_announcement_down.Announce("All threats to the station have passed. All weapons need to be holstered and privacy laws are once again fully enforced.","Attention! Security level lowered to green.") security_level = SEC_LEVEL_GREEN - var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world) - if(CC) - CC.post_status("alert", "outline") + post_status("alert", "outline") for(var/obj/machinery/firealarm/FA in world) if(is_station_contact(FA.z)) @@ -48,9 +46,7 @@ security_announcement_down.Announce("The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.","Attention! Security level lowered to blue.") security_level = SEC_LEVEL_BLUE - var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world) - if(CC) - CC.post_status("alert", "outline") + post_status("alert", "outline") for(var/obj/machinery/firealarm/FA in world) if(is_station_contact(FA.z)) @@ -69,9 +65,7 @@ R.locked = 0 R.update_icon() - var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world) - if(CC) - CC.post_status("alert", "redalert") + post_status("alert", "redalert") for(var/obj/machinery/firealarm/FA in world) if(is_station_contact(FA.z)) @@ -95,9 +89,7 @@ H.locked = 0 H.update_icon() - var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world) - if(CC) - CC.post_status("alert", "gammaalert") + post_status("alert", "gammaalert") for(var/obj/machinery/firealarm/FA in world) if(is_station_contact(FA.z)) @@ -109,9 +101,7 @@ security_announcement_up.Announce("Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated.","Attention! Epsilon security level activated!") security_level = SEC_LEVEL_EPSILON - var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world) - if(CC) - CC.post_status("alert", "epsilonalert") + post_status("alert", "epsilonalert") for(var/obj/machinery/firealarm/FA in world) if(is_station_contact(FA.z)) @@ -122,9 +112,7 @@ security_announcement_up.Announce("The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.","Attention! Delta security level reached!") security_level = SEC_LEVEL_DELTA - var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world) - if(CC) - CC.post_status("alert", "deltaalert") + post_status("alert", "deltaalert") for(var/obj/machinery/firealarm/FA in world) if(is_station_contact(FA.z)) diff --git a/html/changelog.html b/html/changelog.html index efa9a6521cb..5c7d200cb58 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,24 @@ -->
+
+Your new computer device you always dreamed of is just four steps away...
+{{if data.state == 0}} +
+ Please swipe your identification card to finish purchase.
+ Total price: {{:data.totalprice}}C +{{else data.state == 3}} +
+ Please try again. If the problem persists contact your system administrator for assistance. + {{:helper.link('Restart program', null, {'action' : 'PRG_closefile'})}} +{{else}} + {{if data.filename}} +
+ {{:data.filedata}} + {{else}} +
+
+ {{for data.clients}} + {{:value.name}}
+ {{/for}} +{{else}} + Controls: +
+
+ Available channels:
+
+ {{for data.all_channels}}
+
+{{/if}}
\ No newline at end of file
diff --git a/nano/templates/ntnet_dos.tmpl b/nano/templates/ntnet_dos.tmpl
new file mode 100644
index 00000000000..bff7bb3b9f0
--- /dev/null
+++ b/nano/templates/ntnet_dos.tmpl
@@ -0,0 +1,25 @@
+{{:helper.syndicateMode()}}
+{{if data.error}}
+ ##SYSTEM ERROR: {{:data.error}}{{:helper.link('RESET', null, {'action' : 'PRG_reset'})}}
+{{else data.target}}
+ ##DoS traffic generator active. Tx: {{:data.speed}}GQ/s
+ {{for data.dos_strings}} + {{:value.nums}}
+ {{/for}} + {{:helper.link('ABORT', 'ban', {'action' : 'PRG_reset'})}} +{{else}} + ##DoS traffic generator ready. Select target device.
+
+
+ {{for data.relays}}
+
+{{/if}}
\ No newline at end of file
diff --git a/nano/templates/ntnet_downloader.tmpl b/nano/templates/ntnet_downloader.tmpl
new file mode 100644
index 00000000000..a64ae3452b2
--- /dev/null
+++ b/nano/templates/ntnet_downloader.tmpl
@@ -0,0 +1,102 @@
+Welcome to software download utility. Please select which software you wish to download.
+{{if data.error}} +
NTOS v2.0.4b Copyright NanoTrasen 2557 - 2559 \ No newline at end of file diff --git a/nano/templates/ntnet_monitor.tmpl b/nano/templates/ntnet_monitor.tmpl new file mode 100644 index 00000000000..319baa872f0 --- /dev/null +++ b/nano/templates/ntnet_monitor.tmpl @@ -0,0 +1,102 @@ +
+
+
+ {{:helper.link('Set password', 'key', {'action' : 'PRG_setpassword'})}} + {{:helper.link('Return', 'arrow-left', {'action' : 'PRG_reset'})}} +{{else}} +
+
+ {{:helper.link('Send file', 'upload', {'action' : 'PRG_uploadmenu'})}} +{{/if}} \ No newline at end of file diff --git a/nano/templates/revelation.tmpl b/nano/templates/revelation.tmpl new file mode 100644 index 00000000000..5412c440caa --- /dev/null +++ b/nano/templates/revelation.tmpl @@ -0,0 +1,23 @@ +{{:helper.syndicateMode()}} +
11 March 2017
+Markolie updated:
+-
+
- Firelocks forced by AI's, cyborgs at range or admin ghosts will now autoclose if there's still an atmospherics alarm present. +
- Regular (non-heavy) firelocks will now properly respond to explosions (100% chance of being destroyed at severity 1 explosions and 50% at severity 2). Heavy firelocks are still only destroyed in severity 1 explosions. +
- Added a visible message to forcing airlocks with the Jaws of Life. +
davipatury updated:
+-
+
- Ported Modular Computers from /tg/. +
uraniummeltdown updated:
+-
+
- EVA has 2 more EVA Suits +
- Removed Vox-only EVA suits (the grey ones in EVA) +
- Vox can now wear EVA suits +
10 March 2017
Jovaniph updated:
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ad60b0b11e7..c6b164576ae 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4060,3 +4060,17 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Matter grippers can now carry firelock electronics as well as bluespace
crystals (for construction).
- rscdel: Removes the pipe fitting on the table from atmospherics as it was broken.
+2017-03-11:
+ Markolie:
+ - tweak: Firelocks forced by AI's, cyborgs at range or admin ghosts will now autoclose
+ if there's still an atmospherics alarm present.
+ - tweak: Regular (non-heavy) firelocks will now properly respond to explosions (100%
+ chance of being destroyed at severity 1 explosions and 50% at severity 2). Heavy
+ firelocks are still only destroyed in severity 1 explosions.
+ - tweak: Added a visible message to forcing airlocks with the Jaws of Life.
+ davipatury:
+ - rscadd: Ported Modular Computers from /tg/.
+ uraniummeltdown:
+ - rscadd: EVA has 2 more EVA Suits
+ - rscdel: Removed Vox-only EVA suits (the grey ones in EVA)
+ - tweak: Vox can now wear EVA suits
diff --git a/html/changelogs/AutoChangeLog-pr-6719.yml b/html/changelogs/AutoChangeLog-pr-6719.yml
deleted file mode 100644
index 4a860f406e7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6719.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "uraniummeltdown"
-delete-after: True
-changes:
- - rscadd: "EVA has 2 more EVA Suits"
- - rscdel: "Removed Vox-only EVA suits (the grey ones in EVA)"
- - tweak: "Vox can now wear EVA suits"
diff --git a/html/changelogs/AutoChangeLog-pr-6721.yml b/html/changelogs/AutoChangeLog-pr-6721.yml
deleted file mode 100644
index 628705f4e24..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6721.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Markolie"
-delete-after: True
-changes:
- - tweak: "Firelocks forced by AI's, cyborgs at range or admin ghosts will now autoclose if there's still an atmospherics alarm present."
- - tweak: "Regular (non-heavy) firelocks will now properly respond to explosions (100% chance of being destroyed at severity 1 explosions and 50% at severity 2). Heavy firelocks are still only destroyed in severity 1 explosions."
- - tweak: "Added a visible message to forcing airlocks with the Jaws of Life."
diff --git a/icons/obj/modular_console.dmi b/icons/obj/modular_console.dmi
new file mode 100644
index 00000000000..85d6026617f
Binary files /dev/null and b/icons/obj/modular_console.dmi differ
diff --git a/icons/obj/modular_laptop.dmi b/icons/obj/modular_laptop.dmi
new file mode 100644
index 00000000000..2daeee0c7a4
Binary files /dev/null and b/icons/obj/modular_laptop.dmi differ
diff --git a/icons/obj/modular_tablet.dmi b/icons/obj/modular_tablet.dmi
new file mode 100644
index 00000000000..2438f375f65
Binary files /dev/null and b/icons/obj/modular_tablet.dmi differ
diff --git a/icons/program_icons/alarm_green.gif b/icons/program_icons/alarm_green.gif
new file mode 100644
index 00000000000..7c2570c8ce3
Binary files /dev/null and b/icons/program_icons/alarm_green.gif differ
diff --git a/icons/program_icons/alarm_red.gif b/icons/program_icons/alarm_red.gif
new file mode 100644
index 00000000000..327d58e4db8
Binary files /dev/null and b/icons/program_icons/alarm_red.gif differ
diff --git a/icons/program_icons/batt_100.gif b/icons/program_icons/batt_100.gif
new file mode 100644
index 00000000000..ccdbd4333e9
Binary files /dev/null and b/icons/program_icons/batt_100.gif differ
diff --git a/icons/program_icons/batt_20.gif b/icons/program_icons/batt_20.gif
new file mode 100644
index 00000000000..1d5e38fc888
Binary files /dev/null and b/icons/program_icons/batt_20.gif differ
diff --git a/icons/program_icons/batt_40.gif b/icons/program_icons/batt_40.gif
new file mode 100644
index 00000000000..d5cedb99675
Binary files /dev/null and b/icons/program_icons/batt_40.gif differ
diff --git a/icons/program_icons/batt_5.gif b/icons/program_icons/batt_5.gif
new file mode 100644
index 00000000000..ceac8f3a945
Binary files /dev/null and b/icons/program_icons/batt_5.gif differ
diff --git a/icons/program_icons/batt_60.gif b/icons/program_icons/batt_60.gif
new file mode 100644
index 00000000000..d39534c8cb0
Binary files /dev/null and b/icons/program_icons/batt_60.gif differ
diff --git a/icons/program_icons/batt_80.gif b/icons/program_icons/batt_80.gif
new file mode 100644
index 00000000000..9c299773f01
Binary files /dev/null and b/icons/program_icons/batt_80.gif differ
diff --git a/icons/program_icons/charging.gif b/icons/program_icons/charging.gif
new file mode 100644
index 00000000000..cf19ca72876
Binary files /dev/null and b/icons/program_icons/charging.gif differ
diff --git a/icons/program_icons/downloader_finished.gif b/icons/program_icons/downloader_finished.gif
new file mode 100644
index 00000000000..f01b7c42af8
Binary files /dev/null and b/icons/program_icons/downloader_finished.gif differ
diff --git a/icons/program_icons/downloader_running.gif b/icons/program_icons/downloader_running.gif
new file mode 100644
index 00000000000..68fb977c86d
Binary files /dev/null and b/icons/program_icons/downloader_running.gif differ
diff --git a/icons/program_icons/ntnrc_idle.gif b/icons/program_icons/ntnrc_idle.gif
new file mode 100644
index 00000000000..d47c01d5800
Binary files /dev/null and b/icons/program_icons/ntnrc_idle.gif differ
diff --git a/icons/program_icons/ntnrc_new.gif b/icons/program_icons/ntnrc_new.gif
new file mode 100644
index 00000000000..af72a8b332f
Binary files /dev/null and b/icons/program_icons/ntnrc_new.gif differ
diff --git a/icons/program_icons/power_norm.gif b/icons/program_icons/power_norm.gif
new file mode 100644
index 00000000000..2b8d60edfa5
Binary files /dev/null and b/icons/program_icons/power_norm.gif differ
diff --git a/icons/program_icons/power_warn.gif b/icons/program_icons/power_warn.gif
new file mode 100644
index 00000000000..0c85b3a85a1
Binary files /dev/null and b/icons/program_icons/power_warn.gif differ
diff --git a/icons/program_icons/sig_high.gif b/icons/program_icons/sig_high.gif
new file mode 100644
index 00000000000..efb20f67306
Binary files /dev/null and b/icons/program_icons/sig_high.gif differ
diff --git a/icons/program_icons/sig_lan.gif b/icons/program_icons/sig_lan.gif
new file mode 100644
index 00000000000..07ba929f7f3
Binary files /dev/null and b/icons/program_icons/sig_lan.gif differ
diff --git a/icons/program_icons/sig_low.gif b/icons/program_icons/sig_low.gif
new file mode 100644
index 00000000000..08f98baea8e
Binary files /dev/null and b/icons/program_icons/sig_low.gif differ
diff --git a/icons/program_icons/sig_none.gif b/icons/program_icons/sig_none.gif
new file mode 100644
index 00000000000..79840d8a2bd
Binary files /dev/null and b/icons/program_icons/sig_none.gif differ
diff --git a/nano/layouts/layout_program.tmpl b/nano/layouts/layout_program.tmpl
new file mode 100644
index 00000000000..66d1605c7c0
--- /dev/null
+++ b/nano/layouts/layout_program.tmpl
@@ -0,0 +1,75 @@
+
+
+
+
+{{:config.title}}
+
+
+
+
+
+
+
+
+| {{:data.PC_batterypercent}} + {{/if}} + {{if data.PC_ntneticon}} + | {{:data.PC_stationtime}} + {{/if}} + {{for data.PC_programheaders}} + |
+
+
+
+
+
+| {{:helper.link('Shutdown', 'power-off', {'action' : 'PC_shutdown'})}} + {{if data.PC_showexitprogram}} + | {{:helper.link('EXIT PROGRAM', 'times', {'action' : 'PC_exit'})}} + | {{:helper.link('Minimize Program', 'minus', {'action' : 'PC_minimize'})}} + {{/if}} + |
+
+
+
+ {{:helper.link('Hide Map', 'close', {'showMap' : 0})}}
+
+
+ Zoom Level:
+
+
+ x1.0
+ x1.5
+ x2.0
+ x2.5
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nano/templates/ai_restorer.tmpl b/nano/templates/ai_restorer.tmpl
new file mode 100644
index 00000000000..eb4c20a74f8
--- /dev/null
+++ b/nano/templates/ai_restorer.tmpl
@@ -0,0 +1,45 @@
+{{if data.restoring}}
+ Initiating...
+Reconstruction in progress!
+{{/if}}
+
+
+
+
+{{if data.error}}
+ ERROR: {{:data.error}}
+{{else}}
+ Inserted AI:
+ {{:helper.link(data.name ? data.name : "-----", 'eject', {'action' : 'PRG_eject'}, data.nocard ? 'disabled' : null)}}
+System Status
+
+
+
+
+ Current AI:
+ {{:data.name}}
+
+
+ Status:
+ {{if data.isDead}}Nonfunctional{{else}}Functional{{/if}}
+
+
+ System Integrity:
+ {{:helper.displayBar(data.health, 0, 100, (data.health > 75) ? 'good' : (data.health > 50) ? 'average' : 'bad')}}
+
+ {{:helper.smoothRound(data.health)}}%
+
+
+
+
+ Active Laws:
+
+
+
+ {{for data.ai_laws}}
+
+
+ | {{:value.index}}: {{:value.text}} + {{/for}} + |
Operations
+ {{:helper.link('Begin Reconstruction', 'plus', {'action' : 'PRG_beginReconstruction'}, data.restoring ? 'disabled' : null)}} +{{/if}} \ No newline at end of file diff --git a/nano/templates/card_prog.tmpl b/nano/templates/card_prog.tmpl new file mode 100644 index 00000000000..56c913a9de9 --- /dev/null +++ b/nano/templates/card_prog.tmpl @@ -0,0 +1,277 @@ +{{if data.printing}} +The computer is currently busy.
+
+ Printing...
+
+ + Thank you for your patience! +
+{{else}} + {{:helper.link('Access Modification', 'home', {'action' : 'PRG_mode', 'mode_target' : 0}, !data.mode ? 'disabled' : null)}} + {{:helper.link('Job Management', 'gear', {'action' : 'PRG_mode', 'mode_target' : 1}, data.mode == 1 ? 'disabled' : null)}} + {{:helper.link('Crew Manifest', 'folder-open', {'action' : 'PRG_mode', 'mode_target' : 2}, data.mode == 2 ? 'disabled' : null)}} + {{:helper.link('Print', 'print', {'action' : 'PRG_print'}, data.printer && (data.mode == 2 || data.has_modify && !data.mode) ? null : 'disabled')}} + + {{if data.mode == 1}} +
+
+ Job Management
+
+
+
+ Authorized Identity:
+
+
+ {{:helper.link(data.scan_name, 'eject', {'action' : 'PRG_scan'})}}
+
+
+ Cooldown:
+
+
+ {{if data.cooldown_mins > 0 || data.cooldown_mins == 0 && data.cooldown_secs > 0}}
+ Next change in: {{:data.cooldown_mins}}:{{:data.cooldown_secs}}
+ {{else}}
+ Ready
+ {{/if}}
+
+ +
+ {{for data.job_slots}}
+
+ {{else data.mode == 2}}
+
+ {{:value.title}}: {{:value.current_positions}}/{{:value.total_positions}}
+ {{:helper.link('-', null, {'action' : 'PRG_make_job_unavailable', 'job' : value.title}, value.can_close == 1 && data.authenticated ? null : 'disabled')}}
+ {{:helper.link('+', null, {'action' : 'PRG_make_job_available', 'job' : value.title}, value.can_open == 1 && data.authenticated ? null : 'disabled')}}
+
+ {{/for}}
+
+
+ Crew Manifest
+
+ {{:data.manifest}}
+
+ {{else}}
+
+
+
+ {{if !data.authenticated}}
+ Please insert the IDs into the terminal to proceed.Access Modification
++ {{/if}} + +
+
+
+ Target Identity:
+
+
+ {{:helper.link(data.target_name, 'eject', {'action' : 'PRG_modify'})}}
+
+
+
+
+ Authorized Identity:
+
+
+ {{:helper.link(data.scan_name, 'eject', {'action' : 'PRG_scan'})}}
+
+ + + {{if data.authenticated}} + + + {{if data.has_modify}} +
+
+
+ Details
+
+
+
+
+ Terminations:
+
+
+ {{:helper.link('Terminate ' + data.target_owner, 'gear', {'action' : 'PRG_terminate'}, data.target_rank == "Terminated" ? 'disabled' : null, data.target_rank == "Terminated" ? 'disabled' : 'linkDanger')}}
+
+
+
+
+ Assignment
+
+
+ {{:data.target_rank}}
+
+
+
+
+
+
+ {{if data.centcom_access}}
+
+
+ Central Command
+
+ {{for data.all_centcom_access}}
+ {{:helper.link(value.desc, '', {'action' : 'PRG_access', 'access_target' : value.ref, 'allowed' : value.allowed}, null, value.allowed ? 'selected' : null)}}
+ {{/for}}
+
+ {{else}}
+
+
+ Card Skin
+ {{for data.all_centcom_skins}}
+ {{:helper.link(value.display_name, '', {'action' : 'PRG_skin', 'skin_target' : value.skin}, null,(data.current_skin == value.skin) ? 'selected' : null )}}
+ {{/for}}
+
+
+ {{:data.station_name}}
+
+ {{for data.regions}}
+
+ {{/if}}
+ {{/if}}
+ {{/if}}
+ {{/if}}
+{{/if}}
diff --git a/nano/templates/comm_program.tmpl b/nano/templates/comm_program.tmpl
new file mode 100644
index 00000000000..6925b28b914
--- /dev/null
+++ b/nano/templates/comm_program.tmpl
@@ -0,0 +1,135 @@
+{{if !data.authenticated}}
+
+
+ {{/for}}
+ {{:value.name}}
+ {{for value.accesses :accessValue:accessKey}}
+
+ {{:helper.link(accessValue.desc, '', {'action' : 'PRG_access', 'access_target' : accessValue.ref, 'allowed' : accessValue.allowed}, null, accessValue.allowed ? 'selected' : null)}}
+
+ {{/for}}
+
+
+ Card Skin
+ {{for data.card_skins}}
+ {{:helper.link(value.display_name, '', {'action' : 'PRG_skin', 'skin_target' : value.skin}, null,(data.current_skin == value.skin) ? 'selected' : null )}}
+ {{/for}}
+ Please swipe your ID card. {{:helper.link('Log In', 'unlock', {'PRG_login' : 1}, null, 'fixed')}}
+{{else}}
+ {{if !data.is_ai}}
+ Please remember to {{:helper.link('Log Out', 'lock', {'PRG_logout' : 1}, null, 'fixed')}}
+ {{/if}}
+ {{if data.lastCallLoc}}
+ Most recent shuttle call/recall traced to: {{:data.lastCallLoc}}
+ {{else}}
+ Unable to trace most recent shuttle call/recall signal.
+ {{/if}}
+
+
+
+ {{if data.screen==1}}
+
+ Emergency Shuttle:
+ {{if data.shuttle.eta}} +ETA:
+
+ {{>data.shuttle.eta}}
+
+ {{/if}}
+ Options:
+
+ {{if data.shuttle.callStatus == 1 && !data.is_ai}}
+ {{:helper.link('Cancel Shuttle', 'arrow-left', {'PRG_operation' : 'cancelshuttle'})}}
+ {{else data.shuttle.callStatus == 2}}
+ {{:helper.link('Call Shuttle', 'arrow-circle-down', {'PRG_operation' : 'callshuttle'})}}
+ {{/if}}
+
+ Menu
+
+ {{if data.authenticated==2}}
+
+ {{else data.screen==2}}
+
+
+ {{:helper.link('Make an Announcement', 'info', {'PRG_operation' : 'announce'})}}
+
+
+ {{if data.emagged}}
+ {{:helper.link('Message [UNKNOWN]', 'envelope', {'PRG_operation' : 'MessageSyndicate'})}}
+ {{else}}
+ {{:helper.link('Message CentComm', 'envelope', {'PRG_operation' : 'MessageCentcomm'})}}
+ {{/if}}
+
+
+ {{:helper.link('Request Nuclear Authentication Codes', 'exclamation-triangle', {'PRG_operation' : 'nukerequest'})}}
+
+ {{/if}}
+
+ {{:helper.link('Change Alert Level', 'signal', {'PRG_operation' : 'changeseclevel'})}}
+
+
+ {{:helper.link('Change Status Displays', 'info', {'PRG_operation' : 'status'})}}
+
+
+ {{:helper.link('Message List', 'comment', {'PRG_operation' : 'messagelist'})}}
+
+
+ {{:helper.link('Restart Nano-Mob Hunter GO! Server', 'power-off', {'PRG_operation' : 'RestartNanoMob'})}}
+
+ {{if data.dock_request}}
+
+ {{:helper.link('Accept Docking Request', 'signal', {'PRG_operation' : 'AcceptDocking'})}}
+ {{:helper.link('Deny Docking Request', 'signal', {'PRG_operation' : 'DenyDocking'})}}
+
+ {{/if}}
+ Status Displays
+ {{:helper.link('Back', 'home', {'PRG_operation' : 'main'})}} +Presets
+ {{for data.stat_display.presets}} +
+
+ {{/for}}
+ {{:helper.link(value.label, 'info', {'PRG_operation' : 'setstat', 'statdisp' : value.name}, name == data.stat_display.type ? 'selected' : null)}}
+ Alerts
+ {{for data.stat_display.alerts}} +
+
+ {{/for}}
+ {{:helper.link(value.label, 'exclamation-triangle', {'PRG_operation' : 'setstat', 'statdisp' : 'alert', 'alert' : value.alert}, value.alert == data.stat_display.type ? 'selected' : null)}}
+ Messages
+
+ {{if data.stat_display.type}}
+
+ {{else data.screen==3}}
+
+
+
+ {{:helper.link('Line 1:', 'gear', {'PRG_operation':'setmsg1'})}}
+ {{>data.stat_display.line_1}}
+
+
+ {{/if}}
+ {{:helper.link('Line 2:', 'gear', {'PRG_operation':'setmsg2'})}}
+ {{>data.stat_display.line_2}}
+ Messages
+ {{if data.current_message}} + {{:helper.link('Messages', 'home', {'PRG_operation' : 'messagelist'})}} +{{:data.current_message_title}}
+
+ {{:data.current_message}}
+
+ {{else}}
+ {{:helper.link('Back', 'home', {'PRG_operation' : 'main'})}}
+ {{for data.messages}}
+
+ {{:value.title}}
+ {{:helper.link('Open', 'envelope-o', {'PRG_operation' : 'messagelist', 'msgid' : value.id})}} + {{:helper.link('Delete', 'close', {'PRG_operation' : 'delmessage', 'msgid' : value.id})}} +
+ {{/for}}
+ {{/if}}
+ {{else data.screen==4}}
+
+ + {{:helper.link('Open', 'envelope-o', {'PRG_operation' : 'messagelist', 'msgid' : value.id})}} + {{:helper.link('Delete', 'close', {'PRG_operation' : 'delmessage', 'msgid' : value.id})}} +
Security Level
+ {{:helper.link('Back', 'home', {'PRG_operation' : 'main'})}} +
+
+ {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/nano/templates/computer_fabricator.tmpl b/nano/templates/computer_fabricator.tmpl
new file mode 100644
index 00000000000..b5d80101b70
--- /dev/null
+++ b/nano/templates/computer_fabricator.tmpl
@@ -0,0 +1,82 @@
+{{:helper.link('Clear Order', 'circle', {'action' : 'clean_order'})}}
+
+ Security Level:
+ {{>data.str_security_level}}
+
+
+ Presets:
+
+ {{for data.levels}}
+ {{:helper.link(value.name, 'comment', {'PRG_operation' : 'newalertlevel', 'level' : value.id}, value.id == data.security_level ? 'selected' : null)}}
+ {{/for}}
+
+ +Your new computer device you always dreamed of is just four steps away...
+{{if data.state == 0}} +
+
+{{else data.state == 1}}
+ Step 1: Select your device type
+ {{:helper.link('Laptop', 'laptop', {'action' : 'pick_device', 'pick' : 1})}} + {{:helper.link('Tablet', 'tablet', {'action' : 'pick_device', 'pick' : 2})}} +
+
+
+
+
+
+
+ Battery allows your device to operate without external utility power source. Advanced batteries increase battery life.
+ Hard Drive stores file on your device. Advanced drives can store more files, but use more power, shortening battery life.
+ Network Card allows your device to wirelessly connect to stationwide NTNet network. Basic cards are limited to on-station use, while advanced cards can operate anywhere near the station, which includes the asteroid outposts.
+ Processor Unit is critical for your device's functionality. It allows you to run programs from your hard drive. Advanced CPUs use more power, but allow you to run more programs on background at once.
+ Tesla Relay is an advanced wireless power relay that allows your device to connect to nearby area power controller to provide alternative power source. This component is currently unavailable on tablet computers due to size restrictions.
+ Nano Printer is device that allows for various paperwork manipulations, such as, scanning of documents or printing new ones. This device was certified EcoFriendlyPlus and is capable of recycling existing paper for printing purposes.
+ Card Reader adds a slot that allows you to manipulate RFID cards. Please note that this is not necessary to allow the device to read your identification, it is just necessary to manipulate other cards. +
+{{else data.state == 2}}
+ Step 2: Personalise your device
+| Current Price: + | {{:data.totalprice}}C + | ||
| Battery: + | {{:helper.link('Standard', 'bolt', {'action' : 'hw_battery', 'battery' : 1}, data.hw_battery == 1 ? "selected" : null)}} + | {{:helper.link('Upgraded', 'bolt', {'action' : 'hw_battery', 'battery' : 2}, data.hw_battery == 2 ? "selected" : null)}} + | {{:helper.link('Advanced', 'bolt', {'action' : 'hw_battery', 'battery' : 3}, data.hw_battery == 3 ? "selected" : null)}} + |
| Hard Drive: + | {{:helper.link('Standard', 'hdd-o', {'action' : 'hw_disk', 'disk' : 1}, data.hw_disk == 1 ? "selected" : null)}} + | {{:helper.link('Upgraded', 'hdd-o', {'action' : 'hw_disk', 'disk' : 2}, data.hw_disk == 2 ? "selected" : null)}} + | {{:helper.link('Advanced', 'hdd-o', {'action' : 'hw_disk', 'disk' : 3}, data.hw_disk == 3 ? "selected" : null)}} + |
| Network Card: + | {{:helper.link('None', 'times', {'action' : 'hw_netcard', 'netcard' : 0}, data.hw_netcard == 0 ? "selected" : null)}} + | {{:helper.link('Standard', 'signal', {'action' : 'hw_netcard', 'netcard' : 1}, data.hw_netcard == 1 ? "selected" : null)}} + | {{:helper.link('Advanced', 'signal', {'action' : 'hw_netcard', 'netcard' : 2}, data.hw_netcard == 2 ? "selected" : null)}} + |
| Nano Printer: + | {{:helper.link('None', 'times', {'action' : 'hw_nanoprint', 'print' : 0}, data.hw_nanoprint == 0 ? "selected" : null)}} + | {{:helper.link('Standard', 'print', {'action' : 'hw_nanoprint', 'print' : 1}, data.hw_nanoprint == 1 ? "selected" : null)}} + | |
| Card Reader: + | {{:helper.link('None', 'times', {'action' : 'hw_card', 'card' : 0}, data.hw_card == 0 ? "selected" : null)}} + | {{:helper.link('Standard', 'credit-card', {'action' : 'hw_card', 'card' : 1}, data.hw_card == 1 ? "selected" : null)}} + | |
| Processor Unit: + | {{:helper.link('Standard', 'tasks', {'action' : 'hw_cpu', 'cpu' : 1}, data.hw_cpu == 1 ? "selected" : null)}} + | {{:helper.link('Advanced', 'tasks', {'action' : 'hw_cpu', 'cpu' : 2}, data.hw_cpu == 2 ? "selected" : null)}} + | |
| Tesla Relay: + | {{:helper.link('None', 'times', {'action' : 'hw_tesla', 'tesla' : 0}, data.hw_tesla == 0 ? "selected" : null)}} + | {{:helper.link('Standard', 'plug', {'action' : 'hw_tesla', 'tesla' : 1}, data.hw_tesla == 1 ? "selected" : null)}} + |
| Confirm Order: + | {{:helper.link('CONFIRM', 'check', {'action' : 'confirm_order'})}} + |
+ Battery allows your device to operate without external utility power source. Advanced batteries increase battery life.
+ Hard Drive stores file on your device. Advanced drives can store more files, but use more power, shortening battery life.
+ Network Card allows your device to wirelessly connect to stationwide NTNet network. Basic cards are limited to on-station use, while advanced cards can operate anywhere near the station, which includes the asteroid outposts.
+ Processor Unit is critical for your device's functionality. It allows you to run programs from your hard drive. Advanced CPUs use more power, but allow you to run more programs on background at once.
+ Tesla Relay is an advanced wireless power relay that allows your device to connect to nearby area power controller to provide alternative power source. This component is currently unavailable on tablet computers due to size restrictions.
+ Nano Printer is device that allows for various paperwork manipulations, such as, scanning of documents or printing new ones. This device was certified EcoFriendlyPlus and is capable of recycling existing paper for printing purposes.
+ Card Reader adds a slot that allows you to manipulate RFID cards. Please note that this is not necessary to allow the device to read your identification, it is just necessary to manipulate other cards. +
Step 3: Payment
+ Your device is now ready for fabrication..+ Please swipe your identification card to finish purchase.
+ Total price: {{:data.totalprice}}C +{{else data.state == 3}} +
Step 4: Thank you for your purchase
+ Should you experience any issues with your new device, contact technical support at support@computerservice.nt +{{/if}} \ No newline at end of file diff --git a/nano/templates/computer_main.tmpl b/nano/templates/computer_main.tmpl new file mode 100644 index 00000000000..9aad3d58609 --- /dev/null +++ b/nano/templates/computer_main.tmpl @@ -0,0 +1,9 @@ +No program loaded. Please select program from list below. +
+
+ {{for data.programs}}
+
+
\ No newline at end of file
diff --git a/nano/templates/file_manager.tmpl b/nano/templates/file_manager.tmpl
new file mode 100644
index 00000000000..1bdb0cd95c4
--- /dev/null
+++ b/nano/templates/file_manager.tmpl
@@ -0,0 +1,71 @@
+{{if data.error}}
+ | {{:helper.link(value.desc, null, {'action' : 'PC_runprogram', 'name' : value.name})}} + | {{:helper.link(' |
An error has occurred and this program can not continue.
+ Additional information: {{:data.error}}+ Please try again. If the problem persists contact your system administrator for assistance. + {{:helper.link('Restart program', null, {'action' : 'PRG_closefile'})}} +{{else}} + {{if data.filename}} +
Viewing file {{:data.filename}}
+
+ {{:helper.link('CLOSE', null, {'action' : 'PRG_closefile'})}}
+ {{:helper.link('EDIT', null, {'action' : 'PRG_edit'})}}
+ {{:helper.link('PRINT', null, {'action' : 'PRG_printfile'})}}
+
+ {{:data.filedata}} + {{else}} +
Available files (local):
+
+
+
+
+ {{if data.usbconnected}}
+ | File name | +File type | +File size (GQ) | +Operations | +
|---|---|---|---|
| {{:value.name}} | +.{{:value.type}} | +{{:value.size}}GQ | ++ {{:helper.link('VIEW', 'eye', {'action' : 'PRG_openfile', 'name' : value.name})}} + {{:helper.link('DELETE', 'trash', {'action' : 'PRG_deletefile', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} + {{:helper.link('RENAME', 'pencil', {'action' : 'PRG_rename', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} + {{:helper.link('CLONE', 'files-o', {'action' : 'PRG_clone', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} + {{if data.usbconnected}} + {{:helper.link('EXPORT', 'upload', {'action' : 'PRG_copytousb', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} + {{/if}} + | +
Available files (portable device):
+
+
+
+
+ {{/if}}
+ {{:helper.link('NEW DATA FILE', 'file-text', {'action' : 'PRG_newtextfile'})}}
+ {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/nano/templates/laptop_configuration.tmpl b/nano/templates/laptop_configuration.tmpl
new file mode 100644
index 00000000000..95dd315b90e
--- /dev/null
+++ b/nano/templates/laptop_configuration.tmpl
@@ -0,0 +1,71 @@
+Welcome to computer configuration utility. Please consult your system administrator if you have any questions about your device.| File name | +File type | +File size (GQ) | +Operations | +
|---|---|---|---|
| {{:value.name}} | +.{{:value.type}} | +{{:value.size}}GQ | ++ {{:helper.link('DELETE', 'trash', {'action' : 'PRG_usbdeletefile', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} + {{if data.usbconnected}} + {{:helper.link('IMPORT', 'download', {'action' : 'PRG_copyfromusb', 'name' : value.name}, value.undeletable ? 'disabled' : null)}} + {{/if}} + | +
+
+
+
+Power Supply
+ {{if data.battery}} +
+
+ Battery Status
+ Active
+
+
+ Battery Rating
+ {{:data.battery.max}}
+
+
+ ETA
+ {{:data.eta.hours ? helper.smoothRound(data.eta.hours) + "h " : ""}}{{:data.eta.minutes ? helper.smoothRound(data.eta.minutes) + "m " : ""}}{{:helper.smoothRound(data.eta.seconds)}}s
+
+
+ {{else}}
+ Battery Charge
+ {{:helper.displayBar(data.battery.charge, 0, data.battery.max, (data.battery.charge > data.battery.max/2) ? 'good' : (data.battery.charge > data.battery.max/4) ? 'average' : 'bad')}}
+
+ {{:helper.smoothRound(data.battery.charge, 1)}}/{{:data.battery.max}}
+
+
+
+ {{/if}}
+
+ Battery Status
+ Not Available
+
+
+Power Usage
+ {{:data.power_usage}}W
+
+
+
+File System
+
+
+Used Capacity
+ {{:helper.displayBar(data.disk_used, 0, data.disk_size, (data.disk_used > data.disk_size*0.75) ? 'bad' : (data.disk_used > data.disk_size/2) ? 'average' : 'good')}}
+
+ {{:helper.smoothRound(data.disk_used, 1)}}/{{:data.disk_size}}GQ
+
+
+
+
+ {{/for}} +
\ No newline at end of file
diff --git a/nano/templates/ntnet_chat.tmpl b/nano/templates/ntnet_chat.tmpl
new file mode 100644
index 00000000000..c3f2573f8e2
--- /dev/null
+++ b/nano/templates/ntnet_chat.tmpl
@@ -0,0 +1,58 @@
+{{if data.adminmode}}
+ Computer Components
+ {{for data.hardware}} +{{:value.name}}
+ {{:value.desc}}+
+
+
+ State
+ {{:value.enabled ? "Enabled" : "Disabled"}}
+
+
+
+ {{if !value.critical}}
+ Power Usage
+ {{:value.powerusage}}W
+
+
+ {{/if}}
+ Toggle Component
+ {{:helper.link(value.enabled ? 'On' : 'Off', value.enabled ? 'power-off' : 'close', {'action' : 'PC_toggle_component', 'name' : value.name})}}
+ + {{/for}} +
ADMINISTRATIVE MODE
+{{/if}} + +{{if data.title}} +
+
+ Current channel:
+ {{:data.title}}
+
+
+ Operator access:
+ {{if data.is_operator}}Enabled{{else}}Disabled{{/if}}
+
+
+ Chat Window
+ Controls:
+
+
+
+
+ | {{:helper.link('Send message', 'comment-o', {'action' : 'PRG_speak'})}} + |
| {{:helper.link('Change nickname', 'pencil', {'action' : 'PRG_changename'})}} + |
| {{:helper.link('Toggle administration mode', 'lock', {'action' : 'PRG_toggleadmin'})}} + |
| {{:helper.link('Leave channel', 'sign-out', {'action' : 'PRG_leavechannel'})}} + |
| {{:helper.link('Save log to local drive', 'download', {'action' : 'PRG_savelog'})}} + {{if data.is_operator}} + |
| {{:helper.link('Rename channel', 'pencil', {'action' : 'PRG_renamechannel'})}} + |
| {{:helper.link('Set password', 'key', {'action' : 'PRG_setpassword'})}} + |
| {{:helper.link('Delete channel', 'trash', {'action' : 'PRG_deletechannel'})}} + {{/if}} + |
+
+ Connected Users
+
+
+ {{for data.messages}}
+ {{:value.msg}}
+ {{/for}} +
+ + {{/for}} +
+ {{for data.clients}} + {{:value.name}}
+ {{/for}} +{{else}} + Controls: +
| {{:helper.link('Change nickname', 'pencil', {'action' : 'PRG_changename'})}} + |
| {{:helper.link('New Channel', 'plus', {'action' : 'PRG_newchannel'})}} + |
| {{:helper.link('Toggle administration mode', 'lock', {'action' : 'PRG_toggleadmin'})}} + |
| {{:helper.link(value.chan, 'sign-in', {'action' : 'PRG_joinchannel', 'id' : value.id})}} + {{/for}} + |
+ {{for data.dos_strings}} + {{:value.nums}}
+ {{/for}} + {{:helper.link('ABORT', 'ban', {'action' : 'PRG_reset'})}} +{{else}} + ##DoS traffic generator ready. Select target device.
+
+
+ Targeted device ID:
+ {{if data.focus}}{{:data.focus}}{{else}}None{{/if}}
+
+ {{:helper.link('EXECUTE', 'play', {'action' : 'PRG_execute'})}}
+
+ Detected devices on network:+
| {{:helper.link(value.id, null, {'action' : 'PRG_target_relay', 'targid' : value.id})}} + {{/for}} + |
+{{if data.error}} +
Download Error
+
+
+ Information
+ {{:data.error}}
+
+
+{{else}}
+ {{if data.downloadname}}
+ Reset Program
+ {{:helper.link('RESET', 'times', {'action' : 'PRG_reseterror'})}}
+ Download Running
+
+ Please wait...
+
+ {{else}}
+
+
+ File name
+ {{:data.downloadname}}
+
+
+ File description
+ {{:data.downloaddesc}}
+
+
+ File size
+ {{:helper.smoothRound(data.downloadcompletion, 1)}}/{{:data.downloadsize}}GQ
+
+
+ Transfer Rate
+ {{:data.downloadspeed}} GQ/s
+
+
+ Download progress
+ {{:helper.displayBar(data.downloadcompletion, 0, data.downloadsize, (data.downloadcompletion > data.downloadsize/2) ? 'good' : (data.downloadcompletion > data.downloadsize/4) ? 'average' : 'bad')}}
+
+ {{:helper.smoothRound(data.downloadcompletion, 1)}}/{{:data.downloadsize}}GQ
+
+ Primary software repository
+
+
+
+ {{if data.hackedavailable}}
+
+
+ {{for data.downloadable_programs}}
+ Hard drive
+ {{:helper.displayBar(data.disk_used, 0, data.disk_size, (data.disk_used > data.disk_size/2) ? 'bad' : (data.disk_used > data.disk_size/4) ? 'average' : 'good')}}
+
+ {{:helper.smoothRound(data.disk_used, 1)}}/{{:data.disk_size}}GQ
+
+ +
+
+ File name
+ {{:value.filename}} ({{:value.size}} GQ)
+
+
+ Program name
+ {{:value.filedesc}}
+
+
+ Description
+ {{:value.fileinfo}}
+
+
+ Compatibility
+ {{:value.compatibility}}
+
+
+ {{/for}}
+ File controls
+ {{:helper.link('DOWNLOAD', 'download', {'action' : 'PRG_downloadfile', 'filename' : value.filename}, value.status)}}
+ UNKNOWN software repository
+
+ Please note that NanoTrasen does not recommend download of software from non-official servers.
+ {{for data.hacked_programs}}
+
+
+ {{/if}}
+ {{/if}}
+{{/if}}
++
+
+ File name
+ {{:value.filename}} ({{:value.size}} GQ)
+
+
+ Program name
+ {{:value.filedesc}}
+
+
+ Description
+ {{:value.fileinfo}}
+
+
+ {{/for}}
+ File controls
+ {{:helper.link('DOWNLOAD', 'download', {'action' : 'PRG_downloadfile', 'filename' : value.filename})}}
+ NTOS v2.0.4b Copyright NanoTrasen 2557 - 2559 \ No newline at end of file diff --git a/nano/templates/ntnet_monitor.tmpl b/nano/templates/ntnet_monitor.tmpl new file mode 100644 index 00000000000..319baa872f0 --- /dev/null +++ b/nano/templates/ntnet_monitor.tmpl @@ -0,0 +1,102 @@ +
WIRELESS CONNECTIVITY
+
+
+
+
+ Active NTNet Relays:
+
+
+ {{:data.ntnetrelays}}
+
+ {{if data.ntnetrelays}}
+
+
+
+ System status:
+
+
+ {{:data.ntnetstatus ? "ENABLED" : "DISABLED"}}
+
+
+
+ Caution - Disabling wireless transmitters when using wireless device may prevent you from re-enabling them again!
+ {{else}}
+
+ Control:
+
+
+ {{:helper.link('TOGGLE', null, {'action' : 'toggleWireless'})}}
+
+ Wireless coverage unavailable, no relays are connected.
+ {{/if}} +FIREWALL CONFIGURATION
+
+
+
+
+
+| PROTOCOL | +STATUS | +CONTROL | +
|---|---|---|
| Software Downloads | +{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 1})}} |
+ |
| Peer to Peer Traffic | +{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 2})}} |
+ |
| Communication Systems | +{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 3})}} |
+ |
| Remote System Control | +{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 4})}} |
+
SECURITY SYSTEMS
+{{if data.idsalarm}} +
+
+{{/if}}
+
+
+
+
+ NETWORK INCURSION DETECTED
+ An abnormal activity has been detected in the network. Please verify system logs for more information +
+
+Intrusion Detection System:
+ {{:data.idsstatus ? 'ENABLED' : 'DISABLED'}}
+
+
+Maximal Log Count:
+ {{:data.ntnetmaxlogs}}
+
+
+System Logs
+Controls:
+
+
+
+
+| {{:helper.link('RESET IDS', null, {'action' : 'resetIDS'})}} + |
| {{:helper.link('TOGGLE IDS', null, {'action' : 'toggleIDS'})}} + |
| {{:helper.link('SET LOG LIMIT', null, {'action' : 'updatemaxlogs'})}} + |
| {{:helper.link('PURGE LOGS', null, {'action' : 'purgelogs'})}} + |
+
\ No newline at end of file
diff --git a/nano/templates/ntnet_relay.tmpl b/nano/templates/ntnet_relay.tmpl
new file mode 100644
index 00000000000..8625f94dd14
--- /dev/null
+++ b/nano/templates/ntnet_relay.tmpl
@@ -0,0 +1,19 @@
+
+
+
+ {{for data.ntnetlogs}}
+ {{:value.entry}}
+ {{/for}} +
+ + {{/for}} +
Relay
+{{if data.dos_crashed}} +NETWORK BUFFERS OVERLOADED
+Overload Recovery Mode
+ This system is suffering temporary outage due to overflow of traffic buffers. Until buffered traffic is processed, all further requests will be dropped. Frequent occurences of this error may indicate insufficient hardware capacity of your network. Please contact your network planning department for instructions on how to resolve this issue. +ADMINISTRATIVE OVERRIDE
+ CAUTION - Data loss may occur + {{:helper.link('Purge buffered traffic', 'signal', {'action' : 'restart'})}} +{{else}} +
+
+
+ Relay status
+ {{:helper.link(data.enabled ? "ENABLED" : "DISABLED", 'power-off', {'action' : 'toggle'})}}
+
+
+{{/if}}
\ No newline at end of file
diff --git a/nano/templates/ntnet_transfer.tmpl b/nano/templates/ntnet_transfer.tmpl
new file mode 100644
index 00000000000..660838b94dc
--- /dev/null
+++ b/nano/templates/ntnet_transfer.tmpl
@@ -0,0 +1,77 @@
+{{if data.error}}
+ Network buffer status
+ {{:data.dos_overload}}/{{:data.dos_capacity}} GQ
+
+
+ {{:helper.link('Clear', null, {'action' : 'PRG_reset'})}} +
+{{else data.downloading}}
+ An error has occurred during operation...
+ Additional information: {{:data.error}}+ {{:helper.link('Clear', null, {'action' : 'PRG_reset'})}} +
Download in progress...
+
+
+ Downloaded file:
+ {{:data.download_name}}
+
+
+ Download progress:
+ {{:helper.smoothRound(data.download_progress)}}/{{:data.download_size}}GQ
+
+
+ Transfer speed:
+ {{:data.download_netspeed}}GQ/s
+
+
+{{else data.uploading}}
+ Controls:
+ {{:helper.link('Abort download', 'arrow-left', {'action' : 'PRG_reset'})}}
+ Server enabled
+
+
+ Connected clients:
+ {{:data.upload_clients}}
+
+
+ Provided file:
+ {{:data.upload_filename}}
+
+
+ Server password:
+ {{if data.upload_haspassword}}ENABLED{{else}}DISABLED{{/if}}
+
+
+{{else data.upload_filelist}}
+ Commands:
+
+ {{:helper.link('Set password', 'key', {'action' : 'PRG_setpassword'})}}
+ {{:helper.link('Exit server', 'arrow-left', {'action' : 'PRG_reset'})}}
+
+ File transfer server ready. Select file to upload:
+| File name | File size | Controls + {{for data.upload_filelist}} + |
|---|---|---|
| {{:value.filename}} + | {{:value.size}}GQ + | {{:helper.link('Select', 'upload', {'action' : 'PRG_uploadfile', 'id' : value.uid})}} + {{/for}} + |
+ {{:helper.link('Set password', 'key', {'action' : 'PRG_setpassword'})}} + {{:helper.link('Return', 'arrow-left', {'action' : 'PRG_reset'})}} +{{else}} +
Available files:
+| Server UID | File Name | File Size | Password Protection | Operations + {{for data.servers}} + | |
|---|---|---|---|---|---|
| {{:value.uid}} + | {{:value.filename}} + | {{:value.size}}GQ + {{if value.haspassword}} + | Enabled + {{else}} + | Disabled + {{/if}} + + | {{:helper.link('Download', 'download', {'action' : 'PRG_downloadfile', 'id' : value.uid})}} + {{/for}} + |
+ {{:helper.link('Send file', 'upload', {'action' : 'PRG_uploadmenu'})}} +{{/if}} \ No newline at end of file diff --git a/nano/templates/revelation.tmpl b/nano/templates/revelation.tmpl new file mode 100644 index 00000000000..5412c440caa --- /dev/null +++ b/nano/templates/revelation.tmpl @@ -0,0 +1,23 @@ +{{:helper.syndicateMode()}} +
+
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index f678cc2865e..c0fe429cc82 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1221,7 +1221,6 @@
#include "code\modules\computer3\computer3_notes.dm"
#include "code\modules\computer3\file.dm"
#include "code\modules\computer3\laptop.dm"
-#include "code\modules\computer3\lapvend.dm"
#include "code\modules\computer3\networking.dm"
#include "code\modules\computer3\NTOS.dm"
#include "code\modules\computer3\program.dm"
@@ -1759,6 +1758,50 @@
#include "code\modules\mob\new_player\poll.dm"
#include "code\modules\mob\new_player\preferences_setup.dm"
#include "code\modules\mob\new_player\sprite_accessories.dm"
+#include "code\modules\modular_computers\laptop_vendor.dm"
+#include "code\modules\modular_computers\computers\item\computer.dm"
+#include "code\modules\modular_computers\computers\item\computer_components.dm"
+#include "code\modules\modular_computers\computers\item\computer_damage.dm"
+#include "code\modules\modular_computers\computers\item\computer_power.dm"
+#include "code\modules\modular_computers\computers\item\computer_ui.dm"
+#include "code\modules\modular_computers\computers\item\laptop.dm"
+#include "code\modules\modular_computers\computers\item\laptop_presets.dm"
+#include "code\modules\modular_computers\computers\item\processor.dm"
+#include "code\modules\modular_computers\computers\item\tablet.dm"
+#include "code\modules\modular_computers\computers\item\tablet_presets.dm"
+#include "code\modules\modular_computers\computers\machinery\console_presets.dm"
+#include "code\modules\modular_computers\computers\machinery\modular_computer.dm"
+#include "code\modules\modular_computers\computers\machinery\modular_console.dm"
+#include "code\modules\modular_computers\file_system\computer_file.dm"
+#include "code\modules\modular_computers\file_system\data.dm"
+#include "code\modules\modular_computers\file_system\program.dm"
+#include "code\modules\modular_computers\file_system\program_events.dm"
+#include "code\modules\modular_computers\file_system\programs\antagonist\dos.dm"
+#include "code\modules\modular_computers\file_system\programs\antagonist\revelation.dm"
+#include "code\modules\modular_computers\file_system\programs\command\card.dm"
+#include "code\modules\modular_computers\file_system\programs\command\comms.dm"
+#include "code\modules\modular_computers\file_system\programs\engineering\alarm.dm"
+#include "code\modules\modular_computers\file_system\programs\engineering\power_monitor.dm"
+#include "code\modules\modular_computers\file_system\programs\generic\configurator.dm"
+#include "code\modules\modular_computers\file_system\programs\generic\file_browser.dm"
+#include "code\modules\modular_computers\file_system\programs\generic\ntdownloader.dm"
+#include "code\modules\modular_computers\file_system\programs\generic\ntnrc_client.dm"
+#include "code\modules\modular_computers\file_system\programs\generic\nttransfer.dm"
+#include "code\modules\modular_computers\file_system\programs\research\airestorer.dm"
+#include "code\modules\modular_computers\file_system\programs\research\ntmonitor.dm"
+#include "code\modules\modular_computers\hardware\_hardware.dm"
+#include "code\modules\modular_computers\hardware\ai_slot.dm"
+#include "code\modules\modular_computers\hardware\battery_module.dm"
+#include "code\modules\modular_computers\hardware\card_slot.dm"
+#include "code\modules\modular_computers\hardware\CPU.dm"
+#include "code\modules\modular_computers\hardware\hard_drive.dm"
+#include "code\modules\modular_computers\hardware\network_card.dm"
+#include "code\modules\modular_computers\hardware\portable_disk.dm"
+#include "code\modules\modular_computers\hardware\printer.dm"
+#include "code\modules\modular_computers\hardware\recharger.dm"
+#include "code\modules\modular_computers\NTNet\NTNet.dm"
+#include "code\modules\modular_computers\NTNet\NTNet_relay.dm"
+#include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm"
#include "code\modules\nano\nanoexternal.dm"
#include "code\modules\nano\nanomanager.dm"
#include "code\modules\nano\nanomapgen.dm"
@@ -1975,6 +2018,7 @@
#include "code\modules\research\designs\biogenerator_designs.dm"
#include "code\modules\research\designs\bluespace_designs.dm"
#include "code\modules\research\designs\comp_board_designs.dm"
+#include "code\modules\research\designs\computer_part_designs.dm"
#include "code\modules\research\designs\equipment_designs.dm"
#include "code\modules\research\designs\janitorial_designs.dm"
#include "code\modules\research\designs\machine_designs.dm"
+ Payload status:
+
+
+ {{if data.armed}}
+ ARMED
+ {{else}}
+ DISARMED
+ {{/if}}
+
+
+ Controls:
+
+
+
+
+
+| {{:helper.link('OBFUSCATE PROGRAM NAME', 'eye-slash', {'action' : 'PRG_obfuscate'})}} + |
| {{:helper.link(data.armed ? 'DISARM' : 'ARM', data.armed ? 'crosshairs' : 'info', {'action' : 'PRG_arm'})}} + {{:helper.link('ACTIVATE', 'exclamation-triangle', {'action' : 'PRG_activate'}, data.armed ? null : 'disabled', data.armed ? 'redButton' : null)}} + |