Merge pull request #3 from quotefox/master

Fuggin updates

code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm

@@ -470,3 +470,7 @@
 /datum/sprite_accessory/hair/quotey
 	name = "Tail Hair"
 	icon_state = "hair_tailhair"
+
+/datum/sprite_accessory/hair/mommy
+	name = "Hairfre"
+	icon_state = "hair_hairfre"

code/modules/projectiles/projectile.dm

@@ -176,10 +176,6 @@
 					new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir, bloodtype_to_color(H.dna.blood_type))
 				else
 					new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir, bloodtype_to_color())
-			if(iscarbon(L) && !HAS_TRAIT(L, TRAIT_NOMARROW))
-				var/mob/living/carbon/C = L
-				C.bleed(damage)
-			else
 				L.add_splatter_floor(target_loca)
 		else if(impact_effect_type && !hitscan)
 			new impact_effect_type(target_loca, hitx, hity)

hyperstation/code/obj/plushes.dm

@@ -51,4 +51,11 @@
 	icon_state = "grug"
 	item_state = "grug"
 	attack_verb = list("thomped", "ook'd", "stoned")
-	squeak_override = list('sound/voice/gorillaplush.ogg' = 1)
+	squeak_override = list('sound/voice/gorillaplush.ogg' = 1)
+
+/obj/item/toy/plush/mammal/lyricalpaws
+	name = "Winter Dawn Plushie"
+	desc = "Winter Dawn in plushie form! Very cuddly."
+	icon = 'hyperstation/icons/obj/plushes.dmi'
+	icon_state = "lyricalpaws"
+	item_state = "lyricalpaws"

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -99,3 +99,9 @@
 	path = /obj/item/clothing/head/crystalline
 	ckeywhitelist = list("dragontrance")
 
+/datum/gear/lyricalpawsplush
+	name = "Winter Dawn Plushie"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/toy/plush/mammal/lyricalpaws
+	ckeywhitelist = list("lyricalpaws")
+