working code?

code/__DEFINES/colors.dm

@@ -2,19 +2,6 @@
 
 #define COLOR_INPUT_DISABLED "#F0F0F0"
 #define COLOR_INPUT_ENABLED "#D3B5B5"
-
-#define COLOR_DARKMODE_INFO_BUTTONS_BG "#40628A"
-#define COLOR_DARKMODE_ISSUE_BUTTON_BG "#A92C2C"
-#define COLOR_DARKMODE_BACKGROUND "#272727"
-#define COLOR_DARKMODE_DARKBACKGROUND "#242424"
-#define COLOR_DARKMODE_TEXT "#E0E0E0"
-
-#define COLOR_WHITEMODE_INFO_BUTTONS_BG "#90B3DD"
-#define COLOR_WHITEMODE_ISSUE_BUTTON_BG "#EF7F7F"
-#define COLOR_WHITEMODE_BACKGROUND "#F0F0F0"
-#define COLOR_WHITEMODE_DARKBACKGROUND "#E6E6E6"
-#define COLOR_WHITEMODE_TEXT "#000000"
-
 #define COLOR_FLOORTILE_GRAY   "#8D8B8B"
 #define COLOR_ALMOST_BLACK	   "#333333"
 #define COLOR_BLACK            "#000000"
@@ -64,4 +51,4 @@
 #define COLOR_ASSEMBLY_LBLUE   "#5D99BE"
 #define COLOR_ASSEMBLY_BLUE    "#38559E"
 #define COLOR_ASSEMBLY_PURPLE  "#6F6192"
-#define COLOR_ASSEMBLY_PINK    "#ff4adc"
+#define COLOR_ASSEMBLY_PINK    "#ff4adc"

code/__DEFINES/machines.dm

@@ -41,11 +41,13 @@
 #define MC_HDD "HDD"
 #define MC_SDD "SDD"
 #define MC_CARD "CARD"
+#define MC_CARD2 "CARD2"
 #define MC_NET "NET"
 #define MC_PRINT "PRINT"
 #define MC_CELL "CELL"
 #define MC_CHARGE "CHARGE"
 #define MC_AI "AI"
+#define MC_SENSORS "SENSORS"
 
 //NTNet stuff, for modular computers
 									// NTNet module-configuration values. Do not change these. If you need to add another use larger number (5..6..7 etc)

code/datums/components/ntnet_interface.dm

@@ -1,4 +1,4 @@
-//Thing meant for allowing datums and objects to access a NTnet network datum.
+//Thing meant for allowing datums and objects to access an NTnet network datum.
 /datum/proc/ntnet_receive(datum/netdata/data)
 	return
 
@@ -39,8 +39,6 @@
 		parent.ntnet_receive(data)
 
 /datum/component/ntnet_interface/proc/__network_send(datum/netdata/data, netid)			//Do not directly proccall!
-	// Process data before sending it
-	data.pre_send(src)
 
 	if(netid)
 		if(networks_connected_by_id[netid])

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -9,20 +9,6 @@
 	if(registered_name)
 		. += "<span class='notice'>The display reads, \"Owned by [registered_name]\".</span>"
 
-/obj/structure/closet/secure_closet/personal/check_access(obj/item/I)
-	. = ..()
-	if(!I || !istype(I))
-		return
-	if(istype(I,/obj/item/modular_computer/tablet))
-		var/obj/item/modular_computer/tablet/ourTablet = I
-		var/obj/item/computer_hardware/card_slot/card_slot = ourTablet.all_components[MC_CARD]
-		if(card_slot)
-			return registered_name == card_slot.stored_card.registered_name || registered_name == card_slot.stored_card2.registered_name
-	var/obj/item/card/id/ID = I.GetID()
-	if(ID && registered_name == ID.registered_name)
-		return TRUE
-	return FALSE
-
 /obj/structure/closet/secure_closet/personal/PopulateContents()
 	..()
 	if(prob(50))
@@ -54,15 +40,24 @@
 
 /obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
 	var/obj/item/card/id/I = W.GetID()
-	if(!I || !istype(I))
-		return ..()
-	if(!can_lock(user, FALSE)) //Can't do anything if there isn't a lock!
-		return
-	if(I.registered_name && !registered_name)
-		to_chat(user, "<span class='notice'>You claim [src].</span>")
-		registered_name = I.registered_name
+	if(istype(I))
+		if(broken)
+			to_chat(user, "<span class='danger'>It appears to be broken.</span>")
+			return
+		if(!I || !I.registered_name)
+			return
+		if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name)))
+			//they can open all lockers, or nobody owns this, or they own this locker
+			locked = !locked
+			update_icon()
+
+			if(!registered_name)
+				registered_name = I.registered_name
+				desc = "Owned by [I.registered_name]."
+		else
+			to_chat(user, "<span class='danger'>Access Denied.</span>")
 	else
