Skip to content

Commit

Permalink
2-ckey-items (BlueMoon-Labs#1267)
Browse files Browse the repository at this point in the history
1234
  • Loading branch information
Oni328 authored Sep 10, 2024
1 parent 90a9ff4 commit 6d2cf36
Show file tree
Hide file tree
Showing 15 changed files with 35 additions and 3 deletions.
Binary file added modular_bluemoon/SmiLeY/sounds/tiamat_meow1.ogg
Binary file not shown.
Binary file added modular_bluemoon/SmiLeY/sounds/tiamat_meow2.ogg
Binary file not shown.
Binary file added modular_bluemoon/SmiLeY/sounds/tiamat_meow3.ogg
Binary file not shown.
Binary file added modular_bluemoon/SmiLeY/sounds/tiamat_mrrp1.ogg
Binary file not shown.
Binary file added modular_bluemoon/SmiLeY/sounds/tiamat_mrrp2.ogg
Binary file not shown.
18 changes: 18 additions & 0 deletions modular_bluemoon/code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
9 changes: 8 additions & 1 deletion modular_bluemoon/fluffs/code/donator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions modular_bluemoon/fluffs/code/under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified modular_bluemoon/fluffs/icons/mob/clothing/under.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/mob/clothing/under_digi.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/obj/bwal.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/obj/clothing/under.dmi
Binary file not shown.
Binary file modified modular_bluemoon/kovac_shitcode/icons/vulps/vulps.dmi
Binary file not shown.
Binary file modified modular_bluemoon/kovac_shitcode/icons/vulps/vulps_l.dmi
Binary file not shown.
Binary file modified modular_bluemoon/kovac_shitcode/icons/vulps/vulps_r.dmi
Binary file not shown.

0 comments on commit 6d2cf36

Please sign in to comment.