Merge pull request #10823 from VOREStation/Icons/toys

Some Eris toys, /tg/ mecha toy icons

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

@@ -510,14 +510,14 @@
 
 /obj/item/toy/mecha/ripley
 	name = "toy ripley"
-	desc = "Mini-Mecha action figure! Collect them all! 1/11."
+	desc = "Mini-Mecha action figure! Collect them all! 1/13."
 	max_combat_health = 4 // 200 integrity
 	special_attack_type = SPECIAL_ATTACK_DAMAGE
 	special_attack_cry = "GIGA DRILL BREAK"
 
 /obj/item/toy/mecha/fireripley
 	name = "toy firefighting ripley"
-	desc = "Mini-Mecha action figure! Collect them all! 2/11."
+	desc = "Mini-Mecha action figure! Collect them all! 2/13."
 	icon_state = "fireripleytoy"
 	max_combat_health = 5 // 250 integrity?
 	special_attack_type = SPECIAL_ATTACK_UTILITY
@@ -525,7 +525,7 @@
 
 /obj/item/toy/mecha/deathripley
 	name = "toy deathsquad ripley"
-	desc = "Mini-Mecha action figure! Collect them all! 3/11."
+	desc = "Mini-Mecha action figure! Collect them all! 3/13."
 	icon_state = "deathripleytoy"
 	max_combat_health = 5 // 250 integrity
 	special_attack_type = SPECIAL_ATTACK_OTHER
@@ -542,7 +542,7 @@
 
 /obj/item/toy/mecha/gygax
 	name = "toy gygax"
-	desc = "Mini-Mecha action figure! Collect them all! 4/11."
+	desc = "Mini-Mecha action figure! Collect them all! 4/13."
 	icon_state = "gygaxtoy"
 	max_combat_health = 5 // 250 integrity
 	special_attack_type = SPECIAL_ATTACK_UTILITY
@@ -550,7 +550,7 @@
 
 /obj/item/toy/mecha/durand
 	name = "toy durand"
-	desc = "Mini-Mecha action figure! Collect them all! 5/11."
+	desc = "Mini-Mecha action figure! Collect them all! 5/13."
 	icon_state = "durandtoy"
 	max_combat_health = 6 // 400 integrity
 	special_attack_type = SPECIAL_ATTACK_HEAL
@@ -558,7 +558,7 @@
 
 /obj/item/toy/mecha/honk
 	name = "toy H.O.N.K."
-	desc = "Mini-Mecha action figure! Collect them all! 6/11."
+	desc = "Mini-Mecha action figure! Collect them all! 6/13."
 	icon_state = "honktoy"
 	max_combat_health = 4 // 140 integrity
 	special_attack_type = SPECIAL_ATTACK_OTHER
@@ -572,7 +572,7 @@
 
 /obj/item/toy/mecha/marauder
 	name = "toy marauder"
-	desc = "Mini-Mecha action figure! Collect them all! 7/11."
+	desc = "Mini-Mecha action figure! Collect them all! 7/13."
 	icon_state = "maraudertoy"
 	max_combat_health = 7 // 500 integrity
 	special_attack_type = SPECIAL_ATTACK_DAMAGE
@@ -580,7 +580,7 @@
 
 /obj/item/toy/mecha/seraph
 	name = "toy seraph"
-	desc = "Mini-Mecha action figure! Collect them all! 8/11."
+	desc = "Mini-Mecha action figure! Collect them all! 8/13."
 	icon_state = "seraphtoy"
 	max_combat_health = 8 // 550 integrity
 	special_attack_type = SPECIAL_ATTACK_DAMAGE
@@ -588,7 +588,7 @@
 
 /obj/item/toy/mecha/mauler
 	name = "toy mauler"
-	desc = "Mini-Mecha action figure! Collect them all! 9/11."
+	desc = "Mini-Mecha action figure! Collect them all! 9/13."
 	icon_state = "maulertoy"
 	max_combat_health = 7 // 500 integrity
 	special_attack_type = SPECIAL_ATTACK_DAMAGE
@@ -596,7 +596,7 @@
 
 /obj/item/toy/mecha/odysseus
 	name = "toy odysseus"
-	desc = "Mini-Mecha action figure! Collect them all! 10/11."
+	desc = "Mini-Mecha action figure! Collect them all! 10/13."
 	icon_state = "odysseustoy"
 	max_combat_health = 4 // 120 integrity
 	special_attack_type = SPECIAL_ATTACK_HEAL
@@ -604,13 +604,12 @@
 
 /obj/item/toy/mecha/phazon
 	name = "toy phazon"
-	desc = "Mini-Mecha action figure! Collect them all! 11/11."
+	desc = "Mini-Mecha action figure! Collect them all! 11/13."
 	icon_state = "phazontoy"
 	max_combat_health = 6 // 200 integrity
 	special_attack_type = SPECIAL_ATTACK_UTILITY
 	special_attack_cry = "NO-CLIP"
 
