[MIRROR] Dragon Plushie Upport (#11700)

Co-authored-by: MeepleMuncher <76881946+MeepleMuncher@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/datums/supplypacks/misc.dm

@@ -90,6 +90,13 @@
 			/obj/item/toy/plushie/otter,
 			/obj/item/toy/plushie/vox,
 			/obj/item/toy/plushie/shark,
+			/obj/item/toy/plushie/dragon,
+			/obj/item/toy/plushie/dragon/green,
+			/obj/item/toy/plushie/dragon/purple,
+			/obj/item/toy/plushie/dragon/red_east,
+			/obj/item/toy/plushie/dragon/green_east,
+			/obj/item/toy/plushie/dragon/white_east,
+			/obj/item/toy/plushie/dragon/gold_east,
 			//VOREStation Add End
 			//YawnWider Add Start
 			/obj/item/toy/plushie/teshari/_yw,
@@ -98,12 +105,6 @@
 			/obj/item/toy/plushie/teshari/y_yw,
 			//YawnWider Add End
 			//CHOMPStation Add Start
-			/obj/item/toy/plushie/dragon,
-			/obj/item/toy/plushie/dragon/green,
-			/obj/item/toy/plushie/dragon/purple,
-			/obj/item/toy/plushie/dragon/white_east,
-			/obj/item/toy/plushie/dragon/red_east,
-			/obj/item/toy/plushie/dragon/green_east,
 			/obj/item/toy/plushie/teppi,
 			/obj/item/toy/plushie/teppi/alt
 			//CHOMPStation Add End

code/game/machinery/clawmachine.dm

@@ -70,16 +70,18 @@
 						/obj/item/toy/plushie/tinytin,
 						/obj/item/toy/plushie/tinytin_sec
 						//CHOMPStation Add Start
+						/obj/item/toy/plushie/teppi,
+						/obj/item/toy/plushie/teppi/alt,
+						//CHOMPStation Add End
+						/obj/item/toy/plushie/tinytin_sec,
 						/obj/item/toy/plushie/dragon,
 						/obj/item/toy/plushie/dragon/green,
 						/obj/item/toy/plushie/dragon/purple,
-						/obj/item/toy/plushie/dragon/white_east,
 						/obj/item/toy/plushie/dragon/red_east,
 						/obj/item/toy/plushie/dragon/green_east,
-						/obj/item/toy/plushie/dragon/gold_east,
+						/obj/item/toy/plushie/dragon/white_east,
-						/obj/item/toy/plushie/teppi,
+						/obj/item/toy/plushie/dragon/gold_east
-						/obj/item/toy/plushie/teppi/alt
+						)
-						)//CHOMPStation Add End
 
 /obj/machinery/clawmachine/update_icon()
 	cut_overlays()

code/game/objects/items/toys/toys_ch.dm

@@ -24,60 +24,10 @@
 	icon_state = "greenfox"
 	pokephrase = "Weh!"
 
-/obj/item/toy/plushie/dragon
-	name = "dragon plushie"
-	desc = "A soft plushie in the shape of a dragon. How ferocious!"
-	icon = 'icons/obj/toy_ch.dmi'
-	icon_state = "reddragon"
-	var/cooldown = FALSE
-
-/obj/item/toy/plushie/dragon/Initialize(mapload)
-	. = ..()
-	if (pokephrase != "Rawr~!")
-		pokephrase = pick("ROAR!", "RAWR!", "GAWR!", "GRR!", "GROAR!", "GRAH!", "Weh!", "Merp!")
-
-/obj/item/toy/plushie/dragon/attack_self(mob/user)
-	if(!cooldown)
-		switch(pokephrase)
-			if("Weh!")
-				playsound(user, 'sound/voice/weh.ogg', 20, 0)
-			if("Merp!")
-				playsound(user, 'sound/voice/merp.ogg', 20, 0)
-			else
-				playsound(user, 'sound/voice/roarbark.ogg', 20, 0)
-		cooldown = TRUE
-		addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 5 SECONDS, TIMER_DELETE_ME)
-	return ..()
-
-/obj/item/toy/plushie/dragon/green
-	name = "green dragon plushie"
-	icon_state = "greendragon"
-
-/obj/item/toy/plushie/dragon/purple
-	name = "purple dragon plushie"
-	icon_state = "purpledragon"
-
-/obj/item/toy/plushie/dragon/white_east
-	name = "white eastern dragon plushie"
-	icon_state = "whiteeasterndragon"
-
-/obj/item/toy/plushie/dragon/red_east
-	name = "red eastern dragon plushie"
-	icon_state = "redeasterndragon"
-
-/obj/item/toy/plushie/dragon/green_east
-	name = "green eastern dragon plushie"
-	icon_state = "greeneasterndragon"
-
-/obj/item/toy/plushie/dragon/gold_east
-	name = "golden eastern dragon plushie"
-	desc = "A soft plushie of a shiny golden dragon. Made of Real* gold!"
-	icon_state = "goldeasterndragon"
-	pokephrase = "Rawr~!"
-
 /obj/item/toy/plushie/dragon/customizable
 	name = "custom dragon plushie"
 	icon_state = "blankdurg"
