Reverted recall changes

code/game/gamemodes/gang/gang.dm

@@ -191,9 +191,7 @@
 		. += 1
 	else
 		gangtool.register_device(mob)
-		mob << "The <b>Gangtool</b> in your [where] will allow you to use your influence to purchase weapons and equipment and communicate with your gangsters."
-		if(isboss)
-			mob << "<b>As the Gang Boss</b> you also have the power to recall the emergency shuttle from anywhere on the station."
+		mob << "The <b>Gangtool</b> in your [where] will allow you to purchase weapons and equipment, send messages to your gang, and recall the emergency shuttle from anywhere on the station."
 
 	var/where2 = mob.equip_in_one_of_slots(T, slots)
 	if (!where2)

code/game/gamemodes/gang/recaller.dm

@@ -55,7 +55,7 @@
 			dat += "<a href='?src=\ref[src];choice=outfit'>Create Armored Gang Outfit</a><br>"
 		else
 			dat += "<b>Create Gang Outfit</b> (Restocking)<br>"
-		if(gangmode && boss)
+		if(gangmode)
 			dat += "<a href='?src=\ref[src];choice=recall'>Recall Emergency Shuttle</a><br>"
 
 		dat += "<br>"
@@ -184,6 +184,10 @@
 
 	add_fingerprint(usr)
 
+	if(recalling)
+		usr << "<span class='warning'>Device is busy. Shuttle recall in progress.</span>"
+		return
+
 	if(href_list["register"])
 		register_device(usr)
 
@@ -294,8 +298,7 @@
 	else if(href_list["choice"])
 		switch(href_list["choice"])
 			if("recall")
-				if(boss)
-					recall(usr)
+				recall(usr)
 			if("outfit")
 				if(outfits > 0)
 					if(ticker.mode.gang_outfit(usr,src,gang))

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

@@ -241,12 +241,12 @@
 	if((target.mind in (ticker.mode.head_revolutionaries | ticker.mode.A_bosses | ticker.mode.B_bosses)) || is_shadow_or_thrall(target))
 		target.visible_message("<span class='warning'>[target] seems to resist the implant!</span>", "<span class='warning'>You feel the corporate tendrils of Nanotrasen try to invade your mind!</span>")
 		return 0
-	if(target.mind in ticker.mode.revolutionaries)
-		ticker.mode.remove_revolutionary(target.mind)
 	if(target.mind in (ticker.mode.A_gang | ticker.mode.B_gang))
 		ticker.mode.remove_gangster(target.mind,exclude_bosses=1)
 		target.visible_message("<span class='warning'>[src] was destroyed in the process!</span>", "<span class='notice'>You feel a surge of loyalty towards Nanotrasen.</span>")
-		return
+		return 0
+	if(target.mind in ticker.mode.revolutionaries)
+		ticker.mode.remove_revolutionary(target.mind)
 	if(target.mind in ticker.mode.cult)
 		target << "<span class='warning'>You feel the corporate tendrils of Nanotrasen try to invade your mind!</span>"
 	else

html/changelogs/ikarrus-penis.yml

@@ -34,7 +34,6 @@ delete-after: True
 # Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
 changes: 
   - rscadd: "Multiple gang leaders are spawned at round start, the number which depends on server population"
-  - tweak: "Only the gang boss can recall the shuttle"
   - rscdel: "Gangsters can no longer be promoted mid-game."
   - rscadd: "Security can once again deconvert gangsters with loyalty implants"
   - rscadd: "Added an Implant Breaker item to the gangtool as a purchasable item for 10 influence each<BR>* They are a one-use item that destroys all implants in the target, including loyalty implants<BR>* They will also attempt to recruit the target before destroying itself"