diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm index cea9fbc0..82a6b8a6 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm +++ b/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" diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 261c7611..2aca847e 100644 --- a/code/modules/projectiles/projectile.dm +++ b/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) diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm index fd604f8b..32091d49 100644 --- a/hyperstation/code/obj/plushes.dm +++ b/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) \ No newline at end of file + 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" \ No newline at end of file diff --git a/hyperstation/icons/obj/plushes.dmi b/hyperstation/icons/obj/plushes.dmi index c2c73411..401488a6 100644 Binary files a/hyperstation/icons/obj/plushes.dmi and b/hyperstation/icons/obj/plushes.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index cde5b1b1..6babeb65 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 34d70abf..6ecca70c 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/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") + diff --git a/modular_citadel/icons/mob/mam_snouts.dmi b/modular_citadel/icons/mob/mam_snouts.dmi index 87a9fd70..d2fef25a 100644 Binary files a/modular_citadel/icons/mob/mam_snouts.dmi and b/modular_citadel/icons/mob/mam_snouts.dmi differ