+	icon = 'icons/obj/toy_ch.dmi'
 
 	var/base = "blankdurg"
 	var/underbelly = "blankdurg2"

code/game/objects/items/toys/toys_vr.dm

@@ -1194,3 +1194,54 @@
 	H.put_in_inactive_hand(I)
 	next_use = (world.time + 30 SECONDS)
 	H.visible_message(span_notice("\The [H] pulls an acorn from \the [src]!"))
+
+/obj/item/toy/plushie/dragon
+	name = "dragon plushie"
+	desc = "A soft plushie in the shape of a dragon. How ferocious!"
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "reddragon"
+	var/cooldown = FALSE
+
+/obj/item/toy/plushie/dragon/Initialize(mapload)
+	. = ..()
+	if (pokephrase != "Rawr~!")
+		pokephrase = pick("ROAR!", "RAWR!", "GAWR!", "GRR!", "GROAR!", "GRAH!", "Weh!", "Merp!")
+
+/obj/item/toy/plushie/dragon/attack_self(mob/user)
+	if(!cooldown)
+		switch(pokephrase)
+			if("Weh!")
+				playsound(user, 'sound/voice/weh.ogg', 20, 0)
+			if("Merp!")
+				playsound(user, 'sound/voice/merp.ogg', 20, 0)
+			else
+				playsound(user, 'sound/voice/roarbark.ogg', 20, 0)
+		cooldown = TRUE
+		addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 5 SECONDS, TIMER_DELETE_ME)
+	return ..()
+
+/obj/item/toy/plushie/dragon/green
+	name = "green dragon plushie"
+	icon_state = "greendragon"
+
+/obj/item/toy/plushie/dragon/purple
+	name = "purple dragon plushie"
+	icon_state = "purpledragon"
+
+/obj/item/toy/plushie/dragon/white_east
+	name = "white eastern dragon plushie"
+	icon_state = "whiteeasterndragon"
+
+/obj/item/toy/plushie/dragon/red_east
+	name = "red eastern dragon plushie"
+	icon_state = "redeasterndragon"
+
+/obj/item/toy/plushie/dragon/green_east
+	name = "green eastern dragon plushie"
+	icon_state = "greeneasterndragon"
+
+/obj/item/toy/plushie/dragon/gold_east
+	name = "golden eastern dragon plushie"
+	desc = "A soft plushie of a shiny golden dragon. Made of Real* gold!"
+	icon_state = "goldeasterndragon"
+	pokephrase = "Rawr~!"

code/game/objects/random/misc.dm

@@ -789,16 +789,16 @@
 				/obj/item/toy/plushie/teshari/y_yw,
 				//YawnWider Add End
 				//CHOMPStation Add Start
-				/obj/item/toy/plushie/dragon,
-				/obj/item/toy/plushie/dragon/green,
-				/obj/item/toy/plushie/dragon/purple,
-				/obj/item/toy/plushie/dragon/white_east,
-				/obj/item/toy/plushie/dragon/red_east,
-				/obj/item/toy/plushie/dragon/green_east,
-				/obj/item/toy/plushie/dragon/gold_east,
 				/obj/item/toy/plushie/teppi,
-				/obj/item/toy/plushie/teppi/alt)
+				/obj/item/toy/plushie/teppi/alt,
 				//CHOMPStation Add End
+				pick(list(/obj/item/toy/plushie/dragon,
+							/obj/item/toy/plushie/dragon/green,
+							/obj/item/toy/plushie/dragon/purple,
+							/obj/item/toy/plushie/dragon/red_east,
+							/obj/item/toy/plushie/dragon/green_east,
+							/obj/item/toy/plushie/dragon/white_east,
+							/obj/item/toy/plushie/dragon/gold_east)))
 
 /obj/random/plushielarge
 	name = "random large plushie"