-		..()
+		return ..()
 
 /obj/structure/closet/secure_closet/personal/handle_lock_addition() //If lock construction is successful we don't care what access the electronics had, so we override it
 	if(..())

code/modules/mob/living/carbon/human/human_helpers.dm

@@ -75,12 +75,8 @@
 		. = pda.owner
 	else if(istype(tablet))
 		var/obj/item/computer_hardware/card_slot/card_slot = tablet.all_components[MC_CARD]
-		if(card_slot && (card_slot.stored_card2 || card_slot.stored_card))
-			if(card_slot.stored_card2) //The second card is the one used for authorization in the ID changing program, so we prioritize it here for consistency
-				. = card_slot.stored_card2.registered_name
-			else
-				if(card_slot.stored_card)
-					. = card_slot.stored_card.registered_name
+		if(card_slot?.stored_card)
+			. = card_slot.stored_card.registered_name
 	if(!.)
 		. = if_no_id	//to prevent null-names making the mob unclickable
 	return

code/modules/modular_computers/computers/item/computer.dm

@@ -6,7 +6,7 @@
 	desc = "A small portable microcomputer."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "laptop-open"
-	light_on = FALSE
+	var/light_on = FALSE
 	integrity_failure = 0.5
 	max_integrity = 100
 	armor = list("melee" = 0, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
@@ -130,7 +130,7 @@
 		return
 	if(enabled)
 		ui_interact(user)
-	else if(isAdminGhostAI(user))
+	else if(IsAdminGhost(user))
 		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)

code/modules/modular_computers/computers/item/tablet_presets.dm

@@ -30,7 +30,7 @@
 	install_component(new /obj/item/computer_hardware/network_card)
 	install_component(new /obj/item/computer_hardware/printer/mini)
 	hard_drive.store_file(new /datum/computer_file/program/bounty)
-	hard_drive.store_file(new /datum/computer_file/program/shipping)
+	//hard_drive.store_file(new /datum/computer_file/program/shipping)
 
 /obj/item/modular_computer/tablet/preset/advanced/atmos/Initialize() //This will be defunct and will be replaced when NtOS PDAs are done
 	. = ..()

code/modules/modular_computers/file_system/programs/atmosscan.dm

@@ -21,16 +21,16 @@
 	var/obj/item/computer_hardware/sensorpackage/sensors = computer?.get_modular_computer_part(MC_SENSORS)
 	if(T && sensors?.check_functionality())
 		var/datum/gas_mixture/environment = T.return_air()
-		var/list/env_gases = environment.gases
+		var/list/env_gases = environment.get_gases()
 		var/pressure = environment.return_pressure()
 		var/total_moles = environment.total_moles()
 		data["AirPressure"] = round(pressure,0.1)
-		data["AirTemp"] = round(environment.temperature-T0C)
+		data["AirTemp"] = round(environment.return_temperature()-T0C)
 		if (total_moles)
 			for(var/id in env_gases)
-				var/gas_level = env_gases[id][MOLES]/total_moles
+				var/gas_level = environment.get_moles(id)/total_moles
 				if(gas_level > 0)
-					airlist += list(list("name" = "[env_gases[id][GAS_META][META_GAS_NAME]]", "percentage" = round(gas_level*100, 0.01)))
+					airlist += list(list("name" = "[GLOB.meta_gas_names[id]]", "percentage" = round(gas_level*100, 0.01)))
 		data["AirData"] = airlist
 	else
 		data["AirPressure"] = 0

code/modules/modular_computers/file_system/programs/borg_monitor.dm

