-
-
-
-
- +
+ Don't worry, saving the day is just a few steps away! + +
+ Locate the ever-elusive red emergency stop button. It's + probably hiding in plain sight, so take your time, have a laugh, and + enjoy the anticipation. Remember, it's like a treasure hunt, + only with the added bonus of preventing a nuclear disaster. ++
+ Once you've uncovered the button, muster all your courage and + push it like there's no tomorrow. Well, actually, you're + pushing it to ensure there is a tomorrow. But hey, who doesn't + love a little paradoxical button-pushing? ++
+ Prepare for the impending suppression of the supermatter engine + room, because things are about to get real quiet. Just make sure + everyone has evacuated, or else they'll be in for a surprise. + The system needs its space, and it's not known for being the + friendliest neighbour. ++
+ After the delamination is successfully suppressed, take a moment to + appreciate the delicate beauty of crystal-based electricity. Take a + look around and fix any damage to those fragile glass components. + Feel free to put on your finest overalls and channel your inner + engiborg while doing so. ++
+ Keep an eye out for fires and the infamous air mix. It's always + an adventure trying to strike the perfect balance between breathable + air and potential suffocation. Remember, oxygen plus a spark equals + fireworks - the kind you definitely don't want inside a + reactor. ++
+
+ It even forms hot ice between 120K and 160K! +
+
+ Remember you can always turn the engine room air alarm to + contaminated to assist in removing harmful gases! + +
+ To avoid singeing your eyebrows off, consider enlisting the help of + a synth or a trusty borg. After all, nothing says "safety + first" like outsourcing your firefighting to non-living, + non-breathing assistants. ++
+ Clear out any lightly radioactive debris and/or hot ice (The cargo + department will probably love to dispose it for you.) ++
+ Finally, revel in the satisfaction of knowing that you've + single-handedly prevented a delamination. But, of course, don't + forget to feel guilty because SAFETY MOTH Knows. SAFETY MOTH knows + everything. It's always watching, judging, and probably taking + notes for its next safety briefing. So bask in the glory of your + heroism, but know that the all-knowing Moff is onto you. ++
+ When it comes time for your second attempt at starting the SM: Take + this sign, give it a good toss towards the crystal, and watch it + soar through the air.+
+
+ Nothing says "I'm dealing with a potentially catastrophic + situation" like engaging in some whimsical shenanigans. +
-
- );
- }
-}
-
-type FishingData = {
- difficulty: number;
- fish_ai: FishAI;
- special_effects: SpecialRule[];
- background_image: string;
-};
-
-export const Fishing = (props, context) => {
- const { act, data } = useBackend
-
-
-
-
-
-
-
-
-
-
- );
-};
diff --git a/tgui/packages/tgui/sanitize.ts b/tgui/packages/tgui/sanitize.ts
index a40d23a320d3c7..b6e05d0f74619a 100644
--- a/tgui/packages/tgui/sanitize.ts
+++ b/tgui/packages/tgui/sanitize.ts
@@ -48,7 +48,8 @@ const defTag = [
// Advanced HTML tags that we can trust admins (but not players) with
const advTag = ['img'];
-const defAttr = ['class', 'style'];
+// Background is here because it accepts image urls
+const defAttr = ['class', 'style', 'background'];
/**
* Feed it a string and it should spit out a sanitized version.
diff --git a/tgui/packages/tgui/styles/interfaces/CameraConsole.scss b/tgui/packages/tgui/styles/interfaces/CameraConsole.scss
deleted file mode 100644
index 7e8f99fdccebf5..00000000000000
--- a/tgui/packages/tgui/styles/interfaces/CameraConsole.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-@use '../base.scss';
-
-$background-color: rgba(0, 0, 0, 0.33) !default;
-
-.CameraConsole__left {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- width: base.em(220px);
-}
-
-.CameraConsole__right {
- position: absolute;
- top: 0;
- bottom: 0;
- left: base.em(220px);
- right: 0;
- background-color: $background-color;
-}
-
-.CameraConsole__toolbar {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- height: 2em;
- line-height: 2em;
- margin: 0.25em 1em 0;
-}
-
-.CameraConsole__toolbarRight {
- position: absolute;
- top: 0;
- right: 0;
- height: 2em;
- line-height: 2em;
- margin: 0.33em 0.5em 0;
-}
-
-.CameraConsole__map {
- position: absolute;
- top: base.em(26px);
- bottom: 0;
- left: 0;
- right: 0;
- margin: 0.5em;
- text-align: center;
-
- .NoticeBox {
- margin-top: calc(50% - 2em);
- }
-}
diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss
index b6c5ef4486d69c..25443ae606c178 100644
--- a/tgui/packages/tgui/styles/main.scss
+++ b/tgui/packages/tgui/styles/main.scss
@@ -48,7 +48,6 @@
// Interfaces
@include meta.load-css('./interfaces/AlertModal.scss');
-@include meta.load-css('./interfaces/CameraConsole.scss');
@include meta.load-css('./interfaces/Changelog.scss');
@include meta.load-css('./interfaces/CrewManifest.scss');
@include meta.load-css('./interfaces/Emojipedia.scss');
diff --git a/tools/UpdatePaths/Scripts/78323_recyclerdirection.txt b/tools/UpdatePaths/Scripts/78323_recyclerdirection.txt
new file mode 100644
index 00000000000000..97d5b0a6895487
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/78323_recyclerdirection.txt
@@ -0,0 +1 @@
+/obj/machinery/recycler : /obj/machinery/recycler {@OLD;dir=8}
\ No newline at end of file
diff --git a/tools/UpdatePaths/Scripts/78364_full_surgery_tray_pathing.txt b/tools/UpdatePaths/Scripts/78364_full_surgery_tray_pathing.txt
new file mode 100644
index 00000000000000..bc8eadd4991cdd
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/78364_full_surgery_tray_pathing.txt
@@ -0,0 +1,5 @@
+#updates mapped-in surgery trays to the full subtype, so empty trays can be crafted
+/obj/item/surgery_tray : /obj/item/surgery_tray/full{@OLD}
+/obj/item/surgery_tray/deployed : /obj/item/surgery_tray/full/deployed{@OLD}
+/obj/item/surgery_tray/morgue : /obj/item/surgery_tray/full/morgue{@OLD}
+/obj/item/surgery_tray/advanced : /obj/item/surgery_tray/full/advanced{@OLD}
diff --git a/tools/UpdatePaths/Scripts/78365_explodable_walls.txt b/tools/UpdatePaths/Scripts/78365_explodable_walls.txt
new file mode 100644
index 00000000000000..ee7655699f12fb
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/78365_explodable_walls.txt
@@ -0,0 +1 @@
+/turf/closed/indestructible/explodable/@SUBTYPES : /turf/closed/indestructible/@SUBTYPES, /obj/effect/mapping_helpers/bombable_wall
diff --git a/tools/UpdatePaths/Scripts/78382_remove_lapvend.txt b/tools/UpdatePaths/Scripts/78382_remove_lapvend.txt
new file mode 100644
index 00000000000000..63ba4e3c5c57cb
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/78382_remove_lapvend.txt
@@ -0,0 +1 @@
+/obj/machinery/lapvend : @DELETE
diff --git a/tools/UpdatePaths/Scripts_Skyrat/23804_repath_cc_job_areas.txt b/tools/UpdatePaths/Scripts_Skyrat/23804_repath_cc_job_areas.txt
new file mode 100644
index 00000000000000..e5e36d333a2a40
--- /dev/null
+++ b/tools/UpdatePaths/Scripts_Skyrat/23804_repath_cc_job_areas.txt
@@ -0,0 +1,5 @@
+# Updates NTrep and Blueshield paths
+
+/area/command/heads_quarters/captain/private/nt_rep : /area/station/command/heads_quarters/nt_rep{@OLD}
+
+/area/blueshield : /area/station/command/heads_quarters/blueshield{@OLD}
diff --git a/tools/silo_grapher/silo_graph_script.py b/tools/silo_grapher/silo_graph_script.py
index 8b09ed836b66e4..bd39549d1246bd 100644
--- a/tools/silo_grapher/silo_graph_script.py
+++ b/tools/silo_grapher/silo_graph_script.py
@@ -11,6 +11,7 @@
import matplotlib.pyplot as plt
show_json_figures = False # Set to True to show all JSON-specific figures at the end
+sheet_amount = 100 # How many units of material are a sheet worth right now?
materials = {
"iron": {"total": 0, "spent": 0, "obtained": 0},
@@ -40,11 +41,13 @@
"plastic": {"grand_total": 0, "grand_spent": 0, "grand_obtained": 0},
}
-log_folder = "logs"
+log_folder = "tools\silo_grapher\logs"
total_files = 0
first_time_value = None
first_time_setup = True
+total_ores_mined = 0
+
for filename in os.listdir(log_folder):
with open(os.path.join(log_folder, filename), "r") as file:
total_files += 1
@@ -60,7 +63,7 @@
log = json.loads(line)
raw_materials = log.get("data", {}).get("raw_materials", "")
if first_time_setup:
- first_time_value = log["timestamp"]
+ first_time_value = float(log["ts"])
first_time_setup = False
if not raw_materials:
continue
@@ -73,7 +76,8 @@
else:
materials[material]["obtained"] += int(quantity[1:])
materials[material]["total"] += int(quantity[1:])
- time[material].append((int(log["timestamp"]) - int(first_time_value)) / 10)
+ total_ores_mined += int(quantity[1:])
+ time[material].append((float(log["w-state"]["timestamp"]) - float(first_time_value)) / 10.0)
y[material].append(int(materials[material]["total"]))
except Exception as e:
@@ -116,12 +120,18 @@
for material, values in grand_total.items():
if values["grand_obtained"] != 0:
- grand_total[material]["grand_spent_percentage"] = values["grand_spent"] / values["grand_obtained"] * 100
+ grand_total[material]["grand_spent_percentage"] = values["grand_spent"] / values["grand_obtained"] * sheet_amount
else:
grand_total[material]["grand_spent_percentage"] = 0
-print("Grand totals:")
+print("************Grand totals************")
+for material, values in grand_total.items():
+ print(
+ f"{material} net: {values['grand_total']/sheet_amount} | spent total: {values['grand_spent']/sheet_amount} | obtained total: {values['grand_obtained']/sheet_amount}"
+ )
+print("************AVERAGES************")
for material, values in grand_total.items():
print(
- f"{material} total: {values['grand_total']} | spent total: {values['grand_spent']} | obtained total: {values['grand_obtained']} | percentage spent: {values['grand_spent_percentage']:.2f}%"
+ f"{material} net: {round(values['grand_total']/(sheet_amount*total_files), 2)} | spent total: {round(values['grand_spent']/(sheet_amount*total_files), 2)} | obtained total: {round(values['grand_obtained']/(sheet_amount*total_files), 2)} | percentage spent: {values['grand_spent_percentage'] :.2f}%"
)
+print(f"This is equivalent to a total of an average {int(total_ores_mined/(sheet_amount*3))} mineral tiles, or {int(total_ores_mined/(sheet_amount*3*total_files))} mineral walls per round.")
- Camera:
- {(activeCamera && activeCamera.name) || '—'}
-
-
- {can_spy && (
-
-