cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Customizable Durg Plushies! (#10656)

Browse Source
This commit is contained in:
MeepleMuncher
2025-04-17 14:52:52 +03:00
committed by GitHub
parent 2b989936da
commit 635d0d6684
9 changed files with 172 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/datums/supplypacks/misc.dm
View File

@@ -98,12 +98,12 @@
/obj/item/toy/plushie/teshari/y_yw,
//YawnWider Add End
//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/white_eastdragon,
/obj/item/toy/plushie/red_eastdragon,
/obj/item/toy/plushie/green_eastdragon,
/obj/item/toy/plushie/dragon,
/obj/item/toy/plushie/dragon/green,
/obj/item/toy/plushie/dragon/purple,
/obj/item/toy/plushie/dragon/white_east,
/obj/item/toy/plushie/dragon/red_east,
/obj/item/toy/plushie/dragon/green_east,
/obj/item/toy/plushie/teppi,
/obj/item/toy/plushie/teppi/alt
//CHOMPStation Add End

14
code/game/machinery/clawmachine.dm
View File

@@ -70,13 +70,13 @@
/obj/item/toy/plushie/tinytin,
/obj/item/toy/plushie/tinytin_sec
//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/white_eastdragon,
/obj/item/toy/plushie/red_eastdragon,
/obj/item/toy/plushie/green_eastdragon,
/obj/item/toy/plushie/gold_eastdragon,
/obj/item/toy/plushie/dragon,
/obj/item/toy/plushie/dragon/green,
/obj/item/toy/plushie/dragon/purple,
/obj/item/toy/plushie/dragon/white_east,
/obj/item/toy/plushie/dragon/red_east,
/obj/item/toy/plushie/dragon/green_east,
/obj/item/toy/plushie/dragon/gold_east,
/obj/item/toy/plushie/teppi,
/obj/item/toy/plushie/teppi/alt
)//CHOMPStation Add End

158
code/game/objects/items/toys/toys_ch.dm
View File

@@ -24,48 +24,164 @@
icon_state = "greenfox"
pokephrase = "Weh!"
/obj/item/toy/plushie/red_dragon
name = "red dragon plushie"
/obj/item/toy/plushie/dragon
name = "dragon plushie"
desc = "A soft plushie in the shape of a dragon. How ferocious!"
icon = 'icons/obj/toy_ch.dmi'
icon_state = "reddragon"
pokephrase = "RAWR!"
var/cooldown = FALSE
/obj/item/toy/plushie/green_dragon
/obj/item/toy/plushie/dragon/Initialize(mapload)
. = ..()
if (pokephrase != "Rawr~!")
pokephrase = pick("ROAR!", "RAWR!", "GAWR!", "GRR!", "GROAR!", "GRAH!", "Weh!", "Merp!")
/obj/item/toy/plushie/dragon/attack_self(mob/user)
if(!cooldown)
switch(pokephrase)
if("Weh!")
playsound(user, 'sound/voice/weh.ogg', 20, 0)
if("Merp!")
playsound(user, 'sound/voice/merp.ogg', 20, 0)
else
playsound(user, 'sound/voice/roarbark.ogg', 20, 0)
cooldown = TRUE
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 5 SECONDS, TIMER_DELETE_ME)
return ..()
/obj/item/toy/plushie/dragon/green
name = "green dragon plushie"
icon = 'icons/obj/toy_ch.dmi'
icon_state = "greendragon"
pokephrase = "GRR!"
/obj/item/toy/plushie/purple_dragon
/obj/item/toy/plushie/dragon/purple
name = "purple dragon plushie"
icon = 'icons/obj/toy_ch.dmi'
icon_state = "purpledragon"
pokephrase = "GRAH!"
/obj/item/toy/plushie/white_eastdragon
/obj/item/toy/plushie/dragon/white_east
name = "white eastern dragon plushie"
icon = 'icons/obj/toy_ch.dmi'
icon_state = "whiteeasterndragon"
pokephrase = "Rooar!"
/obj/item/toy/plushie/red_eastdragon
/obj/item/toy/plushie/dragon/red_east
name = "red eastern dragon plushie"
icon = 'icons/obj/toy_ch.dmi'
icon_state = "redeasterndragon"
pokephrase = "Whoosh!"
/obj/item/toy/plushie/green_eastdragon
/obj/item/toy/plushie/dragon/green_east
name = "green eastern dragon plushie"
icon = 'icons/obj/toy_ch.dmi'
icon_state = "greeneasterndragon"
pokephrase = "Fwoomp!"
/obj/item/toy/plushie/gold_eastdragon
/obj/item/toy/plushie/dragon/gold_east
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!"
pokephrase = "Rawr~!"
/obj/item/toy/plushie/dragon/customizable
name = "custom dragon plushie"
icon_state = "blankdurg"
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"