@@ -31,7 +31,7 @@
 
 		var/list/cyborg_data = list(
 			name = R.name,
-			locked_down = R.lockcharge,
+			locked_down = R.locked_down,
 			status = R.stat,
 			shell_discon = shell,
 			charge = R.cell ? round(R.cell.percent()) : null,

code/modules/modular_computers/file_system/programs/sm_monitor.dm

@@ -69,7 +69,7 @@
 		data["active"] = TRUE
 		data["SM_integrity"] = active.get_integrity()
 		data["SM_power"] = active.power
-		data["SM_ambienttemp"] = air.temperature
+		data["SM_ambienttemp"] = air.return_temperature()
 		data["SM_ambientpressure"] = air.return_pressure()
 		//data["SM_EPR"] = round((air.total_moles / air.group_multiplier) / 23.1, 0.01)
 		var/list/gasdata = list()

code/modules/modular_computers/laptop_vendor.dm

@@ -224,7 +224,7 @@
 	return FALSE
 
 /obj/machinery/lapvend/ui_interact(mob/user, datum/tgui/ui)
-	if(machine_stat & (BROKEN | NOPOWER | MAINT))
+	if(stat & (BROKEN | NOPOWER | MAINT))
 		if(ui)
 			ui.close()
 		return FALSE

interface/stylesheet.dm

@@ -26,6 +26,8 @@ em						{font-style: normal;	font-weight: bold;}
 .prefix					{					font-weight: bold;}
 
 .ooc					{					font-weight: bold;}
+.looc					{color: #6699CC;	font-weight: bold;}
+.antagooc				{color: #b8002e;	font-weight: bold;}
 .adminobserverooc		{color: #0099cc;	font-weight: bold;}
 .adminooc				{color: #700038;	font-weight: bold;}
 
@@ -33,6 +35,9 @@ em						{font-style: normal;	font-weight: bold;}
 .adminsay				{color:	#FF4500;	font-weight: bold;}
 .admin					{color: #386aff;	font-weight: bold;}
 
+.mentorsay				{color: #E236D8;	font-weight: bold;}
+.mentorsay_admin		{color: #8A2BE2;	font-weight: bold;}
+
 .name					{					font-weight: bold;}
 
 .say					{}

modular_citadel/code/modules/mentor/mentorsay.dm

@@ -13,7 +13,7 @@
 	log_mentor("MSAY: [key_name(src)] : [msg]")
 
 	if(check_rights_for(src, R_ADMIN,0))
-		msg = "<b><font color ='#8A2BE2'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b>"
+		msg = "<span class='mentorsay_admin filter_MSAY'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></span>"
 	else
-		msg = "<b><font color ='#E236D8'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b>"
-	to_chat(GLOB.admins | GLOB.mentors, msg)
+		msg = "<span class='mentorsay filter_MSAY'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></span>"
+	to_chat(GLOB.admins | GLOB.mentors, msg)

tgstation.dme

@@ -1850,7 +1850,6 @@
 #include "code\modules\client\client_colour.dm"
 #include "code\modules\client\client_defines.dm"
 #include "code\modules\client\client_procs.dm"
-#include "code\modules\client\darkmode.dm"
 #include "code\modules\client\message.dm"
 #include "code\modules\client\player_details.dm"
 #include "code\modules\client\preferences.dm"
@@ -2768,6 +2767,7 @@
 #include "code\modules\modular_computers\file_system\programs\alarm.dm"
 #include "code\modules\modular_computers\file_system\programs\arcade.dm"
 #include "code\modules\modular_computers\file_system\programs\atmosscan.dm"
+#include "code\modules\modular_computers\file_system\programs\borg_monitor.dm"
 #include "code\modules\modular_computers\file_system\programs\card.dm"
 #include "code\modules\modular_computers\file_system\programs\cargobounty.dm"
 #include "code\modules\modular_computers\file_system\programs\configurator.dm"
@@ -2794,6 +2794,7 @@
 #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\hardware\sensor_package.dm"
 #include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm"
 #include "code\modules\movespeed\_movespeed_modifier.dm"
 #include "code\modules\movespeed\modifiers\components.dm"

tgui/packages/tgui-panel/chat/constants.js

@@ -60,6 +60,18 @@ export const MESSAGE_TYPES = [
     description: 'The bluewall of global OOC messages',
     selector: '.filter_ooc, .ooc, .adminooc',
   },
+  {
+    type: 'looc',
+    name: 'LOOC',
+    description: 'Local OOC Chat. Less of a bluewall',
+    selector: '.filter_looc, .looc',
+  },
+  {
+    type: 'antagooc',
+    name: 'AOOC',
+    description: 'Antag OOC Chat.',
+    selector: '.filter_aooc, .antagooc',
+  },
   {
     type: 'adminpm',
     name: 'Admin PMs',
@@ -77,6 +89,13 @@ export const MESSAGE_TYPES = [
     name: 'Unsorted',
     description: 'Everything we could not sort, always enabled',
   },
+  // Semi-admin stuff.
+  {
+    type: 'mentorchat',
+    name: 'Mentor Chat',
+    description: 'Mhelp how do i not die?',
+    selector: '.filter_MSAY, .mentor_channel',
+  },
   // Admin stuff
   {
     type: 'adminchat',
@@ -85,6 +104,7 @@ export const MESSAGE_TYPES = [
     selector: '.filter_ASAY, .admin_channel',
     admin: true,
   },
+  /*
   {
     type: 'modchat',
     name: 'Mod Chat',
@@ -92,6 +112,7 @@ export const MESSAGE_TYPES = [
     selector: '.filter_MSAY, .mod_channel',
     admin: true,
   },
+  */
   {
     type: 'eventchat',
     name: 'Event Chat',

tgui/packages/tgui-panel/styles/goon/chat-dark.scss

@@ -286,6 +286,16 @@ em {
   font-weight: bold;
 }
 
+.looc {
+  color: #6699CC;
+  font-weight: bold;
+}
+
+.antagooc {
+  color: #b8002e;
+  font-weight: bold;
+}
+
 .adminobserverooc {
   color: #0099cc;
   font-weight: bold;
@@ -312,6 +322,17 @@ em {
   font-weight: bold;
 }
 
+/* cit-specific mentorsay*/
+.mentorsay {
+  color: #E236D8;
+  font-weight: bold;
+}
+
+.mentorsay_admin {
+  color: #8A2BE2;
+  font-weight: bold;
+}
+
 .name {
   font-weight: bold;
 }

tgui/packages/tgui-panel/styles/goon/chat-light.scss

@@ -282,6 +282,16 @@ em {
   font-weight: bold;
 }
 
+.looc {
+  color: #6699CC;
+  font-weight: bold;
+}
+
+.antagooc {
+  color: #b8002e;
+  font-weight: bold;
+}
+
 .adminobserverooc {
   color: #0099cc;
   font-weight: bold;
@@ -308,6 +318,17 @@ em {
   font-weight: bold;
 }
 
+/* cit-specific mentorsay*/
+.mentorsay {
+  color: #E236D8;
+  font-weight: bold;
+}
+
+.mentorsay_admin {
+  color: #8A2BE2;
+  font-weight: bold;
+}
+
 .name {
   font-weight: bold;
 }

tgui/packages/tgui-panel/themes.js

@@ -4,11 +4,11 @@
  * @license MIT
  */
 
-export const THEMES = ['light', 'dark'];
+export const THEMES = ['light', 'dark', 'default'];
 
 const COLOR_DARK_BG = '#202020';
 const COLOR_DARK_BG_DARKER = '#171717';
-const COLOR_DARK_TEXT = '#a4bad6';
+const COLOR_DARK_TEXT = 'E0E0E0'; // '#a4bad6';
 
 /**
  * Darkmode preference, originally by Kmc2000.
@@ -35,18 +35,18 @@ export const setClientTheme = name => {
       'mainwindow.background-color': 'none',
       'split.background-color': 'none',
       // Buttons
-      'changelog.background-color': 'none',
-      'changelog.text-color': '#000000',
-      'rules.background-color': 'none',
-      'rules.text-color': '#000000',
-      'wiki.background-color': 'none',
-      'wiki.text-color': '#000000',
-      'forum.background-color': 'none',
-      'forum.text-color': '#000000',
-      'github.background-color': 'none',
-      'github.text-color': '#000000',
-      'report-issue.background-color': 'none',
-      'report-issue.text-color': '#000000',
+      'changelog.background-color': '#90B3DD',
+      'changelog.text-color': '#EF7F7F',
+      'rules.background-color': '#90B3DD',
+      'rules.text-color': '#EF7F7F',
+      'wiki.background-color': '#90B3DD',
+      'wiki.text-color': '#EF7F7F',
+      'forum.background-color': '#90B3DD',
+      'forum.text-color': '#EF7F7F',
+      'github.background-color': '#90B3DD',
+      'github.text-color': '#EF7F7F',
+      'report-issue.background-color': '#90B3DD',
+      'report-issue.text-color': '#EF7F7F',
       // Status and verb tabs
       'output.background-color': 'none',
       'output.text-color': '#000000',
@@ -85,17 +85,17 @@ export const setClientTheme = name => {
       'mainwindow.background-color': COLOR_DARK_BG,
       'split.background-color': COLOR_DARK_BG,
       // Buttons
-      'changelog.background-color': '#494949',
+      'changelog.background-color': '#40628A',
       'changelog.text-color': COLOR_DARK_TEXT,
-      'rules.background-color': '#494949',
+      'rules.background-color': '#40628A',
       'rules.text-color': COLOR_DARK_TEXT,
-      'wiki.background-color': '#494949',
+      'wiki.background-color': '#40628A',
       'wiki.text-color': COLOR_DARK_TEXT,
-      'forum.background-color': '#494949',
+      'forum.background-color': '#40628A',
       'forum.text-color': COLOR_DARK_TEXT,
-      'github.background-color': '#3a3a3a',
+      'github.background-color': '#40628A',
       'github.text-color': COLOR_DARK_TEXT,
-      'report-issue.background-color': '#492020',
+      'report-issue.background-color': '#40628A',
       'report-issue.text-color': COLOR_DARK_TEXT,
       // Status and verb tabs
       'output.background-color': COLOR_DARK_BG_DARKER,
@@ -121,4 +121,7 @@ export const setClientTheme = name => {
       'tooltip.text-color': COLOR_DARK_TEXT,
     });
   }
+  if (name === 'default') {
+    setClientTheme('light'); // absolute cheeze.
+  }
 };