Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Port] Greyscale Plushies #5618

Merged
merged 4 commits into from
Feb 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/thelizardsgas.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@
/turf/template_noop,
/area/ruin/space/has_grav/thelizardsgas)
"QQ" = (
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
desc = "How the fuck did he get in there?!";
name = "Zingo"
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Blueshift/Blueshift.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -44405,7 +44405,7 @@
/obj/structure/railing{
dir = 1
},
/obj/item/toy/plush/space_lizard_plushie,
/obj/item/toy/plush/lizard_plushie/space/green,
/turf/open/space/basic,
/area/space/nearstation)
"iDd" = (
Expand Down Expand Up @@ -78639,7 +78639,7 @@
/area/station/common/wrestling/arena)
"pkX" = (
/obj/structure/lattice/catwalk,
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
name = "Cools-The-Crystal"
},
/obj/item/clothing/head/utility/hardhat{
Expand Down Expand Up @@ -90865,7 +90865,7 @@
/area/station/security/prison)
"rDJ" = (
/obj/structure/chair/sofa/corp/left,
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
name = "Observes-The-Laser"
},
/obj/structure/railing{
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4057,7 +4057,7 @@
/area/station/science/research)
"aUN" = (
/obj/structure/lattice/catwalk,
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
name = "Meets-the-Ore"
},
/obj/structure/railing{
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/IceBoxStation/IceBoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -38587,7 +38587,7 @@
/turf/open/openspace/icemoon,
/area/station/science/server)
"mpc" = (
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
name = "Ruins-The-Analog"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -31061,7 +31061,7 @@
/area/station/hallway/secondary/service)
"jze" = (
/obj/structure/lattice/catwalk,
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
desc = "He stared into the void and listened. He didn't expect an answer...";
name = "Void-Stares-Back"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -70027,7 +70027,7 @@
/area/station/security/prison)
"yib" = (
/obj/structure/lattice/catwalk,
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
desc = "He stared into the void and listened. He didn't expect an answer...";
name = "Void-Stares-Back"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/Theseus/Theseus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -30179,7 +30179,7 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"iYr" = (
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
name = "Moes-the-Berry"
},
/turf/open/space/basic,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -15063,7 +15063,7 @@
/area/centcom/central_command_areas/hall)
"aOC" = (
/obj/structure/table/reinforced,
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
name = "Escapes-on-Pods"
},
/turf/open/floor/iron/smooth_large,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/tramstation/tramstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -27759,7 +27759,7 @@
/obj/machinery/camera/directional/north{
c_tag = "Civilian - Recreational Area North-West"
},
/obj/item/toy/plush/space_lizard_plushie,
/obj/item/toy/plush/lizard_plushie/space/green,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"hMq" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/emergency_fish.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
/turf/open/floor/wood/tile,
/area/shuttle/escape)
"eC" = (
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
desc = "An adorable stuffed toy that resembles a very determined seafaring lizardperson. To ten thousand leagues and below, little guy.";
name = "Drinks-The-Salt"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@
/area/space/nearstation)
"Ds" = (
/obj/effect/turf_decal/bot_red,
/obj/item/toy/plush/space_lizard_plushie,
/obj/item/toy/plush/lizard_plushie/space/green,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"DP" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/item/toy/plush/space_lizard_plushie{
/obj/item/toy/plush/lizard_plushie/space/green{
desc = "He stared into the void and listened. He didn't expect an answer...";
name = "Chief Weh Officer"
},
Expand Down
20 changes: 20 additions & 0 deletions code/datums/greyscale/config_types/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,31 @@
icon_file = 'icons/mob/clothing/head/winterhood.dmi'
json_config = 'code/datums/greyscale/json_configs/wintercoats_hood_worn.json'

/datum/greyscale_config/plush_carp
name = "Plushie Carp"
icon_file = 'icons/obj/toys/plushes.dmi'
json_config = 'code/datums/greyscale/json_configs/plushie_carp.json'

/datum/greyscale_config/plush_lizard
name = "Plushie Lizard"
icon_file = 'icons/obj/toys/plushes.dmi'
json_config = 'code/datums/greyscale/json_configs/plushie_lizard.json'

/datum/greyscale_config/plush_slime
name = "Plushie Slime"
icon_file = 'icons/obj/toys/plushes.dmi'
json_config = 'code/datums/greyscale/json_configs/plushie_slime.json'

/datum/greyscale_config/plush_snake
name = "Plushie Snake"
icon_file = 'icons/obj/toys/plushes.dmi'
json_config = 'code/datums/greyscale/json_configs/plushie_snake.json'

/datum/greyscale_config/plush_spacelizard
name = "Plushie Space Lizard"
icon_file = 'icons/obj/toys/plushes.dmi'
json_config = 'code/datums/greyscale/json_configs/plushie_spacelizard.json'

/datum/greyscale_config/flower_simple
name = "Flower"
icon_file = 'icons/obj/hydroponics/harvest.dmi'
Expand Down
26 changes: 26 additions & 0 deletions code/datums/greyscale/json_configs/plushie_carp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"map_plushie_carp": [
{
"type": "icon_state",
"icon_state": "plushie_carp_body",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "plushie_carp_eyes",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "plushie_carp_teeth",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "plushie_carp_pupil",
"blend_mode": "overlay"
}
]
}
21 changes: 21 additions & 0 deletions code/datums/greyscale/json_configs/plushie_slime.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"map_plushie_slime": [
{
"type": "icon_state",
"icon_state": "plushie_slime_body",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "plushie_slime_eyes",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "plushie_slime_pupil",
"blend_mode": "overlay"
}
]
}
26 changes: 26 additions & 0 deletions code/datums/greyscale/json_configs/plushie_snake.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"map_plushie_snake": [
{
"type": "icon_state",
"icon_state": "plushie_snake_body",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "plushie_snake_eyes",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "plushie_snake_tongue",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "plushie_snake_pupil",
"blend_mode": "overlay"
}
]
}
31 changes: 31 additions & 0 deletions code/datums/greyscale/json_configs/plushie_spacelizard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"map_plushie_spacelizard": [
{
"type": "icon_state",
"icon_state": "plushie_lizard_body",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "plushie_lizard_eyes",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "plushie_lizard_tongue",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "plushie_lizard_pupil",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "plushie_lizard_spacesuit",
"blend_mode": "overlay"
}
]
}
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/random/entertainment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
// rare plushies
/obj/item/toy/plush/carpplushie = 3,
/obj/item/toy/plush/lizard_plushie/green = 3,
/obj/item/toy/plush/space_lizard_plushie = 3,
/obj/item/toy/plush/lizard_plushie/space/green = 3,
/obj/item/toy/plush/awakenedplushie = 3,
/obj/item/toy/plush/goatplushie = 3,
/obj/item/toy/plush/rouny = 3,
Expand Down
30 changes: 24 additions & 6 deletions code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -390,11 +390,14 @@
/obj/item/toy/plush/carpplushie
name = "space carp plushie"
desc = "An adorable stuffed toy that resembles a space carp."
icon_state = "carpplush"
icon_state = "map_plushie_carp"
greyscale_config = /datum/greyscale_config/plush_carp
greyscale_colors = "#cc99ff#000000"
inhand_icon_state = "carp_plushie"
attack_verb_continuous = list("bites", "eats", "fin slaps")
attack_verb_simple = list("bite", "eat", "fin slap")
squeak_override = list('sound/weapons/bite.ogg'=1)
flags_1 = IS_PLAYER_COLORABLE_1 // monkestation edit

