diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 0a5470bf408..2560c02199c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -987,6 +987,24 @@ icon_state = "greimorianplushie" phrase = "Gort!" +/obj/item/toy/plushie/axic + name = "Axic plushie" + desc = "Plushie designed after the main characters of the hit show, Swimstars! This one is Axic. " + icon_state = "axicplushie" + phrase = "warble!" + +/obj/item/toy/plushie/qill + name = "Qill plushie" + desc = "Plushie designed after the main characters of the hit show, Swimstars! This one is Qill. " + icon_state = "qillplushie" + phrase = "warble!" + +/obj/item/toy/plushie/xana + name = "Xana plushie" + desc = "Plushie designed after the main characters of the hit show, Swimstars! This one is Xana. " + icon_state = "xanaplushie" + phrase = "warble!" + //Squid Plushies /obj/item/toy/plushie/squid diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 61a0217e2d0..de2326ec4f7 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -253,4 +253,31 @@ item_state = "lunchbox_scc" /obj/item/storage/toolbox/lunchbox/scc/filled + filled = TRUE + +/obj/item/storage/toolbox/lunchbox/swimstars_axic + name = "Swimstars Axic lunchbox" + desc = "Created, and marketed, after the hit show, Swimstars!" + icon_state = "swimstars_axic" + item_state = "swimstars_axic" + +/obj/item/storage/toolbox/lunchbox/swimstars_axic/filled + filled = TRUE + +/obj/item/storage/toolbox/lunchbox/swimstars_qill + name = "Swimstars Qill lunchbox" + desc = "Created, and marketed, after the hit show, Swimstars!" + icon_state = "swimstars_qill" + item_state = "swimstars_qill" + +/obj/item/storage/toolbox/lunchbox/swimstars_qill/filled + filled = TRUE + +/obj/item/storage/toolbox/lunchbox/swimstars_xana + name = "Swimstars Xana lunchbox" + desc = "Created, and marketed, after the hit show, Swimstars!" + icon_state = "swimstars_xana" + item_state = "swimstars_xana" + +/obj/item/storage/toolbox/lunchbox/swimstars_xana/filled filled = TRUE \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 9565328e35b..d0fedcde966 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -218,6 +218,9 @@ plushies["plushie, slime"] = /obj/item/toy/plushie/slime plushies["plushie, penny"] = /obj/item/toy/plushie/pennyplush plushies["plushie, greimorian"] = /obj/item/toy/plushie/greimorian + plushies["plushie, Axic"] = /obj/item/toy/plushie/axic + plushies["plushie, Qill"] = /obj/item/toy/plushie/qill + plushies["plushie, Xana"] = /obj/item/toy/plushie/xana gear_tweaks += new/datum/gear_tweak/path(plushies) /datum/gear/toothpaste diff --git a/html/changelogs/Swimstars.yml b/html/changelogs/Swimstars.yml new file mode 100644 index 00000000000..bfe6e304e02 --- /dev/null +++ b/html/changelogs/Swimstars.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "The all new Swimstars plushies & lunchbox has been approved for station usage. Please find them in the loadout." diff --git a/icons/obj/lunchbox.dmi b/icons/obj/lunchbox.dmi index 073fc890821..17bd309f5c9 100644 Binary files a/icons/obj/lunchbox.dmi and b/icons/obj/lunchbox.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index aa842933c82..2b236a18a0b 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