Merge pull request #5 from ZomgPonies/master

Downstream update

code/modules/clothing/masks/miscellaneous.dm

@@ -143,3 +143,11 @@
 	item_state = "fawkes"
 	flags_inv = HIDEFACE
 	w_class = 2
+
+/obj/item/clothing/mask/gas/clown_hat/pennywise
+	name = "Pennywise Mask"
+	desc = "It's the eater of worlds, and of children."
+	icon_state = "pennywise_mask"
+	item_state = "pennywise_mask"
+	species_fit = list("Vox")
+	flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS | BLOCKHAIR

code/modules/clothing/under/miscellaneous.dm

@@ -518,3 +518,11 @@
 	icon_state = "soldieruniform"
 	_color = "soldieruniform"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/sexyclown
+	name = "sexy-clown suit"
+	desc = "It makes you look HONKable!"
+	icon_state = "pennywise"
+	item_state = "pennywise"
+	_color = "pennywise"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -76,3 +76,13 @@
 	icon_living = "kitten"
 	icon_dead = "kitten_dead"
 	gender = NEUTER
+
+/mob/living/simple_animal/cat/Syndi
+	name = "SyndiCat"
+	desc = "It's a SyndiCat droid."
+	icon_state = "Syndicat"
+	icon_living = "Syndicat"
+	icon_dead = "Syndicat_dead"
+	gender = FEMALE
+	var/turns_since_scan = 0
+	var/mob/living/simple_animal/mouse/movement_target

code/modules/mob/mob.dm

@@ -109,14 +109,17 @@
 	//	equip_to_slot_if_possible(W, slot)
 
 	if(istype(W))
-
-		if(W:rig_restrict_helmet)
-			src << "\red You must fasten the helmet to a hardsuit first. (Target the head)" // Stop eva helms equipping.
-		else
-			if(W:equip_time > 0)
-				delay_clothing_equip_to_slot_if_possible(W, slot)
+		if (istype(W, /obj/item/clothing))
+			var/obj/item/clothing/C = W
+			if(C.rig_restrict_helmet)
+				src << "\red You must fasten the helmet to a hardsuit first. (Target the head)" // Stop eva helms equipping.
 			else
-				equip_to_slot_if_possible(W, slot)
+				if(C.equip_time > 0)
+					delay_clothing_equip_to_slot_if_possible(C, slot)
+				else
+					equip_to_slot_if_possible(C, slot)
+		else
+			equip_to_slot_if_possible(W, slot)
 
 	if(ishuman(src) && W == src:head)
 		src:update_hair()