Merge branch 'master' into TGUIs_Nexties

2020-01-30 20:46:20 +02:00
parent db36a90e35 55a0e4e55d
commit 83ce84cdc4
418 changed files with 3862 additions and 4206 deletions
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -46,7 +46,7 @@
 			return FALSE
 		switch(type)
 			if("feet")
-				if(!H.shoes)
+				if(!H.shoes || !(H.shoes.body_parts_covered & FEET))
 					affecting = H.get_bodypart(pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
 					H.Knockdown(60)
 			if(BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND)