diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm index 00950993..30a9a3c2 100644 --- a/hyperstation/code/obj/plushes.dm +++ b/hyperstation/code/obj/plushes.dm @@ -54,11 +54,21 @@ 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." + name = "hyena plushie" + desc = "An adorable stuffed toy of a mammal that seems to resemble a crew member! She's a little yeen in a big labcoat." + gender = FEMALE //probably a girl icon = 'hyperstation/icons/obj/plushes.dmi' icon_state = "lyricalpaws" item_state = "lyricalpaws" + attack_verb = list("hugged", "cuddled", "embraced") + squeak_override = list( + 'modular_citadel/sound/voice/bark1.ogg' = 1, + 'modular_citadel/sound/voice/bark2.ogg' = 1 + ) + +/obj/item/toy/plush/mammal/lyricalpaws/attack_self(mob/user) + to_chat(user, "You pet [src]. You swear she looks up at you.") + /obj/item/toy/plush/mammal/chemlight desc = "An adorable stuffed toy of a mammal that seems to resemble a crew member! It looks to glow and sport four arms." diff --git a/hyperstation/code/obj/rewards.dm b/hyperstation/code/obj/rewards.dm index 5dfbeb94..01f07b53 100644 --- a/hyperstation/code/obj/rewards.dm +++ b/hyperstation/code/obj/rewards.dm @@ -103,4 +103,24 @@ alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi' icon_state = "keaton" flags_inv = HIDEFACE|HIDEFACIALHAIR - w_class = WEIGHT_CLASS_SMALL \ No newline at end of file + w_class = WEIGHT_CLASS_SMALL + +/obj/item/clothing/suit/hooded/wintercoat/chloe + name = "Fleet Commander's Overcoat" + desc = "Custom tailored to warm the cold commanding hearts of the Syndicate's feared XIV'th battle group. Its armour plating has been removed, but its beret remains inside." + icon_state = "commissar_greatcoat" + item_state = "commissar_greatcoat" + allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/screwdriver, /obj/item/crowbar, /obj/item/wrench, /obj/item/stack/cable_coil, /obj/item/weldingtool, /obj/item/multitool) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + body_parts_covered = CHEST|GROIN|ARMS|LEGS + mutantrace_variation = MUTANTRACE_VARIATION + tauric = TRUE + hoodtype = /obj/item/clothing/head/hooded/winterhood/chloe + +/obj/item/clothing/head/hooded/winterhood/chloe + name = "Fleet Commander's Beret" + desc = "A beret bearing a worn golden symbol that stikes fear in the hearts of many. It smells faintly of plasma and gunpowder." + icon = 'hyperstation/icons/obj/clothing/rewards.dmi' + alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi' + icon_state = "commissar_beret" + item_state = "commissar_beret" \ No newline at end of file diff --git a/hyperstation/icons/mobs/rewards.dmi b/hyperstation/icons/mobs/rewards.dmi index 435e46fc..7a92799b 100644 Binary files a/hyperstation/icons/mobs/rewards.dmi and b/hyperstation/icons/mobs/rewards.dmi differ diff --git a/hyperstation/icons/obj/clothing/rewards.dmi b/hyperstation/icons/obj/clothing/rewards.dmi index c6293a95..ac43a627 100644 Binary files a/hyperstation/icons/obj/clothing/rewards.dmi and b/hyperstation/icons/obj/clothing/rewards.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index eb8f9c9f..68b090c9 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/suit_digi.dmi b/icons/mob/suit_digi.dmi index ba14c672..efefb543 100644 Binary files a/icons/mob/suit_digi.dmi and b/icons/mob/suit_digi.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 56e5baa5..9ea46443 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 0f26e7dc..fa910e94 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -105,6 +105,12 @@ path = /obj/item/toy/plush/mammal/lyricalpaws ckeywhitelist = list("lyricalpaws") +/datum/gear/lyricalpawssuit + name = "Fleet Commander's Overcoat" + category = SLOT_IN_BACKPACK + path = /obj/item/clothing/suit/hooded/wintercoat/chloe + ckeywhitelist = list("lyricalpaws") + /datum/gear/cherostavikmask name = "Keaton Mask" category = SLOT_IN_BACKPACK diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi index 23066ed4..5c4c534a 100644 Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ diff --git a/modular_citadel/icons/mob/taur_naga.dmi b/modular_citadel/icons/mob/taur_naga.dmi index 5a8e3c80..48a51d73 100644 Binary files a/modular_citadel/icons/mob/taur_naga.dmi and b/modular_citadel/icons/mob/taur_naga.dmi differ