/obj/item/toy/plush/bubbleplush
name = "\improper Bubblegum plushie"
Expand Down Expand Up @@ -538,24 +541,36 @@
desc = "An adorable stuffed toy that resembles a green lizardperson. This one fills you with nostalgia and soul."
greyscale_colors = "#66ff33#000000"

/obj/item/toy/plush/space_lizard_plushie
/obj/item/toy/plush/lizard_plushie/greyscale
desc = "An adorable stuffed toy that resembles a lizardperson. This one has been custom made."
greyscale_colors = "#d3d3d3#000000"
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/toy/plush/lizard_plushie/space
name = "space lizard plushie"
desc = "An adorable stuffed toy that resembles a very determined spacefaring lizardperson. To infinity and beyond, little guy."
icon_state = "plushie_spacelizard"
inhand_icon_state = null
icon_state = "map_plushie_spacelizard"
greyscale_config = /datum/greyscale_config/plush_spacelizard
// space lizards can't hit people with their tail, it's stuck in their suit
attack_verb_continuous = list("claws", "hisses", "bops")
attack_verb_simple = list("claw", "hiss", "bops")
squeak_override = list('monkestation/sound/voice/weh.ogg' = 1) // Monkestation Edit

/obj/item/toy/plush/lizard_plushie/space/green
desc = "An adorable stuffed toy that resembles a very determined spacefaring green lizardperson. To infinity and beyond, little guy. This one fills you with nostalgia and soul."
greyscale_colors = "#66ff33#000000"

