Merge remote-tracking branch 'origin/inputfix' into inputfix

Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/game/dna/genes/vg_powers.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/economy/EFTPOS.dm
	code/modules/mob/living/silicon/robot/life.dm
This commit is contained in:
Tastyfish
2015-11-30 22:44:55 -05:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -20,8 +20,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
if(selected_type)
msg = input("Please enter your message.", "Admin Help", null, null) as text|null
//clean the input msg
if(!msg)
//clean the input msg
if(!msg)
return
if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))