Merge remote-tracking branch 'origin/master' into TGUI-3.0

2020-07-07 18:37:45 +03:00
parent 8cbe248465 1d791c4808
commit 280d3de6c3
93 changed files with 1927 additions and 1337 deletions
@@ -189,6 +189,8 @@
 	if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards))
 		to_chat(user, "<span class='warning'>You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.</span>")
 		user.dropItemToGround(src)
+		return
+	return ..()


 /obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user,roll)