removes the test-merge only code from the combat mode commit (#3064)

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-05 21:05:21 +00:00
committed by GitHub
co-authored by Qustinnus Gandalf2k15
parent c94689e020
commit dd4a146f90
5 changed files with 5 additions and 14 deletions
@@ -20,9 +20,6 @@
if(GLOB.admin_notice)
to_chat(src, "<span class='notice'><b>Admin Notice:</b>\n \t [GLOB.admin_notice]</span>")
to_chat(src, "<span class='notice'><b>Combat Mode Changes</b>\n \t</span>")
to_chat(src, "<span class='notice'><b>READ THIS PR BEFORE PLAYING TODAY:</b> https://github.com/tgstation/tgstation/pull/56601 \n \t</span>")
var/spc = CONFIG_GET(number/soft_popcap)
if(spc && living_player_count() >= spc)
to_chat(src, "<span class='notice'><b>Server Notice:</b>\n \t [CONFIG_GET(string/soft_popcap_message)]</span>")