code/modules/client/preference_setup/loadout/loadout_general.dm

@@ -85,6 +85,7 @@
 	blacklisted_types += subtypesof(/obj/item/toy/plushie/therapy)
 	blacklisted_types += subtypesof(/obj/item/toy/plushie/fluff)
 	blacklisted_types += /obj/item/toy/plushie/borgplushie/drake //VOREStation addition
+	blacklisted_types += /obj/item/toy/plushie/dragon/gold_east
 	for(var/obj/item/toy/plushie/plushie_type as anything in subtypesof(/obj/item/toy/plushie) - blacklisted_types)
 		plushies[initial(plushie_type.name)] = plushie_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies))

code/modules/economy/vending_machines.dm

@@ -888,16 +888,17 @@
 					/obj/item/toy/plushie/teshari/y_yw = 1,
 					//YawnWider Add End
 					//CHOMPStation Add Start
-					/obj/item/toy/plushie/dragon = 1,
-					/obj/item/toy/plushie/dragon/green = 1,
-					/obj/item/toy/plushie/dragon/red_east = 1,
-					/obj/item/toy/plushie/dragon/green_east = 1,
-					/obj/item/toy/plushie/dragon/gold_east = 1,
 					/obj/item/toy/plushie/dragon/customizable = 10,
 					/obj/item/toy/plushie/teppi = 1,
-					/obj/item/toy/plushie/teppi/alt = 1
+					/obj/item/toy/plushie/teppi/alt = 1,
 					//CHOMPStation Add End
-					)
+					/obj/item/toy/plushie/dragon = 1,
+					/obj/item/toy/plushie/dragon/green = 1,
+					/obj/item/toy/plushie/dragon/purple = 1,
+					/obj/item/toy/plushie/dragon/red_east = 1,
+					/obj/item/toy/plushie/dragon/green_east = 1,
+					/obj/item/toy/plushie/dragon/white_east = 1,
+					/obj/item/toy/plushie/dragon/gold_east = 1)
 	premium = list(/obj/item/reagent_containers/food/drinks/bottle/champagne = 1,
 					/obj/item/storage/trinketbox = 2)
 	prices = list(/obj/item/storage/fancy/heartbox = 15,
@@ -949,16 +950,18 @@
 					/obj/item/toy/plushie/teshari/y_yw = 150,
 					//YawnWider Add End
 					//CHOMPStation Add Start
-					/obj/item/toy/plushie/dragon = 50,
-					/obj/item/toy/plushie/dragon/green = 50,
-					/obj/item/toy/plushie/dragon/red_east = 50,
-					/obj/item/toy/plushie/dragon/green_east = 50,
-					/obj/item/toy/plushie/dragon/gold_east = 500,
 					/obj/item/toy/plushie/dragon/customizable = 50,
 					/obj/item/toy/plushie/teppi = 50,
-					/obj/item/toy/plushie/teppi/alt = 50
+					/obj/item/toy/plushie/teppi/alt = 50,
 					//CHOMPStation Add End
-					)
+					/obj/item/toy/plushie/dragon = 50,
+					/obj/item/toy/plushie/dragon/green = 50,
+					/obj/item/toy/plushie/dragon/purple = 50,
+					/obj/item/toy/plushie/dragon/red_east = 50,
+					/obj/item/toy/plushie/dragon/green_east = 50,
+					/obj/item/toy/plushie/dragon/white_east = 50,
+					/obj/item/toy/plushie/dragon/gold_east = 500)
+
 
 /obj/machinery/vending/fishing
 	name = "Loot Trawler"

code/modules/random_map/drop/drop_types.dm

@@ -230,7 +230,14 @@
 		/obj/item/inflatable_duck,
 		/obj/item/inflatable_duck,
 		/obj/item/toy/plushie/tinytin,
-		/obj/item/toy/plushie/tinytin_sec)
+		/obj/item/toy/plushie/tinytin_sec,
+		/obj/item/toy/plushie/dragon,
+		/obj/item/toy/plushie/dragon/green,
+		/obj/item/toy/plushie/dragon/purple,
+		/obj/item/toy/plushie/dragon/red_east,
+		/obj/item/toy/plushie/dragon/green_east,
+		/obj/item/toy/plushie/dragon/white_east,
+		/obj/item/toy/plushie/dragon/gold_east)
 
 /datum/supply_drop_loot/christmas
 	name = "Surplus Christmas Supplies"