maru plushie belongs to donator module (#2828)

Fluffy-Frontier · Apr 12, 2024 · 32aa494 · 32aa494
1 parent e775c6f
commit 32aa494
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/tff_modular/master_files/icons/donator/obj/toys/plushie.dmi b/tff_modular/master_files/icons/donator/obj/toys/plushie.dmi
diff --git a/tff_modular/modules/toys/code/loadout_datum_toys.dm b/tff_modular/modules/toys/code/loadout_datum_toys.dm
@@ -33,8 +33,3 @@
 /datum/loadout_item/toys/special/yulia
 	name = "Yulia Plushie"
 	item_path = /obj/item/toy/plush/tff/yulia
-
-/datum/loadout_item/toys/special/maru
-	name = "Maru Plushie"
-	item_path = /obj/item/toy/plush/tff/maru
-	ckeywhitelist = list("mercreaper", "skadi999")
diff --git a/tff_modular/modules/toys/code/plushes.dm b/tff_modular/modules/toys/code/plushes.dm
@@ -75,11 +75,3 @@
 	attack_verb_continuous = list("attacks", "bites", "gnashes at", "hugs")
 	attack_verb_simple = list("attack", "bite", "gnash at", "hug")
 	squeak_override = list('sound/weapons/bite.ogg' = 1,'modular_nova/modules/emotes/sound/voice/feline_purr.ogg' = 1)
-
-/obj/item/toy/plush/tff/maru
-	name = "Maru plushie"
-	desc = "An adorable stuffed toy, resembling a shark, wearing a formal maid suit. Beware of runes on the floor!"
-	icon_state = "plush_ivolga"
-	attack_verb_continuous = list("attacks", "bites", "gnashes at", "casts at")
-	attack_verb_simple = list("attack", "bite", "gnash at", "cast at")
-	squeak_override = list('sound/weapons/bite.ogg' = 1,'tff_modular/modules/toys/sounds/castsummon.ogg' = 1)
diff --git a/tff_modular/modules/toys/icons/plushes.dmi b/tff_modular/modules/toys/icons/plushes.dmi
diff --git a/tff_modular/modules/~donator/items/donator_items.dm b/tff_modular/modules/~donator/items/donator_items.dm
@@ -5,3 +5,12 @@
 	icon_state = "zanozkin_plushie"
 	gender = FEMALE
 	squeak_override = list('modular_nova/modules/emotes/sound/voice/trills.ogg' = 1)
+
+/obj/item/toy/plush/maru
+	name = "Maru plushie"
+	desc = "An adorable stuffed toy, resembling a shark, wearing a formal maid suit. Beware of runes on the floor!"
+	icon = 'tff_modular/master_files/icons/donator/obj/toys/plushie.dmi'
+	icon_state = "plush_ivolga"
+	attack_verb_continuous = list("attacks", "bites", "gnashes at", "casts at")
+	attack_verb_simple = list("attack", "bite", "gnash at", "cast at")
+	squeak_override = list('sound/weapons/bite.ogg' = 1,'tff_modular/modules/toys/sounds/castsummon.ogg' = 1)
diff --git a/tff_modular/modules/~donator/loadout.dm b/tff_modular/modules/~donator/loadout.dm
@@ -97,3 +97,8 @@
 	name = "Oktavia"
 	item_path= /obj/item/toy/plush/oktavia
 	ckeywhitelist = list("zanozkin")
+
+/datum/loadout_item/toys/maru
+	name = "Maru Plushie"
+	item_path = /obj/item/toy/plush/maru
+	ckeywhitelist = list("mercreaper", "skadi999")