Ports Different Variants of Nian Plushies and Introduces a Plush Spaw…

…ner (ParadiseSS13#27450) * ports over more nian plushies from shiptest/beestation and introduces plushies into maint loot * remove a value Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * removed a value Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * removed a value Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * remove a value Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * Update code/game/objects/effects/spawners/random/plushie_spawners.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * Update code/game/objects/effects/spawners/random/plushie_spawners.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * this should fix the conflict * please let this upload fix the conflict Signed-off-by: Hayden Redacted <[email protected]> * i need to stop pressing commit as a form of saving, my apologies. * added the dmi back * fixing indentation * removes a comment. Co-authored-by: Contrabang <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * bumps the weight of tools and materials up to 4 --------- Signed-off-by: Hayden Redacted <[email protected]> Co-authored-by: warriorstar-orion <[email protected]> Co-authored-by: Contrabang <[email protected]>
Latentish · Dec 18, 2024 · ed626bf · ed626bf
1 parent 4f06c20
commit ed626bf
Show file tree

Hide file tree

Showing 6 changed files with 193 additions and 3 deletions.
diff --git a/code/_globalvars/lists/maint_loot_tables.dm b/code/_globalvars/lists/maint_loot_tables.dm
@@ -1,10 +1,12 @@
 GLOBAL_LIST_INIT(maintenance_loot_tier_0, list(
 	list(
 		// Tools
-		/obj/effect/spawner/random/engineering/tools,
+		/obj/effect/spawner/random/engineering/tools = 4,
 
 		// Materials
-		/obj/effect/spawner/random/engineering/materials,
+		/obj/effect/spawner/random/engineering/materials = 4,
+		// Plushies
+		/obj/effect/spawner/random/plushies = 1,
 	) = 6,
 
 	list(

diff --git a/code/game/objects/effects/spawners/random/plushie_spawners.dm b/code/game/objects/effects/spawners/random/plushie_spawners.dm
@@ -0,0 +1,85 @@
+/obj/effect/spawner/random/plushies
+	name = "plushie spawner"
+	icon = 'icons/effects/random_spawners.dmi'
+	icon_state = "plushie"
+	loot = list(
+		list(
+			/obj/item/toy/plushie/carpplushie/ice,
+			/obj/item/toy/plushie/carpplushie/silent,
+			/obj/item/toy/plushie/carpplushie/silent,
+			/obj/item/toy/plushie/carpplushie/electric,
+			/obj/item/toy/plushie/carpplushie/gold,
+			/obj/item/toy/plushie/carpplushie/toxin,
+			/obj/item/toy/plushie/carpplushie/dragon,
+			/obj/item/toy/plushie/carpplushie/pink,
+			/obj/item/toy/plushie/carpplushie/candy,
+			/obj/item/toy/plushie/carpplushie/nebula,
+			/obj/item/toy/plushie/carpplushie/void
+		),
+
+		list(
+			/obj/item/toy/plushie/red_fox,
+			/obj/item/toy/plushie/black_fox,
+			/obj/item/toy/plushie/marble_fox,
+			/obj/item/toy/plushie/blue_fox,
+			/obj/item/toy/plushie/orange_fox,
+			/obj/item/toy/plushie/coffee_fox,
+			/obj/item/toy/plushie/pink_fox,
+			/obj/item/toy/plushie/purple_fox,
+			/obj/item/toy/plushie/crimson_fox
+		),
+
+		list(
+			/obj/item/toy/plushie/corgi,
+			/obj/item/toy/plushie/girly_corgi,
+			/obj/item/toy/plushie/robo_corgi,
+			/obj/item/toy/plushie/octopus,
+			/obj/item/toy/plushie/face_hugger,
+			/obj/item/toy/plushie/deer,
+			/obj/item/toy/plushie/snakeplushie,
+			/obj/item/toy/plushie/lizardplushie,
+			/obj/item/toy/plushie/slimeplushie,
+			/obj/item/toy/plushie/nukeplushie,
+			/obj/item/toy/plushie/shark
+		),
+
+		list(
+			/obj/item/toy/plushie/black_cat,
+			/obj/item/toy/plushie/grey_cat,
+			/obj/item/toy/plushie/white_cat,
+			/obj/item/toy/plushie/orange_cat,
+			/obj/item/toy/plushie/siamese_cat,
+			/obj/item/toy/plushie/tabby_cat,
+			/obj/item/toy/plushie/tuxedo_cat
+		),
+
+		list(// species plushie minus nian
+			/obj/item/toy/plushie/voxplushie,
+			/obj/item/toy/plushie/ipcplushie,
+			/obj/item/toy/plushie/greyplushie,
+			/obj/item/toy/plushie/nianplushie,
+			/obj/item/toy/plushie/abductor,
+			/obj/item/toy/plushie/abductor/agent
+		),
+
+		list (
+			/obj/item/toy/plushie/nianplushie = 3,
+			/obj/item/toy/plushie/nianplushie/monarch = 2,
+			/obj/item/toy/plushie/nianplushie/luna = 2,
+			/obj/item/toy/plushie/nianplushie/atlas = 2,
+			/obj/item/toy/plushie/nianplushie/reddish = 2,
+			/obj/item/toy/plushie/nianplushie/royal = 2,
+			/obj/item/toy/plushie/nianplushie/gothic = 2,
+			/obj/item/toy/plushie/nianplushie/lovers = 2,
+			/obj/item/toy/plushie/nianplushie/whitefly = 2,
+			/obj/item/toy/plushie/nianplushie/punished = 2,
+			/obj/item/toy/plushie/nianplushie/firewatch = 2,
+			/obj/item/toy/plushie/nianplushie/deadhead = 2,
+			/obj/item/toy/plushie/nianplushie/poison = 2,
+			/obj/item/toy/plushie/nianplushie/ragged = 2,
+			/obj/item/toy/plushie/nianplushie/snow = 2,
+			/obj/item/toy/plushie/nianplushie/clockwork = 2,
+			/obj/item/toy/plushie/nianplushie/moonfly = 2,
+			/obj/item/toy/plushie/nianplushie/rainbow = 1
+		),
+	)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
@@ -879,7 +879,109 @@
 	visible_message("<span class='danger'>Buzzzz!</span>")
 	cooldown = TRUE
 	addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 3 SECONDS)
-
+
+/obj/item/toy/plushie/nianplushie/monarch
+	name = "monarch nian plushie"
+	desc = "A monarch nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_monarch"
+	item_state = "plushie_nian_monarch"
+
+/obj/item/toy/plushie/nianplushie/luna
+	name = "luna nian plushie"
+	desc = "A luna nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_luna"
+	item_state = "plushie_nian_luna"
+
+/obj/item/toy/plushie/nianplushie/atlas
+	name = "atlas nian plushie"
+	desc = "An atlas nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_atlas"
+	item_state = "plushie_nian_atlas"
+
+/obj/item/toy/plushie/nianplushie/reddish
+	name = "reddish nian plushie"
+	desc = "A reddish nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_reddish"
+	item_state = "plushie_nian_reddish"
+
+/obj/item/toy/plushie/nianplushie/royal
+	name = "royal nian plushie"
+	desc = "A royal nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_royal"
+	item_state = "plushie_nian_royal"
+
+/obj/item/toy/plushie/nianplushie/gothic
+	name = "gothic nian plushie"
+	desc = "A gothic nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_gothic"
+	item_state = "plushie_nian_gothic"
+
+/obj/item/toy/plushie/nianplushie/lovers
+	name = "lovers nian plushie"
+	desc = "A lovers nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_lovers"
+	item_state = "plushie_nian_lovers"
+
+/obj/item/toy/plushie/nianplushie/whitefly
+	name = "whitefly nian plushie"
+	desc = "A whitefly nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_whitefly"
+	item_state = "plushie_nian_whitefly"
+
+/obj/item/toy/plushie/nianplushie/punished
+	name = "punished nian plushie"
+	desc = "A punnished nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_punished"
+	item_state = "plushie_nian_punished"
+
+/obj/item/toy/plushie/nianplushie/firewatch
+	name = "firewatch nian plushie"
+	desc = "A firewtach nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_firewatch"
+	item_state = "plushie_nian_firewatch"
+
+/obj/item/toy/plushie/nianplushie/deadhead
+	name = "deathshead nian plushie"
+	desc = "A deathshead nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_deadhead"
+	item_state = "plushie_nian_deadhead"
+
+/obj/item/toy/plushie/nianplushie/poison
+	name = "poison nian plushie"
+	desc = "A poison nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_poison"
+	item_state = "plushie_nian_poison"
+
+/obj/item/toy/plushie/nianplushie/ragged
+	name = "ragged nian plushie"
+	desc = "A ragged nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_ragged"
+	item_state = "plushie_nian_ragged"
+
+/obj/item/toy/plushie/nianplushie/snow
+	name = "snow nian plushie"
+	desc = "A snow nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_snow"
+	item_state = "plushie_nian_snow"
+
+/obj/item/toy/plushie/nianplushie/clockwork
+	name = "clockwork nian plushie"
+	desc = "A clockwork nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_clockwork"
+	item_state = "plushie_nian_clockwork"
+
+/obj/item/toy/plushie/nianplushie/moonfly
+	name = "moonfly nian plushie"
+	desc = "A moonfly nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_moonfly"
+	item_state = "plushie_nian_moonfly"
+
+/obj/item/toy/plushie/nianplushie/rainbow
+	name = "rainbow nian plushie"
+	desc = "A rainbow nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
+	icon_state = "plushie_nian_rainbow"
+	item_state = "plushie_nian_rainbow"
+
 /obj/item/toy/plushie/shark
 	name = "shark plushie"
 	desc = "A plushie depicting a somewhat cartoonish shark. The tag calls it a 'hákarl', noting that it was made by an obscure furniture manufacturer in old Scandinavia."

diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
diff --git a/paradise.dme b/paradise.dme
@@ -1047,6 +1047,7 @@
 #include "code\game\objects\effects\spawners\random\loot_spawners.dm"
 #include "code\game\objects\effects\spawners\random\maint_loot_spawners.dm"
 #include "code\game\objects\effects\spawners\random\misc_spawners.dm"
+#include "code\game\objects\effects\spawners\random\plushie_spawners.dm"
 #include "code\game\objects\effects\spawners\random\random_spawner.dm"
 #include "code\game\objects\effects\spawners\random\trash_spawners.dm"
 #include "code\game\objects\effects\spawners\random\pool\pool_spawner.dm"