14
code/game/objects/random/misc.dm
View File

@@ -789,13 +789,13 @@
/obj/item/toy/plushie/teshari/y_yw,
//YawnWider Add End
//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/white_eastdragon,
/obj/item/toy/plushie/red_eastdragon,
/obj/item/toy/plushie/green_eastdragon,
/obj/item/toy/plushie/gold_eastdragon,
/obj/item/toy/plushie/dragon,
/obj/item/toy/plushie/dragon/green,
/obj/item/toy/plushie/dragon/purple,
/obj/item/toy/plushie/dragon/white_east,
/obj/item/toy/plushie/dragon/red_east,
/obj/item/toy/plushie/dragon/green_east,
/obj/item/toy/plushie/dragon/gold_east,
/obj/item/toy/plushie/teppi,
/obj/item/toy/plushie/teppi/alt)
//CHOMPStation Add End

22
code/modules/economy/vending_machines.dm
View File

@@ -887,11 +887,12 @@
/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,
/obj/item/toy/plushie/dragon = 1,
/obj/item/toy/plushie/dragon/green = 1,
/obj/item/toy/plushie/dragon/red_east = 1,
/obj/item/toy/plushie/dragon/green_east = 1,
/obj/item/toy/plushie/dragon/gold_east = 1,
/obj/item/toy/plushie/dragon/customizable = 10,
/obj/item/toy/plushie/teppi = 1,
/obj/item/toy/plushie/teppi/alt = 1
//CHOMPStation Add End
@@ -947,11 +948,12 @@
/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,
/obj/item/toy/plushie/dragon = 50,
/obj/item/toy/plushie/dragon/green = 50,
/obj/item/toy/plushie/dragon/red_east = 50,
/obj/item/toy/plushie/dragon/green_east = 50,
/obj/item/toy/plushie/dragon/gold_east = 500,
/obj/item/toy/plushie/dragon/customizable = 50,
/obj/item/toy/plushie/teppi = 50,
/obj/item/toy/plushie/teppi/alt = 50
//CHOMPStation Add End

BIN
icons/obj/toy_ch.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

2
modular_chomp/maps/overmap/om_ships/lonehomeship-20x13.dmm
View File

@@ -275,7 +275,7 @@
pixel_y = 3;
pixel_x = -4
},
/obj/item/toy/plushie/purple_dragon{
/obj/item/toy/plushie/dragon/purple{
pixel_y = 6;
pixel_x = 4
},

2
modular_chomp/maps/southern_cross/submaps/gateway/diescraper.dmm
View File

@@ -4516,7 +4516,7 @@
/turf/simulated/floor/tiled/white,
/area/awaymission/diescraper/indoors/floor9)
"nF" = (
/obj/item/toy/plushie/red_eastdragon{
/obj/item/toy/plushie/dragon/red_east{
desc = "This plushie looks like a doofus."
},
/turf/simulated/floor/carpet/purple,

2
modular_chomp/maps/submaps/surface_submaps/wilderness/PirateLake.dmm
View File

@@ -106,7 +106,7 @@
/obj/item/gun/projectile/deagle/gold,
/obj/item/soap/golden_soap,
/obj/item/reagent_containers/food/drinks/golden_cup,
/obj/item/toy/plushie/gold_eastdragon,
/obj/item/toy/plushie/dragon/gold_east,
/obj/item/slime_extract/gold,
/turf/simulated/floor/wood/turfpack/sif,
/area/submap/PirateLake)