diff --git a/modular_bluemoon/SmiLeY/sounds/tiamat_meow1.ogg b/modular_bluemoon/SmiLeY/sounds/tiamat_meow1.ogg new file mode 100644 index 000000000000..6ed99f0d581e Binary files /dev/null and b/modular_bluemoon/SmiLeY/sounds/tiamat_meow1.ogg differ diff --git a/modular_bluemoon/SmiLeY/sounds/tiamat_meow2.ogg b/modular_bluemoon/SmiLeY/sounds/tiamat_meow2.ogg new file mode 100644 index 000000000000..34bb375fe5db Binary files /dev/null and b/modular_bluemoon/SmiLeY/sounds/tiamat_meow2.ogg differ diff --git a/modular_bluemoon/SmiLeY/sounds/tiamat_meow3.ogg b/modular_bluemoon/SmiLeY/sounds/tiamat_meow3.ogg new file mode 100644 index 000000000000..0af0cb0e07b1 Binary files /dev/null and b/modular_bluemoon/SmiLeY/sounds/tiamat_meow3.ogg differ diff --git a/modular_bluemoon/SmiLeY/sounds/tiamat_mrrp1.ogg b/modular_bluemoon/SmiLeY/sounds/tiamat_mrrp1.ogg new file mode 100644 index 000000000000..dd37f0a12991 Binary files /dev/null and b/modular_bluemoon/SmiLeY/sounds/tiamat_mrrp1.ogg differ diff --git a/modular_bluemoon/SmiLeY/sounds/tiamat_mrrp2.ogg b/modular_bluemoon/SmiLeY/sounds/tiamat_mrrp2.ogg new file mode 100644 index 000000000000..1c1fe6951ad5 Binary files /dev/null and b/modular_bluemoon/SmiLeY/sounds/tiamat_mrrp2.ogg differ diff --git a/modular_bluemoon/code/game/objects/items/plushes.dm b/modular_bluemoon/code/game/objects/items/plushes.dm index b71eabf4842c..30dac2f589cc 100644 --- a/modular_bluemoon/code/game/objects/items/plushes.dm +++ b/modular_bluemoon/code/game/objects/items/plushes.dm @@ -96,3 +96,21 @@ icon_state = "zlat" item_state = "zlat" squeak_override = list('modular_bluemoon/SmiLeY/sounds/zlatchek.ogg' = 1) + +/obj/item/toy/plush/mammal/tiamat + name = "Tiamat plushie" + desc = "Some cat-like plushie. Oh, his eyes shining!" + icon = 'modular_bluemoon/kovac_shitcode/icons/vulps/vulps.dmi' + icon_state = "tiamat" + item_state = "tiamat" + lefthand_file = 'modular_bluemoon/kovac_shitcode/icons/vulps/vulps_l.dmi' + righthand_file = 'modular_bluemoon/kovac_shitcode/icons/vulps/vulps_r.dmi' + squeak_override = list( + 'modular_splurt/sound/voice/mrowl.ogg' = 1, + 'modular_splurt/sound/voice/meow_meme.ogg' = 1, + 'modular_bluemoon/SmiLeY/sounds/tiamat_mrrp1.ogg' = 1, + 'modular_bluemoon/SmiLeY/sounds/tiamat_mrrp2.ogg' = 1, + 'modular_bluemoon/SmiLeY/sounds/tiamat_meow1.ogg' = 1, + 'modular_bluemoon/SmiLeY/sounds/tiamat_meow2.ogg' = 1, + 'modular_bluemoon/SmiLeY/sounds/tiamat_meow3.ogg' = 1 + ) diff --git a/modular_bluemoon/fluffs/code/donator.dm b/modular_bluemoon/fluffs/code/donator.dm index 087ecfd4b50c..9f8f777451b3 100644 --- a/modular_bluemoon/fluffs/code/donator.dm +++ b/modular_bluemoon/fluffs/code/donator.dm @@ -891,12 +891,19 @@ subcategory = LOADOUT_SUBCATEGORIES_DON02 /datum/gear/donator/bm/aki_camo - name = "Adler Peacekeeper uniform" + name = "Old Guard NRI uniform" slot = ITEM_SLOT_ICLOTHING path = /obj/item/clothing/under/donator/bm/aki_camo ckeywhitelist = list("akinight") subcategory = LOADOUT_SUBCATEGORIES_DON02 +/datum/gear/donator/bm/aki_adler_camo + name = "Adler Peacekeeper uniform" + slot = ITEM_SLOT_ICLOTHING + path = /obj/item/clothing/under/donator/bm/aki_adler_camo + ckeywhitelist = list("akinight") + subcategory = LOADOUT_SUBCATEGORIES_DON02 + /datum/gear/donator/bm/nri_mundir name = "Old mundir NRI" slot = ITEM_SLOT_ICLOTHING diff --git a/modular_bluemoon/fluffs/code/under.dm b/modular_bluemoon/fluffs/code/under.dm index efd5200f3c02..71d0bfe4d3d6 100644 --- a/modular_bluemoon/fluffs/code/under.dm +++ b/modular_bluemoon/fluffs/code/under.dm @@ -145,8 +145,15 @@ can_adjust = FALSE /obj/item/clothing/under/donator/bm/aki_camo - name = "Adler Peacekeeper uniform" - desc = "Peacekeeper uniforms are custom-made for corporations in the Taywar sector. Simulates all the features of Merenid biology to perfectly match any personality, as well as some types of low-quality races." + name = "Old Guard NRI uniform" + desc = "A sample of the old uniform of the border special forces-troops of the NRI Guard. This one is adapted for anthropomorphs." icon_state = "adlercamo" item_state = "adlercamo" can_adjust = FALSE + +/obj/item/clothing/under/donator/bm/aki_adler_camo + name = "Adler Peacekeeper uniform" + desc = "Peacekeeper uniforms are custom-made for corporations in the Taywar sector. Simulates all the features of Merenid biology to perfectly match any personality, as well as some types of low-quality races." + icon_state = "adlerpk" + item_state = "adlerpk" + can_adjust = FALSE diff --git a/modular_bluemoon/fluffs/icons/mob/clothing/under.dmi b/modular_bluemoon/fluffs/icons/mob/clothing/under.dmi index 44cad5670f59..d664584c190e 100644 Binary files a/modular_bluemoon/fluffs/icons/mob/clothing/under.dmi and b/modular_bluemoon/fluffs/icons/mob/clothing/under.dmi differ diff --git a/modular_bluemoon/fluffs/icons/mob/clothing/under_digi.dmi b/modular_bluemoon/fluffs/icons/mob/clothing/under_digi.dmi index 0102746da72a..b7bb6cac197f 100644 Binary files a/modular_bluemoon/fluffs/icons/mob/clothing/under_digi.dmi and b/modular_bluemoon/fluffs/icons/mob/clothing/under_digi.dmi differ diff --git a/modular_bluemoon/fluffs/icons/obj/bwal.dmi b/modular_bluemoon/fluffs/icons/obj/bwal.dmi index 80fc796a5458..178913db3fc5 100644 Binary files a/modular_bluemoon/fluffs/icons/obj/bwal.dmi and b/modular_bluemoon/fluffs/icons/obj/bwal.dmi differ diff --git a/modular_bluemoon/fluffs/icons/obj/clothing/under.dmi b/modular_bluemoon/fluffs/icons/obj/clothing/under.dmi index bb38657ef0ea..0212a5c708cf 100644 Binary files a/modular_bluemoon/fluffs/icons/obj/clothing/under.dmi and b/modular_bluemoon/fluffs/icons/obj/clothing/under.dmi differ diff --git a/modular_bluemoon/kovac_shitcode/icons/vulps/vulps.dmi b/modular_bluemoon/kovac_shitcode/icons/vulps/vulps.dmi index 869144b6afc2..0165a752fe98 100644 Binary files a/modular_bluemoon/kovac_shitcode/icons/vulps/vulps.dmi and b/modular_bluemoon/kovac_shitcode/icons/vulps/vulps.dmi differ diff --git a/modular_bluemoon/kovac_shitcode/icons/vulps/vulps_l.dmi b/modular_bluemoon/kovac_shitcode/icons/vulps/vulps_l.dmi index e16d0c9a8b1b..dd03302b0881 100644 Binary files a/modular_bluemoon/kovac_shitcode/icons/vulps/vulps_l.dmi and b/modular_bluemoon/kovac_shitcode/icons/vulps/vulps_l.dmi differ diff --git a/modular_bluemoon/kovac_shitcode/icons/vulps/vulps_r.dmi b/modular_bluemoon/kovac_shitcode/icons/vulps/vulps_r.dmi index a652b009dd53..ae9694177bd7 100644 Binary files a/modular_bluemoon/kovac_shitcode/icons/vulps/vulps_r.dmi and b/modular_bluemoon/kovac_shitcode/icons/vulps/vulps_r.dmi differ