diff --git a/code/game/objects/structures/machinery/mecha_fabricator.dm b/code/game/objects/structures/machinery/mecha_fabricator.dm
index 645cf90dd78..86de54055a4 100644
--- a/code/game/objects/structures/machinery/mecha_fabricator.dm
+++ b/code/game/objects/structures/machinery/mecha_fabricator.dm
@@ -57,6 +57,10 @@
. += "- Upgraded manipulators will improve material use efficiency."
. += SPAN_NOTICE(" - The current cost reduction is [round((1 - mat_efficiency) * 100)]%")
+/obj/structure/machinery/mecha_part_fabricator/antagonist_hints(mob/user, distance, is_adjacent)
+ . += ..()
+ . += "Click-drag someone with long hair onto this machine to start feeding it their hair! This will hurt and piss them off!"
+
/obj/structure/machinery/mecha_part_fabricator/Initialize()
. = ..()
@@ -64,6 +68,7 @@
fab_loop = new(src)
limb_manufacturer = GLOB.basic_robolimb.company
update_categories()
+ update_icon()
/// Make sure the machine starts the round properly synced.
/obj/structure/machinery/mecha_part_fabricator/LateInitialize()
diff --git a/code/modules/modular_computers/computers/subtypes/dev_silicon.dm b/code/modules/modular_computers/computers/subtypes/dev_silicon.dm
index bfa09170fb8..7b12be5bfec 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_silicon.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_silicon.dm
@@ -29,6 +29,12 @@
return INITIALIZE_HINT_QDEL
. = ..()
+/// Yes- they're computers. They're electronic. However, we don't want to disassemble a
+/// computer in a silicon's var/list/contents- let the silicon just be fucked up normally.
+/obj/item/modular_computer/silicon/emp_act(severity)
+ SHOULD_CALL_PARENT(FALSE)
+ return
+
/obj/item/modular_computer/silicon/Destroy()
computer_host = null
. = ..()
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index e5e3052993e..ff1aad572c3 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -30,6 +30,7 @@
/obj/item/gun/energy/gun/mounted
name = "mounted energy gun"
+ desc_extended = null
self_recharge = TRUE
use_external_power = TRUE
can_turret = FALSE
@@ -37,6 +38,7 @@
/obj/item/gun/energy/gun/nuclear
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized reactor."
+ desc_extended = null
icon = 'icons/obj/guns/nucgun.dmi'
icon_state = "nucgun"
item_state = "nucgun"
@@ -259,6 +261,7 @@
)
ABSTRACT_TYPE(/obj/item/gun/energy/gun/skrell)
+ desc_extended = null
self_recharge = TRUE
fire_sound = 'sound/weapons/Laser2.ogg'
modifystate = null
diff --git a/code/modules/tgui/modules/hivenet_manifest.dm b/code/modules/tgui/modules/hivenet_manifest.dm
index b27d296b5e1..d9b1b3753cb 100644
--- a/code/modules/tgui/modules/hivenet_manifest.dm
+++ b/code/modules/tgui/modules/hivenet_manifest.dm
@@ -38,9 +38,9 @@
klax_vaurca += vaurca_to_data(vaurca)
data["all_vaurca"] = list(
- "Zo'ra" = list("vaurca" = sort_vaurca_list(zora_vaurca), "color" = "Security"),
- "C'thur" = list("vaurca" = sort_vaurca_list(cthur_vaurca), "color" = "Command"),
- "K'lax" = list("vaurca" = sort_vaurca_list(klax_vaurca), "color" = "Medical")
+ "Zo'ra" = list("vaurca" = sort_vaurca_list(zora_vaurca), "color" = "red"),
+ "C'thur" = list("vaurca" = sort_vaurca_list(cthur_vaurca), "color" = "violet"),
+ "K'lax" = list("vaurca" = sort_vaurca_list(klax_vaurca), "color" = "gold")
)
return data
diff --git a/html/changelogs/Bat-BugsBugsBugs.yml b/html/changelogs/Bat-BugsBugsBugs.yml
new file mode 100644
index 00000000000..778ac700e47
--- /dev/null
+++ b/html/changelogs/Bat-BugsBugsBugs.yml
@@ -0,0 +1,8 @@
+author: Batrachophrenoboocosmomachia
+delete-after: True
+changes:
+ - bugfix: "Fixes Mechatronic Fabricator's emissive overlay."
+ - bugfix: "Fixes Hivenet Manifest hive color assignments."
+ - bugfix: "Fixes Crew Manifest color defines."
+ - bugfix: "Inbuilt /silicon modular computers no longer broken by EMPs."
+ - bugfix: "Fixes energy gun desc_extended inheritances."
diff --git a/tgui/packages/tgui/constants.ts b/tgui/packages/tgui/constants.ts
index 812cf2d8220..76fe2faf35f 100644
--- a/tgui/packages/tgui/constants.ts
+++ b/tgui/packages/tgui/constants.ts
@@ -24,7 +24,9 @@ export const COLORS = {
department: {
captain: '#c06616',
security: '#e74c3c',
- medbay: '#3498db',
+ command: '#3498db',
+ commandsupport: '#fef400',
+ medbay: '#1ccaa7',
science: '#9b59b6',
engineering: '#f1c40f',
cargo: '#f39c12',
diff --git a/tgui/packages/tgui/interfaces/HivenetManifest.tsx b/tgui/packages/tgui/interfaces/HivenetManifest.tsx
index 102fa81181b..eecd758d3c9 100644
--- a/tgui/packages/tgui/interfaces/HivenetManifest.tsx
+++ b/tgui/packages/tgui/interfaces/HivenetManifest.tsx
@@ -1,3 +1,5 @@
+import type { CSSProperties } from 'react';
+
import { Box, Section, Table } from 'tgui-core/components';
import { useBackend } from '../backend';
import { Window } from '../layouts';
@@ -13,23 +15,27 @@ export type VaurcaListData = {
};
export type HivenetManifestData = {
- all_vaurca: VaurcaListData[];
+ all_vaurca: Record;
};
-export const HivenetManifest = (props) => {
- const { act, data } = useBackend();
+type HiveColorStyle = CSSProperties & {
+ '--hive-color': string;
+};
+
+export const HivenetManifest = () => {
+ const { data } = useBackend();
return (
- {Object.keys(data.all_vaurca).map((hive) => {
- const hiveData = data.all_vaurca[hive];
+ {Object.entries(data.all_vaurca || {}).map(([hive, hiveData]) => {
return hiveData.vaurca.length ? (
diff --git a/tgui/packages/tgui/interfaces/common/departmentClass.ts b/tgui/packages/tgui/interfaces/common/departmentClass.ts
index 3547e1d5bca..b061488a4eb 100644
--- a/tgui/packages/tgui/interfaces/common/departmentClass.ts
+++ b/tgui/packages/tgui/interfaces/common/departmentClass.ts
@@ -9,8 +9,8 @@ type DepartmentStyle = CSSProperties & {
const departmentColorByName: Record = {
cargo: COLORS.department.cargo,
operations: COLORS.department.cargo,
- command: COLORS.department.medbay,
- 'command-support': COLORS.department.medbay,
+ command: COLORS.department.command,
+ commandsupport: COLORS.department.commandsupport,
security: COLORS.department.security,
engineering: COLORS.department.engineering,
medical: COLORS.department.medbay,
diff --git a/tgui/packages/tgui/styles/interfaces/HivenetManifest.scss b/tgui/packages/tgui/styles/interfaces/HivenetManifest.scss
new file mode 100644
index 00000000000..04bf9f0eecb
--- /dev/null
+++ b/tgui/packages/tgui/styles/interfaces/HivenetManifest.scss
@@ -0,0 +1,10 @@
+.HivenetManifest__Hive {
+ .Section {
+ &__title {
+ border-color: var(--hive-color);
+ }
+ &__titleText {
+ color: var(--hive-color);
+ }
+ }
+}
diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss
index 21a09b851a6..0bf4471fc46 100644
--- a/tgui/packages/tgui/styles/main.scss
+++ b/tgui/packages/tgui/styles/main.scss
@@ -24,6 +24,7 @@
@include meta.load-css('./interfaces/ExperimentConfigure.scss');
@include meta.load-css('./interfaces/Fabricator.scss');
@include meta.load-css('./interfaces/HellishRunes.scss');
+@include meta.load-css('./interfaces/HivenetManifest.scss');
@include meta.load-css('./interfaces/HotKeysHelp.scss');
@include meta.load-css('./interfaces/Hypertorus.scss');
@include meta.load-css('./interfaces/IntegratedCircuit.scss');