merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/admin/verbs/adminhelp.dm

@@ -130,3 +130,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 			send2irc(ckey, "[original_msg] - All admins AFK ([admin_number_afk])")
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return
+
+proc/send2irc(msg,msg2)
+	if(config.useircbot)
+		shell("python nudge.py [msg] [msg2]")
+	return