Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization

2020-04-17 18:56:26 -07:00
parent c8ce60c856 0e55de55a7
commit 33039f9962
567 changed files with 36057 additions and 36365 deletions
@@ -558,7 +558,6 @@
 				to_chat(R,"<span class='warning'>Your attempt to escape [lowertext(name)] has failed!</span>")
 				to_chat(owner,"<span class='notice'>The attempt to escape from your [lowertext(name)] has failed!</span>")
 				return
-			return

 	var/struggle_outer_message = pick(struggle_messages_outside)
 	var/struggle_user_message = pick(struggle_messages_inside)