GAGS Lizard Plushes (#59323)

* greyscale lizards

* repathing

* uses set greyscale

* mapped sprite
This commit is contained in:
MrMelbert
2021-05-27 12:50:36 -05:00
committed by GitHub
parent f4c9ddb826
commit 3e355b091c
11 changed files with 67 additions and 13 deletions

View File

@@ -1367,7 +1367,7 @@
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"Ux" = (
/obj/item/toy/plush/lizardplushie{
/obj/item/toy/plush/lizard_plushie/green{
name = "Soaks-The-Rays"
},
/turf/open/floor/carpet/orange,

View File

@@ -107225,7 +107225,7 @@
/obj/structure/railing{
dir = 10
},
/obj/item/toy/plush/lizardplushie/space{
/obj/item/toy/plush/space_lizard_plushie{
name = "Meets-the-Ore"
},
/turf/open/space/basic,

View File

@@ -14187,7 +14187,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/cardboard,
/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/toy/plush/lizardplushie{
/obj/item/toy/plush/lizard_plushie/green{
name = "Tends-the-Wounds"
},
/obj/structure/sign/poster/contraband/lizard{
@@ -25739,7 +25739,7 @@
"gal" = (
/obj/structure/lattice/catwalk,
/obj/structure/marker_beacon/burgundy,
/obj/item/toy/plush/lizardplushie/space{
/obj/item/toy/plush/space_lizard_plushie{
desc = "He stared into the void and listened. He didn't expect an answer...";
name = "Void-Stares-Back"
},
@@ -56062,7 +56062,7 @@
/area/service/library)
"qqK" = (
/obj/structure/rack,
/obj/item/toy/plush/lizardplushie{
/obj/item/toy/plush/lizard_plushie/green{
name = "Given-As-Compensation"
},
/turf/open/floor/plating,

View File

@@ -90,7 +90,7 @@
/turf/open/floor/wood,
/area/shuttle/escape)
"cZ" = (
/obj/item/toy/plush/lizardplushie{
/obj/item/toy/plush/lizard_plushie/green{
name = "Hides-On-Shuttle"
},
/turf/open/floor/wood,

View File

@@ -83,7 +83,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/spear, /obj/item/clothing/mask/gas,
)),
"lizards" = typecacheof(list(/obj/item/toy/plush/lizardplushie, /obj/item/food/kebab/tail, /obj/item/organ/tail/lizard,
"lizards" = typecacheof(list(/obj/item/toy/plush/lizard_plushie, /obj/item/food/kebab/tail, /obj/item/organ/tail/lizard,
/obj/item/reagent_containers/food/drinks/bottle/lizardwine, /obj/item/clothing/head/lizard, /obj/item/clothing/shoes/cowboy/lizard,
)),

View File

@@ -202,3 +202,8 @@
/datum/greyscale_config/sombrero/base_worn
name = "Base Worn Sombrero Style"
json_config = 'code/datums/greyscale/json_configs/sombrero_base_worn.json'
/datum/greyscale_config/plush_lizard
name = "Plushie Lizard"
icon_file = 'icons/obj/plushes.dmi'
json_config = 'code/datums/greyscale/json_configs/plushie_lizard.json'

View File

@@ -0,0 +1,26 @@
{
"": [
{
"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"
}
]
}

View File

@@ -499,20 +499,43 @@
if(P && istype(P.loc, /turf/open) && !P.clash_target && !clashing)
P.clash_of_the_plushies(src)
/obj/item/toy/plush/lizardplushie
/obj/item/toy/plush/lizard_plushie
name = "lizard plushie"
desc = "An adorable stuffed toy that resembles a lizardperson."
icon_state = "plushie_lizard"
inhand_icon_state = "plushie_lizard"
icon_state = "map_pushie_lizard"
greyscale_config = /datum/greyscale_config/plush_lizard
attack_verb_continuous = list("claws", "hisses", "tail slaps")
attack_verb_simple = list("claw", "hiss", "tail slap")
squeak_override = list('sound/weapons/slash.ogg' = 1)
/obj/item/toy/plush/lizardplushie/space
/obj/item/toy/plush/lizard_plushie/Initialize()
. = ..()
if(!greyscale_colors)
// Generate a random valid lizard color for our plushie friend
var/generated_lizard_color = "#" + random_color()
var/temp_hsv = RGBtoHSV(generated_lizard_color)
// If our color is too dark, use the classic green lizard plush color
if(ReadHSV(temp_hsv)[3] < ReadHSV("#7F7F7F")[3])
generated_lizard_color = "#66ff33"
// Set our greyscale colors to the lizard color we made + black eyes
set_greyscale(colors = list(generated_lizard_color, "#000000"))
// Preset lizard plushie that uses the original lizard plush green. (Or close to it)
/obj/item/toy/plush/lizard_plushie/green
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
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 = "plushie_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('sound/weapons/slash.ogg' = 1)
/obj/item/toy/plush/snakeplushie
name = "snake plushie"

View File

@@ -857,7 +857,7 @@
/// the plushies that aren't of things trying to kill you
var/list/static/approved_by_corporate = list(/obj/item/toy/plush/carpplushie, // well, maybe they can be something that tries to kill you a little bit
/obj/item/toy/plush/slimeplushie,
/obj/item/toy/plush/lizardplushie,
/obj/item/toy/plush/lizard_plushie,
/obj/item/toy/plush/snakeplushie,
/obj/item/toy/plush/plasmamanplushie,
/obj/item/toy/plush/beeplushie,

View File

@@ -182,7 +182,7 @@
if(75 to 76)
new /obj/item/bikehorn/airhorn(src)
if(77 to 78)
new /obj/item/toy/plush/lizardplushie(src)
new /obj/item/toy/plush/lizard_plushie(src)
if(79 to 80)
new /obj/item/stack/sheet/mineral/bananium(src, 10)
if(81 to 82)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB