Merge pull request #4986 from Ikarrus/gangfixes

Gang Mode fixes and improvements

code/game/objects/items/devices/flash.dm

@@ -78,23 +78,21 @@
 					if(M.client)
 						if(M.stat == CONSCIOUS)
 							M.mind_initialize()		//give them a mind datum if they don't have one.
-							M.mind.has_been_rev = 1
 							var/resisted
-							if(isloyal(M))
-								resisted = 1
-							else if(user.mind in ticker.mode.head_revolutionaries)
-								if(!ticker.mode.add_revolutionary(M.mind))
-									resisted = 1
-							else if(user.mind in ticker.mode.A_bosses)
-								if(!ticker.mode.add_gangster(M.mind,"A"))
-									resisted = 1
-							else if(user.mind in ticker.mode.B_bosses)
-								if(!ticker.mode.add_gangster(M.mind,"B"))
-									resisted = 1
-							if(!resisted)
-								M.mind.has_been_rev = 1
-								ticker.mode.add_revolutionary(M.mind)
+							if(!isloyal(M))
+								if(user.mind in ticker.mode.head_revolutionaries)
+									if(!ticker.mode.add_revolutionary(M.mind))
+										resisted = 1
+								if(user.mind in ticker.mode.A_bosses)
+									if(!ticker.mode.add_gangster(M.mind,"A"))
+										resisted = 1
+								if(user.mind in ticker.mode.B_bosses)
+									if(!ticker.mode.add_gangster(M.mind,"B"))
+										resisted = 1
 							else
+								resisted = 1
+
+							if(resisted)
 								user << "<span class='warning'>This mind seems resistant to the flash!</span>"
 						else
 							user << "<span class='warning'>They must be conscious before you can convert them!</span>"

code/game/objects/items/devices/recaller.dm

@@ -31,6 +31,8 @@
 				loc << "<span class='info'>\icon[src]Comm arrays accessed. Broadcasting recall signal...</span>"
 				sleep(rand(10,30))
 				recalling = 0
+				log_game("[key_name(user)] has recalled the shuttle with a recaller.")
+				message_admins("[key_name_admin(user)] has recalled the shuttle with a recaller.", 1)
 				if(!cancel_call_proc(user))
 					loc << "<span class='info'>\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time.</span>"
 				return