Skip to content

Commit

Permalink
Merge pull request #961 from SPLURT-Station/donator-mask
Browse files Browse the repository at this point in the history
replica ninja mask
  • Loading branch information
MosleyTheMalO authored Oct 3, 2023
2 parents b00a2ef + bebc910 commit 84f32a7
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 1 deletion.
8 changes: 8 additions & 0 deletions modular_splurt/code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,11 @@
icon_state = "nobl_plush"
item_state = "nobl_plush"
squeak_override = list('modular_splurt/sound/misc/dog_toy.ogg' = 1)

/obj/item/toy/plush/foth
name = "Foth Plushie"
desc = "A plushie mixed between a fox and a moth, seemingly representing a magical being with a funny tophat."
icon = 'modular_splurt/icons/obj/plushes.dmi'
icon_state = "foth_plush"
item_state = "foth_plush"
squeak_override = list('modular_splurt/sound/misc/fox_squeak.ogg' = 1, 'modular_splurt/sound/misc/fox_squeak1.ogg' = 1, 'modular_splurt/sound/misc/fox_squeak2.ogg' = 1)
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@

/datum/gear/donator/shoes
slot = ITEM_SLOT_FEET

/datum/gear/donator/mask
slot = ITEM_SLOT_MASK
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,11 @@
cost = 2
ckeywhitelist = list()
donator_group_id = DONATOR_GROUP_TIER_2

// Mask
/datum/gear/donator/mask/ninja_replica
name = "Replica Ninja Mask"
path = /obj/item/clothing/mask/ninja_replica
cost = 1
ckeywhitelist = list()
donator_group_id = DONATOR_GROUP_TIER_2
8 changes: 8 additions & 0 deletions modular_splurt/code/modules/clothing/masks/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,11 @@
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/mask_muzzle.dmi'
icon_state = "ballgag"
item_state = "ballgag"

/obj/item/clothing/mask/ninja_replica
name = "Replica Ninja Mask"
desc = "It's a ninja mask! But this one seems like it's breathable."
icon_state = "s-ninja"
item_state = "s-ninja_mask"
flags_inv = HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
Binary file modified modular_splurt/icons/obj/plushes.dmi
Binary file not shown.
Binary file added modular_splurt/sound/misc/fox_squeak.ogg
Binary file not shown.
Binary file added modular_splurt/sound/misc/fox_squeak1.ogg
Binary file not shown.
Binary file added modular_splurt/sound/misc/fox_squeak2.ogg
Binary file not shown.
2 changes: 1 addition & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4930,7 +4930,6 @@
#include "modular_splurt\code\modules\research\techweb\nodes\medical_nodes.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\nanites_nodes.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\robotic_nodes.dm"
#include "modular_splurt\code\modules\resize\resizing.dm"
#include "modular_splurt\code\modules\research\xenoarch\artifact.dm"
#include "modular_splurt\code\modules\research\xenoarch\artifact_list.dm"
#include "modular_splurt\code\modules\research\xenoarch\strange_rock.dm"
Expand All @@ -4945,6 +4944,7 @@
#include "modular_splurt\code\modules\research\xenoarch\xenobotany\grown\thaadra.dm"
#include "modular_splurt\code\modules\research\xenoarch\xenobotany\grown\vale.dm"
#include "modular_splurt\code\modules\research\xenoarch\xenobotany\grown\vaporsac.dm"
#include "modular_splurt\code\modules\resize\resizing.dm"
#include "modular_splurt\code\modules\resize\smallsprite_action.dm"
#include "modular_splurt\code\modules\ruins\objects_and_mobs\ash_walker_den.dm"
#include "modular_splurt\code\modules\ruins\objects_and_mobs\radio.dm"
Expand Down

0 comments on commit 84f32a7

Please sign in to comment.