Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-04 16:01:25 -07:00
parent 611fd7ea89 66638a39b7
commit 6a8a606f97
1118 changed files with 49543 additions and 11522 deletions
@@ -89,10 +89,10 @@
 	stored_items = list()


-/obj/item/organ/cyberimp/brain/anti_drop/Remove(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/cyberimp/brain/anti_drop/Remove(special = FALSE)
 	if(active)
 		ui_action_click()
-	..()
+	return ..()


 /obj/item/organ/cyberimp/brain/anti_stun