diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index 7bfb4126a0..cfb7c80680 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -97,7 +97,10 @@ //CHOMPStation Add Start /obj/item/toy/plushie/red_dragon, /obj/item/toy/plushie/green_dragon, - /obj/item/toy/plushie/purple_dragon + /obj/item/toy/plushie/purple_dragon, + /obj/item/toy/plushie/white_eastdragon, + /obj/item/toy/plushie/red_eastdragon, + /obj/item/toy/plushie/green_eastdragon //CHOMPStation Add End ) name = "Plushies Crate" diff --git a/code/game/machinery/clawmachine.dm b/code/game/machinery/clawmachine.dm index 3fc80ebabb..531a75238e 100644 --- a/code/game/machinery/clawmachine.dm +++ b/code/game/machinery/clawmachine.dm @@ -70,7 +70,11 @@ //CHOMPStation Add Start /obj/item/toy/plushie/red_dragon, /obj/item/toy/plushie/green_dragon, - /obj/item/toy/plushie/purple_dragon + /obj/item/toy/plushie/purple_dragon, + /obj/item/toy/plushie/white_eastdragon, + /obj/item/toy/plushie/red_eastdragon, + /obj/item/toy/plushie/green_eastdragon, + /obj/item/toy/plushie/gold_eastdragon //CHOMPStation Add End ) diff --git a/code/game/objects/items/toys/toys_ch.dm b/code/game/objects/items/toys/toys_ch.dm index c16e06409a..9a2913da14 100644 --- a/code/game/objects/items/toys/toys_ch.dm +++ b/code/game/objects/items/toys/toys_ch.dm @@ -42,3 +42,27 @@ icon_state = "purpledragon" pokephrase = "GRAH!" +/obj/item/toy/plushie/white_eastdragon + name = "white eastern dragon plushie" + icon = 'icons/obj/toy_ch.dmi' + icon_state = "whiteeasterndragon" + pokephrase = "Rooar!" + +/obj/item/toy/plushie/red_eastdragon + name = "red eastern dragon plushie" + icon = 'icons/obj/toy_ch.dmi' + icon_state = "redeasterndragon" + pokephrase = "Whoosh!" + +/obj/item/toy/plushie/green_eastdragon + name = "green eastern dragon plushie" + icon = 'icons/obj/toy_ch.dmi' + icon_state = "greeneasterndragon" + pokephrase = "Fwoomp!" + +/obj/item/toy/plushie/gold_eastdragon + name = "golden eastern dragon plushie" + desc = "A soft plushie of a shiny golden dragon. Made of Real* gold!" + icon = 'icons/obj/toy_ch.dmi' + icon_state = "goldeasterndragon" + pokephrase = "Shine!" diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 19d55150f7..0559aa02d0 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -785,7 +785,11 @@ //CHOMPStation Add Start /obj/item/toy/plushie/red_dragon, /obj/item/toy/plushie/green_dragon, - /obj/item/toy/plushie/purple_dragon) + /obj/item/toy/plushie/purple_dragon, + /obj/item/toy/plushie/white_eastdragon, + /obj/item/toy/plushie/red_eastdragon, + /obj/item/toy/plushie/green_eastdragon, + /obj/item/toy/plushie/gold_eastdragon) //CHOMPStation Add End /obj/random/plushielarge diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index d5e2b81570..a584ebd67b 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -811,8 +811,16 @@ /obj/item/toy/plushie/teshari/_yw = 1, /obj/item/toy/plushie/teshari/w_yw = 1, /obj/item/toy/plushie/teshari/b_yw = 1, - /obj/item/toy/plushie/teshari/y_yw = 1) + /obj/item/toy/plushie/teshari/y_yw = 1, //YawnWider Add End + //CHOMPStation Add Start + /obj/item/toy/plushie/red_dragon = 1, + /obj/item/toy/plushie/green_dragon = 1, + /obj/item/toy/plushie/red_eastdragon = 1, + /obj/item/toy/plushie/green_eastdragon = 1, + /obj/item/toy/plushie/gold_eastdragon = 1 + //CHOMPStation Add End + ) 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, @@ -860,9 +868,16 @@ /obj/item/toy/plushie/teshari/_yw = 150, /obj/item/toy/plushie/teshari/w_yw = 150, /obj/item/toy/plushie/teshari/b_yw = 150, - /obj/item/toy/plushie/teshari/y_yw = 150) + /obj/item/toy/plushie/teshari/y_yw = 150, //YawnWider Add End - + //CHOMPStation Add Start + /obj/item/toy/plushie/red_dragon = 50, + /obj/item/toy/plushie/green_dragon = 50, + /obj/item/toy/plushie/red_eastdragon = 50, + /obj/item/toy/plushie/green_eastdragon = 50, + /obj/item/toy/plushie/gold_eastdragon = 500 + //CHOMPStation Add End + ) /obj/machinery/vending/fishing name = "Loot Trawler" diff --git a/icons/obj/toy_ch.dmi b/icons/obj/toy_ch.dmi index 39f2575aae..d795025cb1 100644 Binary files a/icons/obj/toy_ch.dmi and b/icons/obj/toy_ch.dmi differ