- Brute Damage : {{:data.brute}}
-
- Oxygen Content : {{:data.oxy}}
-
- Toxin Content : {{:data.tox}}
-
-
- Burn Status : {{:data.burn}}
-
-
- User Temperature : {{:data.temp}}
-
-
-{{else}}
-
Error: No biological host found!
-{{/if}}
diff --git a/nano/templates/pai_chatroom.tmpl b/nano/templates/pai_chatroom.tmpl
deleted file mode 100644
index d669a375d86..00000000000
--- a/nano/templates/pai_chatroom.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
- Receiver:
-
-
- {{if data.receiver_off}}
- {{:helper.link("On", '', {"stopic":"chatroom", "toggler":1})}}
- {{:helper.link("Off", '', {"stopic":"chatroom", "toggler":2}, 'selected')}}
- {{else}}
- {{:helper.link("On", '', {"stopic":"chatroom", "toggler":1}, 'selected')}}
- {{:helper.link("Off", '', {"stopic":"chatroom", "toggler":2})}}
- {{/if}}
-
-
-
-
-
- Ringer:
-
-
- {{if data.ringer_off}}
- {{:helper.link("On", '', {"stopic":"chatroom", "ringer":1})}}
- {{:helper.link("Off", '', {"stopic":"chatroom", "ringer":2}, 'selected')}}
- {{else}}
- {{:helper.link("On", '', {"stopic":"chatroom", "ringer":1}, 'selected')}}
- {{:helper.link("Off", '', {"stopic":"chatroom", "ringer":2})}}
- {{/if}}
-
-
-
-{{for data.rooms}}
-
- {{:helper.link(value.name, '', {"stopic":"chatroom", "select":value.ref})}}
- {{:helper.link("Quick Message", '', {"stopic":"chatroom", "target":value.ref})}}
-
-{{/for}}
-
-{{if data.disconnected}}
-
Connection Lost
- {{:helper.link("Reconnect", 'refresh', {"stopic":"chatroom", "reconnect":1})}}
-{{else data.current_room}}
-
#{{:data.current_room_name}}
-
- Topic:
-
{{:helper.link(data.current_room_topic, '', {"stopic":"chatroom", "topic":1})}}
-
- {{prevName = value.username;}}
- {{/for}}
- {{:helper.link("Send Message", '', {"stopic":"chatroom", "target":data.current_room})}}
-{{/if}}
-
-{{if data.current_name}}
- {{:helper.link("Clear Screen", '', {"stopic":"chatroom", "select":"*NONE*"})}}
-{{/if}}
diff --git a/nano/templates/pai_directives.tmpl b/nano/templates/pai_directives.tmpl
deleted file mode 100644
index 2caff849a26..00000000000
--- a/nano/templates/pai_directives.tmpl
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/nano/templates/pai_doorjack.tmpl b/nano/templates/pai_doorjack.tmpl
deleted file mode 100644
index 69abd861e80..00000000000
--- a/nano/templates/pai_doorjack.tmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/pai_interface.tmpl b/nano/templates/pai_interface.tmpl
deleted file mode 100644
index e6441932665..00000000000
--- a/nano/templates/pai_interface.tmpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/nano/templates/pai_manifest.tmpl b/nano/templates/pai_manifest.tmpl
deleted file mode 100644
index d6827594e35..00000000000
--- a/nano/templates/pai_manifest.tmpl
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
diff --git a/nano/templates/pai_medrecords.tmpl b/nano/templates/pai_medrecords.tmpl
deleted file mode 100644
index 37b1d7061ca..00000000000
--- a/nano/templates/pai_medrecords.tmpl
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-{{if data.records}}
- {{for data.records}}
-
- {{:helper.link(value.name, '', {"stopic":"med_records", "select":value.ref})}}
-
- Failed to find some records; the information above may be incomplete or missing.
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/pai_messenger.tmpl b/nano/templates/pai_messenger.tmpl
deleted file mode 100644
index fb20f826f27..00000000000
--- a/nano/templates/pai_messenger.tmpl
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
- {{:helper.link(value.name, '', {"stopic":"messenger", "select":value.owner})}}
- {{:helper.link("Quick Message", '', {"stopic":"messenger", "target":value.ref})}}
-
-{{/for}}
-
-{{if data.current_name}}
- {{:helper.link("Clear Screen", '', {"stopic":"messenger", "select":"*NONE*"})}}
-{{/if}}
diff --git a/nano/templates/pai_radio.tmpl b/nano/templates/pai_radio.tmpl
deleted file mode 100644
index bcdacdb48f1..00000000000
--- a/nano/templates/pai_radio.tmpl
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-{{/for}}
\ No newline at end of file
diff --git a/nano/templates/pai_secrecords.tmpl b/nano/templates/pai_secrecords.tmpl
deleted file mode 100644
index e139034c0de..00000000000
--- a/nano/templates/pai_secrecords.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-{{if data.records}}
- {{for data.records}}
-
- {{:helper.link(value.name, '', {"stopic":"sec_records", "select":value.ref})}}
-
- Failed to find some records; the information above may be incomplete or missing.
-
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/pai_signaller.tmpl b/nano/templates/pai_signaller.tmpl
deleted file mode 100644
index 20c2781bc9b..00000000000
--- a/nano/templates/pai_signaller.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/nano/templates/r_n_d.tmpl b/nano/templates/r_n_d.tmpl
deleted file mode 100644
index 973ce934873..00000000000
--- a/nano/templates/r_n_d.tmpl
+++ /dev/null
@@ -1,269 +0,0 @@
-{{if data.menu > 0}}
-
- {{:helper.link('Main Menu', 'reply', {'menu': 0, 'submenu': 0})}}
- {{if data.submenu > 0}}
- {{if data.menu == 2}}
- {{:helper.link('Disk Operations Menu', 'reply', {'submenu': 0})}}
- {{else data.menu == 4}}
- {{:helper.link('Protolathe Menu', 'reply', {'submenu': 0})}}
- {{else data.menu == 5}}
- {{:helper.link('Circuit Imprinter Menu', 'reply', {'submenu': 0})}}
- {{else data.menu == 6}}
- {{:helper.link('Settings Menu', 'reply', {'submenu': 0})}}
- {{/if}}
- {{else data.menu == 4 || data.menu == 5}}
- {{:helper.link('Material Storage', 'arrow-up', {'submenu': 2})}}
- {{:helper.link('Chemical Storage', 'arrow-up', {'submenu': 3})}}
- {{/if}}
-
- {{if data.menu == 0}}
-
Main Menu:
-
{{:helper.link('Disk Operations', 'save', {'menu': 2, 'submenu': 0}, data.disk_type ? null : 'disabled')}}
-
{{:helper.link('Destructive Analyzer Menu', 'chain-broken', {'menu': 3, 'submenu': 0}, data.linked_destroy ? null : 'disabled')}}
-
{{:helper.link('Protolathe Menu', 'print', {'menu': 4, 'submenu': 0}, data.linked_lathe ? null : 'disabled')}}
-
{{:helper.link('Circuit Imprinter Menu', 'print', {'menu': 5, 'submenu': 0}, data.linked_imprinter ? null : 'disabled')}}
-
{{:helper.link('Settings', 'gear', {'menu': 6, 'submenu': 0})}}
-
-
- Current Research Levels:
- {{for data.tech_levels}}
-
{{:value.name}}:
{{:value.level}}
- {{/for}}
- {{else data.menu == 1}}
-
Current Research Levels:
- {{for data.tech_levels}}
- {{if index > 0}}
-
- {{/if}}
-
{{:value.name}}
-
* Level: {{:value.level}}
-
* Summary: {{:value.desc}}
- {{/for}}
- {{else data.menu == 2 && data.disk_type}}
- {{if data.submenu == 0}}
-
Data Disk Contents:
- {{if data.disk_data}}
- {{if data.disk_type == 1}}
-
Name: {{:data.disk_data.name}}
-
Level: {{:data.disk_data.level}}
-
Description: {{:data.disk_data.desc}}
- {{:helper.link('Upload to Database', 'arrow-up', {'updt_tech': 1})}}
- {{:helper.link('Clear Disk', 'trash', {'clear_tech': 1})}}
- {{else}}
-
Name: {{:data.disk_data.name}}
-
- {{for data.disk_data.lathe_types}}
- {{if index == 0}}
- Lathe Types:
- {{else}}
- ,
- {{/if}}
- {{:value}}
- {{/for}}
-
-
Required Materials:
- {{for data.disk_data.materials}}
-
{{:value.name}} x {{:value.amount}}
- {{/for}}
- {{:helper.link('Upload to Database', 'arrow-up', {'updt_design': 1})}}
- {{:helper.link('Clear Disk', 'trash', {'clear_design': 1})}}
- {{/if}}
- {{else}}
-
This disk is empty.
- {{:helper.link(data.disk_type == 1 ? 'Load Tech to Disk' : 'Load Design to Disk', 'arrow-down', {'submenu': 1})}}
- {{/if}}
- {{:helper.link('Eject Disk', 'eject', data.disk_type == 1 ? {'eject_tech': 1} : {'eject_design': 1})}}
- {{else data.submenu == 1}}
- {{for data.to_copy}}
-
-
{{:value.name}}
- {{:helper.link('Copy to Disk', 'arrow-down', data.disk_type == 1 ? {'copy_tech': 1, 'copy_tech_ID': value.id} : {'copy_design': 1, 'copy_design_ID': value.id})}}
-
- {{/for}}
- {{/if}}
- {{else data.menu == 3 && !data.linked_destroy}}
- NO DESTRUCTIVE ANALYZER LINKED TO CONSOLE
- {{else data.menu == 4 && !data.linked_lathe}}
- NO PROTOLATHE LINKED TO CONSOLE
- {{else data.menu == 5 && !data.linked_imprinter}}
- NO CIRCUIT IMPRITER LINKED TO CONSOLE
- {{else data.menu == 3}}
- {{if !data.loaded_item}}
- No item loaded. Standing by...
- {{else}}
-
Deconstruction Menu:
-
Name: {{:data.loaded_item.name}}
-
Origin Tech:
- {{for data.loaded_item.origin_tech}}
-
-
* {{:value.name}}:
-
- {{:value.object_level}}
- {{if value.current_level}}
- (Current: {{:value.current_level}})
- {{/if}}
-
-
- {{/for}}
-
Options:
- {{:helper.link('Deconstruct Item', 'chain-broken', {'deconstruct': 1})}}
- {{:helper.link('Eject Item', 'eject', {'eject_item': 1})}}
- {{/if}}
- {{else data.menu == 4 || data.menu == 5}}
- {{if data.submenu == 0}}
-
{{:(data.menu == 4 ? 'Protolathe' : 'Circuit Imprinter')}} Menu:
- {{else data.submenu == 1}}
-
{{:data.category}}:
- {{else data.submenu == 2}}
-
Material Storage:
- {{else data.submenu == 3}}
-
Chemical Storage:
- {{/if}}
-
- {{if data.submenu < 2}}
-
-
- | Material Amount: | {{:data.total_materials}} |
- {{if data.max_materials}}
- / {{:data.max_materials}} |
- {{/if}}
-
-
- | Chemical Amount: | {{:data.total_chemicals}} |
- {{if data.max_chemicals}}
- / {{:data.max_chemicals}} |
- {{/if}}
-
-
- {{/if}}
-
- {{if data.submenu == 0}}
-
-
-
-
- {{for data.categories}}
- {{if (index & 1) == 0 && index != 0}}
-
- {{/if}}
- | {{:helper.link(value, 'arrow-right', {'category': value})}} |
- {{/for}}
-
- {{else data.submenu == 1}}
-
- {{for data.matching_designs}}
-
- | {{:helper.link(value.name, 'print', data.menu == 4 ? {'build': value.id, 'amount': 1} : {'imprint': value.id}, value.can_build ? null : 'disabled')}} |
- {{if value.can_build >= 5}}
- {{:helper.link('x5', null, data.menu == 4 ? {'build': value.id, 'amount': 5} : {'imprint': value.id})}}
- {{/if}} |
- {{if value.can_build >= 10}}
- {{:helper.link('x10', null, data.menu == 4 ? {'build': value.id, 'amount': 10} : {'imprint': value.id})}}
- {{/if}} |
-
- {{for value.materials : material : i}}
- |
- {{if material.is_red}}
-
- {{/if}}
- {{:material.amount}} {{:material.name}}
- {{if material.is_red}}
-
- {{/if}}
- {{/for}}
- |
-
- {{/for}}
-
- {{else data.submenu == 2}}
- {{for data.loaded_materials}}
-
-
* {{:value.amount}} of {{:value.name}}
({{:Math.round((value.amount / 2000) * 10) / 10}} sheets)
- {{if value.amount >= 2000}}
- {{if data.menu == 4}}
- {{:helper.link('1x', 'eject', {'lathe_ejectsheet': value.id, 'lathe_ejectsheet_amt': 1})}}
- {{:helper.link('C', 'eject', {'lathe_ejectsheet': value.id, 'lathe_ejectsheet_amt': 'custom'})}}
- {{if value.amount >= 2000*5}}
- {{:helper.link('5x', 'eject', {'lathe_ejectsheet': value.id, 'lathe_ejectsheet_amt': 5})}}
- {{/if}}
- {{:helper.link('All', 'eject', {'lathe_ejectsheet': value.id, 'lathe_ejectsheet_amt': 50})}}
- {{else}}
- {{:helper.link('1x', 'eject', {'imprinter_ejectsheet': value.id, 'imprinter_ejectsheet_amt': 1})}}
- {{:helper.link('C', 'eject', {'imprinter_ejectsheet': value.id, 'imprinter_ejectsheet_amt': 'custom'})}}
- {{if value.amount >= 2000*5}}
- {{:helper.link('5x', 'eject', {'imprinter_ejectsheet': value.id, 'imprinter_ejectsheet_amt': 5})}}
- {{/if}}
- {{:helper.link('All', 'eject', {'imprinter_ejectsheet': value.id, 'imprinter_ejectsheet_amt': 50})}}
- {{/if}}
- {{/if}}
-
- {{/for}}
- {{else data.submenu == 3}}
-
-
- {{:helper.link('Purge All', 'trash', data.menu == 4 ? {'disposeallP': 1} : {'disposeallI' : 1})}}
-
- {{for data.loaded_chemicals}}
-
-
* {{:value.volume}} of {{:value.name}}
- {{:helper.link('Purge', 'trash', data.menu == 4 ? {'disposeP': value.id} : {'disposeI': value.id})}}
-
- {{/for}}
- {{/if}}
- {{else data.menu == 6}}
- {{if data.submenu == 0}}
-
Settings:
-
{{:helper.link('Sync Database with Network', 'refresh', {'sync': 1}, data.sync ? null : 'disabled')}}
-
{{:helper.link('Connect to Research Network', 'plug', {'togglesync': 1}, data.sync ? 'selected' : null)}}
-
{{:helper.link('Disconnect from Research Network', 'chain-broken', {'togglesync': 1}, data.sync ? null : 'selected')}}
-
{{:helper.link('Device Linkage Menu', 'chain', {'menu': 6, 'submenu': 1})}}
- {{if data.admin}}
-
{{:helper.link('[ADMIN] Maximize Research Levels', 'exclamation', {'maxresearch': 1})}}
- {{/if}}
-
{{:helper.link('Reset Database', 'trash-o', {'reset': 1})}}
- {{else data.submenu == 1}}
-
Device Linkage Menu:
-
{{:helper.link('Re-sync with Nearby Devices', 'chain', {'find_device': 1})}}
-
Linked Devices:
-
- {{if data.linked_destroy}}
-
* Destructive Analyzer
- {{:helper.link('Unlink', 'chain-broken', {'disconnect': 'destroy'})}}
- {{else}}
-
* No Destructive Analyzer Linked
- {{/if}}
-
-
- {{if data.linked_lathe}}
-
* Protolathe
- {{:helper.link('Unlink', 'chain-broken', {'disconnect': 'lathe'})}}
- {{else}}
-
* No Protolathe Linked
- {{/if}}
-
-
- {{if data.linked_imprinter}}
-
* Circuit Imprinter
- {{:helper.link('Unlink', 'chain-broken', {'disconnect': 'imprinter'})}}
- {{else}}
-
* No Circuit Imprinter Linked
- {{/if}}
-
- {{/if}}
- {{/if}}
-
-{{/if}}
diff --git a/nano/templates/rcd.tmpl b/nano/templates/rcd.tmpl
deleted file mode 100644
index d054156665d..00000000000
--- a/nano/templates/rcd.tmpl
+++ /dev/null
@@ -1,48 +0,0 @@
-{{if data.menu == 1}}
-
{{:helper.link('Floor and Walls', 'arrow-right', {'mode': "Turf"}, data.mode == "Turf" ? 'linkOn' : null)}}
- {{:helper.link('Airlock', 'arrow-right', {'mode': "Airlock"}, data.mode == "Airlock" ? 'linkOn' : null)}}
- {{:helper.link('', 'gear', {'menu': 2})}}
-
{{:helper.link('Deconstruct', 'arrow-right', {'mode': "Deconstruct"}, data.mode == "Deconstruct" ? 'linkOn' : null)}}
{{:helper.link('Windows', 'arrow-right', {'mode': "Windows"}, data.mode == "Windows" ? 'linkOn' : null)}}
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/simple_airlock_console.tmpl b/nano/templates/simple_airlock_console.tmpl
deleted file mode 100644
index 0e084437bdb..00000000000
--- a/nano/templates/simple_airlock_console.tmpl
+++ /dev/null
@@ -1,36 +0,0 @@
-
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index 876fbeb711d..3d014cc9f6a 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -469,8 +469,8 @@
#include "code\game\world.dm"
#include "code\game\area\ai_monitored.dm"
#include "code\game\area\areas.dm"
-#include "code\game\area\Dynamic areas.dm"
-#include "code\game\area\Space Station 13 areas.dm"
+#include "code\game\area\dynamic_areas.dm"
+#include "code\game\area\ss13_areas.dm"
#include "code\game\area\areas\depot-areas.dm"
#include "code\game\area\areas\mining.dm"
#include "code\game\area\areas\ruins\lavaland.dm"
@@ -548,7 +548,7 @@
#include "code\game\gamemodes\devil\game_mode.dm"
#include "code\game\gamemodes\devil\objectives.dm"
#include "code\game\gamemodes\devil\contracts\friend.dm"
-#include "code\game\gamemodes\devil\devil agent\devil_agent.dm"
+#include "code\game\gamemodes\devil\devil_agent\devil_agent.dm"
#include "code\game\gamemodes\devil\imp\imp.dm"
#include "code\game\gamemodes\devil\true_devil\_true_devil.dm"
#include "code\game\gamemodes\devil\true_devil\inventory.dm"
@@ -963,7 +963,6 @@
#include "code\game\objects\items\weapons\dnascrambler.dm"
#include "code\game\objects\items\weapons\explosives.dm"
#include "code\game\objects\items\weapons\extinguisher.dm"
-#include "code\game\objects\items\weapons\fireworks.dm"
#include "code\game\objects\items\weapons\flamethrower.dm"
#include "code\game\objects\items\weapons\garrote.dm"
#include "code\game\objects\items\weapons\gift_wrappaper.dm"
@@ -1202,7 +1201,7 @@
#include "code\modules\admin\stickyban.dm"
#include "code\modules\admin\topic.dm"
#include "code\modules\admin\watchlist.dm"
-#include "code\modules\admin\DB ban\functions.dm"
+#include "code\modules\admin\db_ban\functions.dm"
#include "code\modules\admin\permissionverbs\permissionedit.dm"
#include "code\modules\admin\tickets\adminticketsverbs.dm"
#include "code\modules\admin\tickets\mentorticketsverbs.dm"
@@ -1324,8 +1323,8 @@
#include "code\modules\buildmode\submodes\throwing.dm"
#include "code\modules\buildmode\submodes\variable_edit.dm"
#include "code\modules\client\asset_cache.dm"
-#include "code\modules\client\client defines.dm"
-#include "code\modules\client\client procs.dm"
+#include "code\modules\client\client_defines.dm"
+#include "code\modules\client\client_procs.dm"
#include "code\modules\client\message.dm"
#include "code\modules\client\view.dm"
#include "code\modules\client\preference\preferences.dm"
@@ -1430,7 +1429,6 @@
#include "code\modules\economy\Economy_TradeDestinations.dm"
#include "code\modules\economy\EFTPOS.dm"
#include "code\modules\economy\Job_Departments.dm"
-#include "code\modules\economy\POS.dm"
#include "code\modules\economy\utils.dm"
#include "code\modules\error_handler\error_handler.dm"
#include "code\modules\error_handler\error_viewer.dm"
@@ -1445,7 +1443,6 @@
#include "code\modules\events\anomaly_vortex.dm"
#include "code\modules\events\apc_overload.dm"
#include "code\modules\events\apc_short.dm"
-#include "code\modules\events\aurora_caelus.dm"
#include "code\modules\events\blob.dm"
#include "code\modules\events\brand_intelligence.dm"
#include "code\modules\events\carp_migration.dm"
@@ -1894,8 +1891,10 @@
#include "code\modules\mob\living\silicon\pai\recruit.dm"
#include "code\modules\mob\living\silicon\pai\say.dm"
#include "code\modules\mob\living\silicon\pai\software.dm"
-#include "code\modules\mob\living\silicon\pai\software_modules.dm"
#include "code\modules\mob\living\silicon\pai\update_status.dm"
+#include "code\modules\mob\living\silicon\pai\software\_base.dm"
+#include "code\modules\mob\living\silicon\pai\software\pai_apps.dm"
+#include "code\modules\mob\living\silicon\pai\software\pai_toggles.dm"
#include "code\modules\mob\living\silicon\robot\component.dm"
#include "code\modules\mob\living\silicon\robot\death.dm"
#include "code\modules\mob\living\silicon\robot\emote.dm"
@@ -2099,7 +2098,6 @@
#include "code\modules\nano\interaction\physical.dm"
#include "code\modules\nano\interaction\self.dm"
#include "code\modules\nano\interaction\zlevel.dm"
-#include "code\modules\nano\modules\atmos_control.dm"
#include "code\modules\nano\modules\human_appearance.dm"
#include "code\modules\nano\modules\law_manager.dm"
#include "code\modules\nano\modules\nano_module.dm"
@@ -2340,8 +2338,8 @@
#include "code\modules\ruins\lavalandruin_code\syndicate_base.dm"
#include "code\modules\ruins\objects_and_mobs\gym.dm"
#include "code\modules\ruins\objects_and_mobs\necropolis_gate.dm"
-#include "code\modules\security_levels\keycard authentication.dm"
-#include "code\modules\security_levels\security levels.dm"
+#include "code\modules\security_levels\keycard_authentication.dm"
+#include "code\modules\security_levels\security_levels.dm"
#include "code\modules\shuttle\assault_pod.dm"
#include "code\modules\shuttle\emergency.dm"
#include "code\modules\shuttle\ert.dm"
@@ -2366,6 +2364,7 @@
#include "code\modules\spacepods\lock_buster.dm"
#include "code\modules\spacepods\parts.dm"
#include "code\modules\spacepods\spacepod.dm"
+#include "code\modules\station_goals\bluespace_tap.dm"
#include "code\modules\station_goals\bsa.dm"
#include "code\modules\station_goals\dna_vault.dm"
#include "code\modules\station_goals\shield.dm"
@@ -2440,6 +2439,7 @@
#include "code\modules\tgui\states.dm"
#include "code\modules\tgui\tgui.dm"
#include "code\modules\tgui\modules\_base.dm"
+#include "code\modules\tgui\modules\atmos_control.dm"
#include "code\modules\tgui\modules\crew_monitor.dm"
#include "code\modules\tgui\modules\ert_manager.dm"
#include "code\modules\tgui\modules\power_monitor.dm"
diff --git a/sound/Attributions.txt b/sound/Attributions.txt
index 729562855ba..df74fd7ef55 100644
--- a/sound/Attributions.txt
+++ b/sound/Attributions.txt
@@ -1,5 +1,3 @@
items/thermal_drill.ogg was sampled from Builders Drilling.wav under a Sampling Plus 1.0 license. It was uploaded by Koops on 2010-05-10. Source (http://soundbible.com/1420-Builders-Drilling.html)
-ambience/aurora_caelus.ogg is Music for Manatees by Kevin Macleod. It is under a CC-BY 3.0 license. It has been cropped and fades out.
-
-creatures/dog_yelp.ogg is DogYelp.wav. It is under a CC-BY 3.0 license. It has been cropped, EQ'd, and compressed to .ogg. Source (https://freesound.org/people/TobiasKosmos/sounds/163280/)
\ No newline at end of file
+creatures/dog_yelp.ogg is DogYelp.wav. It is under a CC-BY 3.0 license. It has been cropped, EQ'd, and compressed to .ogg. Source (https://freesound.org/people/TobiasKosmos/sounds/163280/)
diff --git a/sound/ambience/aurora_caelus.ogg b/sound/ambience/aurora_caelus.ogg
deleted file mode 100644
index 0c741678d50..00000000000
Binary files a/sound/ambience/aurora_caelus.ogg and /dev/null differ
diff --git a/sound/ambience/aurora_caelus_short.ogg b/sound/ambience/aurora_caelus_short.ogg
deleted file mode 100644
index f6d1acaa2fe..00000000000
Binary files a/sound/ambience/aurora_caelus_short.ogg and /dev/null differ
diff --git a/tgui/packages/tgui/components/LabeledList.js b/tgui/packages/tgui/components/LabeledList.js
index 43dbd0d5a32..28ef06f09c8 100644
--- a/tgui/packages/tgui/components/LabeledList.js
+++ b/tgui/packages/tgui/components/LabeledList.js
@@ -24,7 +24,9 @@ export const LabeledListItem = props => {
buttons,
content,
children,
+ noColon = false,
} = props;
+ const colon = noColon ? '' : ':';
return (