Merge remote-tracking branch 'upstream/master' into implant-refactor

code/game/objects/items/weapons/implants/implant_traitor.dm

@@ -62,8 +62,17 @@
 		H.mind.objectives += p
 		for(var/datum/objective/objective in H.mind.objectives)
 			H << "<B>Objective #1</B>: [objective.explanation_text]"
-		ticker.mode.update_traitor_icons_added(H.mind)
+
 		ticker.mode.update_traitor_icons_added(user.mind)
+		ticker.mode.update_traitor_icons_added(H.mind)//handles datahuds/observerhuds
+
+		if(user.mind.som)//do not add if not a traitor..and you just picked up an implanter in the hall...
+			var/datum/mindslaves/slaved = user.mind.som
+			H.mind.som = slaved
+			slaved.serv += H
+			slaved.add_serv_hud(user.mind,"syndicate")//handles master servent icons
+			slaved.add_serv_hud(H.mind,"mindslave")
+
 		log_admin("[ckey(user.key)] has mind-slaved [ckey(H.key)].")
 		return 1
 	return 0

code/game/objects/structures/inflatable.dm

@@ -111,6 +111,13 @@
 	if(health <= 0)
 		deflate(1)
 
+/obj/structure/inflatable/AltClick()
+	if(usr.stat || usr.restrained())
+		return
+	if(!Adjacent(usr))
+		return
+	deflate()
+
 /obj/structure/inflatable/proc/deflate(var/violent=0)
 	playsound(loc, 'sound/machines/hiss.ogg', 75, 1)
 	if(violent)