/obj/item/toy/plush/snakeplushie
name = "snake plushie"
desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."
icon_state = "plushie_snake"
icon_state = "map_plushie_snake"
greyscale_config = /datum/greyscale_config/plush_snake
greyscale_colors = "#99ff99#000000"
inhand_icon_state = null
attack_verb_continuous = list("bites", "hisses", "tail slaps")
attack_verb_simple = list("bite", "hiss", "tail slap")
squeak_override = list('sound/weapons/bite.ogg' = 1)
flags_1 = IS_PLAYER_COLORABLE_1 // monkestation edit

/obj/item/toy/plush/nukeplushie
name = "operative plushie"
Expand All @@ -578,12 +593,15 @@
/obj/item/toy/plush/slimeplushie
name = "slime plushie"
desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack."
icon_state = "plushie_slime"
icon_state = "map_plushie_slime"
greyscale_config = /datum/greyscale_config/plush_slime
greyscale_colors = "#aaaaff#000000"
inhand_icon_state = null
attack_verb_continuous = list("blorbles", "slimes", "absorbs")
attack_verb_simple = list("blorble", "slime", "absorb")
squeak_override = list('sound/effects/blobattack.ogg' = 1)
gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
flags_1 = IS_PLAYER_COLORABLE_1 // monkestation edit

/obj/item/toy/plush/awakenedplushie
name = "awakened plushie"
Expand Down
4 changes: 3 additions & 1 deletion code/modules/capture_the_flag/medieval_sim/medisim_game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@
name = "\improper Bluesworth Hold Fair Maiden"
desc = "Protect your maiden, and capture theirs!"
icon = 'icons/obj/toys/plushes.dmi'
icon_state = "plushie_slime"
icon_state = "map_plushie_slime"
greyscale_config = /datum/greyscale_config/plush_slime
greyscale_colors = "#3399ff#000000"
force = 0
movement_type = FLOATING //there are chasms, and resetting when they fall in is really lame so lets minimize that
game_id = CTF_MEDISIM_CTF_GAME_ID
Expand Down
4 changes: 3 additions & 1 deletion code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,9 @@
name = "carp-sie plushie"
desc = "An adorable stuffed toy that resembles the god of all carp. The teeth look pretty sharp. Activate it to receive the blessing of Carp-Sie."
icon = 'icons/obj/toys/plushes.dmi'
icon_state = "carpplush"
icon_state = "map_plushie_carp"
greyscale_config = /datum/greyscale_config/plush_carp
greyscale_colors = "#cc99ff#000000"
inhand_icon_state = "carp_plushie"
worn_icon_state = "nullrod"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
Expand Down
Binary file modified icons/obj/toys/plushes.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
/area/centcom/tdome/arena/actual)
"Kp" = (
/obj/structure/table/reinforced,
/obj/item/toy/plush/space_lizard_plushie,
/obj/item/toy/plush/lizard_plushie/space/green,
/turf/open/floor/iron/dark/textured_large,
/area/centcom/tdome/arena/actual)
"Lb" = (
Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/loadouts/items/plushies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GLOBAL_LIST_INIT(loadout_plushies, generate_loadout_items(/datum/loadout_item/pl

/datum/loadout_item/plushies/lizard_greyscale
name = "Greyscale Lizard Plushie"
item_path = /obj/item/toy/plush/lizard_plushie
item_path = /obj/item/toy/plush/lizard_plushie/greyscale

/datum/loadout_item/plushies/moth
name = "Moth Plushie"
Expand Down
Loading
Loading