diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md index abaf97a0b98..b9680f5c65f 100644 --- a/ATTRIBUTIONS.md +++ b/ATTRIBUTIONS.md @@ -86,3 +86,9 @@ **Creator:** VerySoft (https://github.com/TS-Rogue-Star/Rogue-Star/pull/669)
**URL:** [Website](https://rogue-star.net/)
**License:** Permission granted in writing for use by Virgo and Chomp with proper attribution +
+**File:** icons/mob/vore_grayscale_drake.dmi +**Title:** drake
+**Creator:** grayscaledrake (Discord user)
+**License:** [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) +**Notes:** Permission to use assets also given in writing, assets were created for use in Virgo and other space station 13 servers. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 4dd3823f02e..938e59dd41d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -1055,6 +1055,41 @@ /datum/say_list/catslug/custom/exploslug speak = list("Fortune and porls, kid. Fortune and porls.", "Lizards, why'd it have to be lizards.", "That thingy is an important artifact. It belongs in a museum!", "Everything lost is meant to be found. By me.", "I swear I've seen that stone before...", "I should have packed more jellyfishes.", "I better get back before nightfall!", "A comfy bed? Hah! I sleep under the stars!") +//xmas slug + +/mob/living/simple_mob/vore/alienanimals/catslug/custom/santaslug + name = "Santa Claws" + desc = "A green-furred noodley bodied creature with thin arms and legs, and gloomy dark eyes. This one is adorned with a festive coat, hat, boots and ribbons on it's tail." + tt_desc = "Mollusca Felis Solstice" + icon_state = "santaslug" + icon_living = "santaslug" + icon_rest = "santaslug_rest" + icon_dead = "santaslug_dead" + catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/santaslug) + say_list_type = /datum/say_list/catslug/custom/santaslug + +/datum/category_item/catalogue/fauna/catslug/custom/santaslug + name = "Alien Wildlife - Catslug - Santa Claws" + desc = "Found in a mysterious toyshop in a snowy wonderland, Claws\ + is a catslug who spends their days building toys and is said to, \ + once a year, hand them out to well behaved people. Always seen wearing \ + their red coat and hat, they are always ready to spread \ + festive cheer throughout the galaxy. \ + \ + The Catslug is an omnivorous terrestrial creature.\ + Exhibiting properties of both a cat and a slug (hence its name)\ + it moves somewhat awkwardly. However, the unique qualities of\ + its body make it exceedingly flexible and smooth, allowing it to\ + wiggle into and move effectively in even extremely tight spaces.\ + Additionally, it has surprisingly capable hands, and moves quite\ + well on two legs or four. Caution is advised when interacting\ + with these creatures, they are quite intelligent, and proficient\ + tool users." + value = CATALOGUER_REWARD_TRIVIAL + +/datum/say_list/catslug/custom/santaslug + speak = list("Ho ho ho!", "Meow-ery Solstice, everybody!", "Thanks fur all the furstive cheer!", "I must get all these purresents", "What would be the pawfect gift for you?", "All I want for solstice is... Porls.", "The winter trees are more bark than bite!", "I'm just glad not to be stuck in a blizzard again!") + //============================= //Admin-spawn only catslugs end diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm index 9915d171b0f..310ed526dc4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm @@ -128,3 +128,27 @@ mount_offset_x = -9 has_eye_glow = TRUE vore_eyes = TRUE + +// A fluff sprite for an event mob created by grayscaledrake + +/mob/living/simple_mob/vore/aggressive/dragon/gray_scaled + name = "gray scaled drake" + desc = "This is a big, scaly drake." + + icon_dead = "drake_dead" + icon_living = "drake" + icon_state = "drake" + icon_rest = "drake_rest" + icon = 'icons/mob/vore_grayscale_drake.dmi' + vis_height = 115 + + old_x = -57 + old_y = 0 + default_pixel_x = -57 + pixel_x = -57 + pixel_y = 0 + + vore_active = 1 + vore_capacity = 1 + vore_pounce_chance = 0 // Beat them into crit before eating. + vore_icons = SA_ICON_LIVING diff --git a/icons/mob/alienanimals_x32.dmi b/icons/mob/alienanimals_x32.dmi index aafc75a89c5..56794ab64b6 100644 Binary files a/icons/mob/alienanimals_x32.dmi and b/icons/mob/alienanimals_x32.dmi differ diff --git a/icons/mob/vore_grayscale_drake.dmi b/icons/mob/vore_grayscale_drake.dmi new file mode 100644 index 00000000000..1c9b333c8bf Binary files /dev/null and b/icons/mob/vore_grayscale_drake.dmi differ