diff --git a/code/game/objects/items/toys/toys_ch.dm b/code/game/objects/items/toys/toys_ch.dm index e4132b268a..54068d9a70 100644 --- a/code/game/objects/items/toys/toys_ch.dm +++ b/code/game/objects/items/toys/toys_ch.dm @@ -24,115 +24,6 @@ icon_state = "greenfox" pokephrase = "Weh!" -/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" - var/wings = "classic_w" - var/horns = "classic_h" - var/extra = "" - - var/base_color = COLOR_WHITE - var/underbelly_color = COLOR_WHITE - var/wing_color = COLOR_WHITE - var/wing_color_2 = COLOR_WHITE - var/horn_color = COLOR_WHITE - var/extra_color = COLOR_WHITE - - - -/obj/item/toy/plushie/dragon/customizable/Initialize(mapload) - . = ..() - update_icon() - -/obj/item/toy/plushie/dragon/customizable/update_icon() - cut_overlays() - ..() - - var/list/overlays = list() - var/image/base_image = image(icon_state = base) - var/image/underbelly_image = image(icon_state = underbelly) - - base_image.color = base_color - underbelly_image.color = underbelly_color - - overlays += base_image - overlays += underbelly_image - - if(wings != "") - var/image/wings_2 = image(icon_state = "[wings]_2") - wings_2.color = wing_color - overlays += wings_2 - if(horns != "") - var/image/horns_2 = image(icon_state = "[horns]_2") - horns_2.color = horn_color - overlays += horns_2 - if(extra != "") - var/image/extra_image = image(icon_state = extra) - extra_image.color = extra_color - overlays += extra_image - if(wings != "") - var/image/wings_1 = image(icon_state = "[wings]_1") - var/image/wings_misc = image(icon_state = "[wings]_misc") - wings_1.color = wing_color - wings_misc.color = wing_color_2 - overlays += wings_1 - overlays += wings_misc - if(horns != "") - var/image/horns_1 = image(icon_state = "[horns]_1") - horns_1.color = horn_color - overlays += horns_1 - - add_overlay(overlays) - -/obj/item/toy/plushie/dragon/customizable/verb/Customize() - set category = "Object" - set src in usr - - var/list/wings_choice = list("None" = "", "Classic" = "classic_w", "Fairy" = "fairy_w", "Angular" = "angular_w") - var/list/horns_choice = list("None" = "", "Classic" = "classic_h", "Double" = "double_h", "Thick" = "thick_h") - var/list/extra_choice = list("None" = "", "Fur" = "durg_fur", "Spines" = "durg_spines") - - var/new_base_color = tgui_color_picker(usr, "Please select base color", "Base Color", base_color) - var/new_underbelly_color = tgui_color_picker(usr, "Please select secondary color", "Secondary Color", underbelly_color) - - if(new_base_color) - base_color = new_base_color - if(new_underbelly_color) - underbelly_color = new_underbelly_color - - var/new_wings = tgui_input_list(usr, "Please select wings", "Wings", wings_choice, wings) - if(new_wings) - wings = wings_choice[new_wings] - if(wings != "") - var/new_wing_color = tgui_color_picker(usr, "Please select wing color", "Wing Color", wing_color) - var/new_wing_color_2 = tgui_color_picker(usr, "Please select secondary wing color", "Secondary Wing Color", wing_color_2) - if(new_wing_color) - wing_color = new_wing_color - if(new_wing_color_2) - wing_color_2 = new_wing_color_2 - - var/new_horns = tgui_input_list(usr, "Please select horns", "Horns", horns_choice, horns) - if(new_horns) - horns = horns_choice[new_horns] - if(horns != "") - var/new_horn_color = tgui_color_picker(usr, "Please select horn color", "Horn Color", horn_color) - if(new_horn_color) - horn_color = new_horn_color - - var/new_extra = tgui_input_list(usr, "Please select extra", "Extra", extra_choice, extra) - if(new_extra) - extra = extra_choice[new_extra] - if(extra != "") - var/new_extra_color = tgui_color_picker(usr, "Please select extra color", "Extra Color", extra_color) - if(new_extra_color) - extra_color = new_extra_color - - update_icon() - /obj/item/toy/plushie/teppi name = "teppi plushie" desc = "A soft, fluffy plushie made out of real teppi fur!" diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 2522cb3178..81fa79ac74 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -888,7 +888,7 @@ /obj/item/toy/plushie/teshari/y_yw = 1, //YawnWider Add End //CHOMPStation Add Start - /obj/item/toy/plushie/dragon/customizable = 10, + /obj/item/toy/plushie/customizable/dragon = 10, /obj/item/toy/plushie/teppi = 1, /obj/item/toy/plushie/teppi/alt = 1, //CHOMPStation Add End @@ -950,7 +950,7 @@ /obj/item/toy/plushie/teshari/y_yw = 150, //YawnWider Add End //CHOMPStation Add Start - /obj/item/toy/plushie/dragon/customizable = 50, + /obj/item/toy/plushie/customizable/dragon = 50, /obj/item/toy/plushie/teppi = 50, /obj/item/toy/plushie/teppi/alt = 50, //CHOMPStation Add End