-/* // TG-Station Added toys, commenting these out until I port 'em later.
 /obj/item/toy/mecha/reticence
 	name = "toy Reticence"
 	desc = "12/13"
@@ -633,7 +632,14 @@
 	max_combat_health = 4 //200 integrity
 	special_attack_type = SPECIAL_ATTACK_UTILITY
 	special_attack_cry = "ROLL OUT"
-*/
+
+/obj/item/toy/mecha/fivestars
+	name = "toy fivestars"
+	desc = "Five stars!"
+	icon_state = "fivestarstoy"
+	max_combat_health = 4 //200 integrity
+	special_attack_type = SPECIAL_ATTACK_UTILITY
+	special_attack_cry = "ROLL OUT"
 
 #undef SPECIAL_ATTACK_HEAL
 #undef SPECIAL_ATTACK_DAMAGE

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

@@ -668,6 +668,76 @@
 	icon_state = "ert"
 	toysay = "We're probably the good guys!"
 
+// Eris
+/obj/item/toy/figure/excelsior
+	name = "\"Excelsior\" figurine"
+	desc = "A curiously unbranded figurine of a Space Soviet, adorned in their iconic armor. There is still a price tag on the back of the base, six-hundred credits, people collect these things? \
+	\"Ever Upward!\""
+	icon_state = "excelsior"
+
+/obj/item/toy/figure/serbian
+	name = "mercenary figurine"
+	desc = "A curiously unbranded figurine, the olive drab a popular pick for many independent Serbian mercenary outfits. Rocket launcher not included."
+	icon_state = "serbian"
+
+/obj/item/toy/figure/acolyte
+	name = "acolyte figurine"
+	desc = "Church of NeoTheology \"New Faith Life\" brand figurine of an acolyte, hooded both physically and spiritually from that which would lead them astray."
+	icon_state = "acolyte"
+
+/obj/item/toy/figure/carrion
+	name = "carrion figurine"
+	desc = "A curiously unbranded figurine depicting a grotesque head of flesh, the Human features seem almost underdeveloped, its skull bulging outwards, mouth agape with torn flesh. \
+	Whoever made this certainly knew how to thin their paints."
+	icon_state = "carrion"
+
+/obj/item/toy/figure/roach
+	name = "roach figurine"
+	desc = "Upon the base is an erected \"Roachman\", its arms outstretched, with more additional roach hands besides them. This is likely the one thing most universally recognized in popular media. \
+	The plaque is covered in hundreds of scratch marks, eliminating any further knowledge of it or its brand."
+	icon_state = "roach"
+
+/obj/item/toy/figure/vagabond
+	name = "vagabond figurine"
+	desc = "An Aster's \"Space Life\" brand figurine showcasing the form of a random deplorable, wearing one of the ship's uniforms, and an orange bandana. \
+	Must of been custom-made to commemorate the Eris' doomed voyage."
+	icon_state = "vagabond"
+
+/obj/item/toy/figure/rooster
+	name = "rooster figurine"
+	desc = "\"Space Vice\" brand figurine, there is no further manufacturer information. It's a man wearing a rooster mask, and a varsity jacket with the letter \"B\" emblazoned on the front. \
+	\"Do you like hurting other people?\""
+	icon_state = "rooster"
+
+/obj/item/toy/figure/barking_dog
+	name = "barking dog figurine"
+	desc = "A metal soldier with the mask of a hound stands upon the base, the plaque seems smeared with caked grime, but despite this you make out a rare double-quote. \
+	\"A dog barks on its master's orders, lest its pack runs astray.\" \"Whatever the task, the grim dog mask would tell you that your life was done.\""
+	icon_state = "barking_dog"
+
+/obj/item/toy/figure/red_soldier
+	name = "red soldier figurine"
+	desc = "A curiously unbranded figurine of a red soldier fighting in the tides of war, their humanity hidden by a gas mask. \"Why do we fight? To win the war, of course.\""
+	icon_state = "red_soldier"
+
+/obj/item/toy/figure/metacat
+	name = "meta-cat figurine"
+	desc = "A curiously unbranded figurine depicting an anthropomorphic cat in a voidsuit, the small plaque claims this to be one of two. \"Always in silent pair, through distance or unlikelihood.\""
+	icon_state = "metacat"
+
+/obj/item/toy/figure/shitcurity
+	name = "shitcurity officer figurine"
+	desc = "An Aster's \"Space Life\" brand figurine of a classic redshirt of \"Nanotrasen's finest\". Their belly distends out into an obvious beer gut, revealing no form of manufacturer bias what-so-ever. \
+	\"I joined just to kill people.\""
+	icon_state = "shitcurity"
+
+/obj/item/toy/figure/metro_patrolman
+	name = "metro patrolman figurine"
+	desc = "The plaque seems flaked with rust residue, \"London Metro\" brand it reads. The man wears some kind of enforcer's uniform, with the acronym \"VPP\" on their left shoulder and cap. \
+	\"Abandoned for Escalation, the patrolman grumbles.\""
+	icon_state = "metro_patrolman"
+
+
 /*
  * Plushies
  */
@@ -744,6 +814,13 @@
 	name = "void carp plushie"
 	icon_state = "voidcarp"
 
+// Eris
+/obj/structure/plushie/fumo
+	name = "Fumo"
+	desc = "A plushie of a....?."
+	icon_state = "fumoplushie"
+	phrase = "I just don't think about losing."
+
 //Large plushies.
 /obj/structure/plushie
 	name = "generic plush"