Merge remote-tracking branch 'upstream/master' into dev

2026-08-23 21:26:30 +01:00 · 2014-05-07 17:37:29 +01:00
parent f54a4275ad 0d597fe8db
commit a2b85c31a4
27 changed files with 241 additions and 48 deletions
@@ -18,6 +18,7 @@
 	var/area			= null
 	var/time_died_as_mouse = null //when the client last died as a mouse

+	var/adminhelped = 0

 		///////////////
 		//SOUND STUFF//