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

code/modules/admin/verbs/adminhelp.dm

@@ -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))

code/modules/mob/living/silicon/robot/life.dm

@@ -28,7 +28,7 @@
 				if(B.powerneeded)
 					if((cell.charge * 100 / cell.maxcharge) < B.powerneeded)
 						src << "Deactivating [B.name] due to lack of power!"
-						unEquip(B)
+						unEquip(B)
 		if(cell.charge <= 0)
 			uneq_all()
 			update_headlamp(1)