Merge remote-tracking branch 'upstream/master' into SPIN_ME_RIGHT_ROUND

# Conflicts:
#	paradise.dme
This commit is contained in:
tigercat2000
2018-10-24 23:43:25 -07:00
88 changed files with 4393 additions and 2448 deletions
+1
View File
@@ -407,6 +407,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/S = H.bodyparts_by_name[user.zone_sel.selecting]
if(!S)
return