diff --git a/GainStation13/icons/runtime/default_title.dmi b/GainStation13/icons/runtime/default_title.dmi new file mode 100644 index 0000000000..1ec48396e2 Binary files /dev/null and b/GainStation13/icons/runtime/default_title.dmi differ diff --git a/code/controllers/configuration/entries/respawns.dm b/code/controllers/configuration/entries/respawns.dm index 5e8cf2dc1d..accc07a909 100644 --- a/code/controllers/configuration/entries/respawns.dm +++ b/code/controllers/configuration/entries/respawns.dm @@ -19,7 +19,7 @@ /// Allows respawning as a combat role, defined as security/head. /datum/config_entry/flag/allow_combat_role_respawn - default = FTRUE + default = TRUE /// Allows respawning as the same character as a previous life /datum/config_entry/flag/allow_same_character_respawn diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index 1dbfb1540c..506276973e 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -32,7 +32,7 @@ SUBSYSTEM_DEF(title) file_path = "[global.config.directory]/title_screens/images/[pick(title_screens)]" if(!file_path) - file_path = "icons/runtime/default_title.dmi" + file_path = "GainStation13/icons/runtime/default_title.dmi" ASSERT(fexists(file_path)) diff --git a/config/in_character_filter.txt b/config/in_character_filter.txt index 46df3fd60c..9c3db68394 100644 --- a/config/in_character_filter.txt +++ b/config/in_character_filter.txt @@ -2,6 +2,11 @@ # Words that will block in character chat messages from sending. # # Case is not important. Commented-out examples are listed below, just remove the "#". # ############################################################################################### -#lol -#omg -#wtf \ No newline at end of file +lol +omg +wtf +tbh +brb +gtfo +stfu +xd diff --git a/config/title_screens/images/title1.dmi b/config/title_screens/images/title1.dmi deleted file mode 100644 index de56de7ca7..0000000000 Binary files a/config/title_screens/images/title1.dmi and /dev/null differ diff --git a/config/title_screens/images/title2.dmi b/config/title_screens/images/title2.dmi deleted file mode 100644 index d5196c9ae0..0000000000 Binary files a/config/title_screens/images/title2.dmi and /dev/null differ diff --git a/config/title_screens/images/title3.dmi b/config/title_screens/images/title3.dmi deleted file mode 100644 index 1a5ae1ed7f..0000000000 Binary files a/config/title_screens/images/title3.dmi and /dev/null differ diff --git a/config/title_screens/images/title4.dmi b/config/title_screens/images/title4.dmi deleted file mode 100644 index 3f2d008161..0000000000 Binary files a/config/title_screens/images/title4.dmi and /dev/null differ diff --git a/config/title_screens/images/title5.dmi b/config/title_screens/images/title5.dmi deleted file mode 100644 index 9491274eda..0000000000 Binary files a/config/title_screens/images/title5.dmi and /dev/null differ