Merge pull request #5196 from Schnayy/plushiefix

Carp Plushie Fix

code/game/machinery/vending.dm

@@ -1106,15 +1106,20 @@
 					/obj/item/toy/plushie/therapy/blue = 2,
 					/obj/item/toy/plushie/therapy/yellow = 2,
 					/obj/item/toy/plushie/therapy/orange = 2,
-					/obj/item/toy/plushie/therapy/green = 2)
-	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne = 1
-	/* Handbuzzer to be added later */)
-	premium = list(/obj/item/toy/plushie/nymph = 2,
+					/obj/item/toy/plushie/therapy/green = 2,
+					/obj/item/toy/plushie/nymph = 2,
 					/obj/item/toy/plushie/mouse = 2,
 					/obj/item/toy/plushie/kitten = 2,
 					/obj/item/toy/plushie/lizard = 2,
 					/obj/item/toy/plushie/spider = 2,
 					/obj/item/toy/plushie/farwa = 2,
+					/obj/item/toy/plushie/corgi = 1,
+					/obj/item/toy/plushie/octopus = 1,
+					/obj/item/toy/plushie/face_hugger = 1,
+					/obj/item/toy/plushie/carp = 1,
+					/obj/item/toy/plushie/deer = 1,
+					/obj/item/toy/plushie/tabby_cat = 1)
+	premium = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne = 1,
 					/obj/item/weapon/storage/trinketbox = 2)
 	prices = list(/obj/item/weapon/storage/fancy/heartbox = 15,
 					/obj/item/toy/bouquet = 10,
@@ -1129,4 +1134,16 @@
 					/obj/item/toy/plushie/therapy/blue = 20,
 					/obj/item/toy/plushie/therapy/yellow = 20,
 					/obj/item/toy/plushie/therapy/orange = 20,
-					/obj/item/toy/plushie/therapy/green = 20)
+					/obj/item/toy/plushie/therapy/green = 20,
+					/obj/item/toy/plushie/nymph = 35,
+					/obj/item/toy/plushie/mouse = 35,
+					/obj/item/toy/plushie/kitten = 35,
+					/obj/item/toy/plushie/lizard = 35,
+					/obj/item/toy/plushie/spider = 35,
+					/obj/item/toy/plushie/farwa = 35,
+					/obj/item/toy/plushie/corgi = 50,
+					/obj/item/toy/plushie/octopus = 50,
+					/obj/item/toy/plushie/face_hugger = 50,
+					/obj/item/toy/plushie/carp = 50,
+					/obj/item/toy/plushie/deer = 50,
+					/obj/item/toy/plushie/tabby_cat = 50)

code/game/objects/items/toys.dm

@@ -768,7 +768,7 @@
 	name = "space carp plushie"
 	desc = "An adorable stuffed toy that resembles a space carp."
 	icon = 'icons/obj/toy.dmi'
-	icon_state = "plushie/carp"
+	icon_state = "basecarp"
 	attack_verb = list("bitten", "eaten", "fin slapped")
 	var/bitesound = 'sound/weapons/bite.ogg'
 
@@ -787,39 +787,49 @@
 	name = "Random Carp Plushie"
 	desc = "This is a random plushie"
 	icon = 'icons/obj/toy.dmi'
-	icon_state = "plushie/carp"
+	icon_state = "basecarp"
 
 /obj/random/carp_plushie/item_to_spawn()
 	return pick(typesof(/obj/item/toy/plushie/carp)) //can pick any carp plushie, even the original.
 
 /obj/item/toy/plushie/carp/ice
+	name = "ice carp plushie"
 	icon_state = "icecarp"
 
 /obj/item/toy/plushie/carp/silent
+	name = "monochrome carp plushie"
 	icon_state = "silentcarp"
 
 /obj/item/toy/plushie/carp/electric
+	name = "electric carp plushie"
 	icon_state = "electriccarp"
 
 /obj/item/toy/plushie/carp/gold
+	name = "golden carp plushie"
 	icon_state = "goldcarp"
 
 /obj/item/toy/plushie/carp/toxin
+	name = "toxic carp plushie"
 	icon_state = "toxincarp"
 
 /obj/item/toy/plushie/carp/dragon
+	name = "dragon carp plushie"
 	icon_state = "dragoncarp"
 
 /obj/item/toy/plushie/carp/pink
+	name = "pink carp plushie"
 	icon_state = "pinkcarp"
 
 /obj/item/toy/plushie/carp/candy
+	name = "candy carp plushie"
 	icon_state = "candycarp"
 
 /obj/item/toy/plushie/carp/nebula
+	name = "nebula carp plushie"
 	icon_state = "nebulacarp"
 
 /obj/item/toy/plushie/carp/void
+	name = "void carp plushie"
 	icon_state = "voidcarp"
 
 //Large plushies.

html/changelogs/schnayy-plushietweak.yml

@@ -0,0 +1,9 @@
+# Your name.  
+author: schnayy
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+  - bugfix: "Space carp plushies now load sprites and are all selectable from loadout."
+  - tweak: "Adds several newer plushies to the gift vendor as well as adjusting cost of gift vendor's contents."