diff --git a/code/defines/obj.dm b/code/defines/obj.dm index beca4354c1..4bacd5e7d9 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -12,6 +12,14 @@ if(user.z != src.z) return user.forceMove(pick(latejoin)) +/obj/structure/signpostwood + name = "signpost" + desc = "It's a signpost that tells you things!" + icon = 'icons/obj/stationobjs.dmi' + icon_state = "signpostwood" + anchored = TRUE + density = TRUE + /obj/effect/mark var/mark = "" icon = 'icons/misc/mark.dmi' 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 5db4022c84..b3c0f78ad4 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 @@ -1021,6 +1021,41 @@ /datum/say_list/catslug/custom/cryptslug speak = list("I have a lot of nasty friends.", "Do not test me.", "I shall rise again!", "How dare you step foot in my domain?", "Dare you indluge in dark desires?", "I am become death, one day.", "Foul creature!", "I used to think my life was a tragedy, but now I realize it's kind of okay actually.") +//jungle slug + +/mob/living/simple_mob/vore/alienanimals/catslug/custom/exploslug + name = "Explorer Pawdiana" + desc = "A green-furred noodley bodied creature with thin arms and legs, and gloomy dark eyes. This one is adorned with an explorers hat and vest." + tt_desc = "Mollusca Felis Exploris" + icon_state = "exploslug" + icon_living = "exploslug" + icon_rest = "exploslug_rest" + icon_dead = "exploslug_dead" + catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/exploslug) + say_list_type = /datum/say_list/catslug/custom/exploslug + +/datum/category_item/catalogue/fauna/catslug/custom/exploslug + name = "Alien Wildlife - Catslug - Explorer Pawdiana" + desc = "Found in the depths of an arugably magical jungle, Pawdiana\ + is a catslug who spends their days treking through the dense foliage \ + of the dangerous wild. Always seen within \ + their fancy explorers kit, they are always ready to brave \ + the hazards of unknown lands. \ + \ + 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/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!") + //============================= //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 b83c403da2..89b1625428 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm @@ -129,3 +129,17 @@ /datum/say_list/dragonboss say_got_target = list("roars and snaps it jaws!") + +/mob/living/simple_mob/vore/aggressive/dragon/space + name = "space dragon" + tt_desc = "Astra Draconinae" + maxHealth = 300 + health = 300 + faction = "dragon" + icon_dead = "space_dragon_dead" + icon_living = "space_dragon" + icon_state = "space_dragon" + mount_offset_y = 24 + mount_offset_x = -9 + has_eye_glow = TRUE + vore_eyes = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm index 5adb15f865..95769934ee 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm @@ -147,3 +147,13 @@ remove_eyes() add_eyes() update_transform() + +/mob/living/simple_mob/vore/raptor/yellow + name = "raptor" + desc = "A massive yellow raptor with piercing blue eyes and a feathered tail. Long sharp claws and huge pointy teeth, I wouldn't want to upset this thing." + icon_dead = "raptoryellow_dead" + icon_living = "raptoryellow" + icon_state = "raptoryellow" + icon_rest = "raptoryellow_rest" + random_skin = 0 + initial_icon = "raptoryellow" diff --git a/icons/mob/alienanimals_x32.dmi b/icons/mob/alienanimals_x32.dmi index f118a398d6..aafc75a89c 100644 Binary files a/icons/mob/alienanimals_x32.dmi and b/icons/mob/alienanimals_x32.dmi differ diff --git a/icons/mob/vore64x64.dmi b/icons/mob/vore64x64.dmi index 9dea7f4b62..b1c99444a3 100644 Binary files a/icons/mob/vore64x64.dmi and b/icons/mob/vore64x64.dmi differ diff --git a/icons/mob/vore_raptor.dmi b/icons/mob/vore_raptor.dmi index 479923d44e..14f2c2a46b 100644 Binary files a/icons/mob/vore_raptor.dmi and b/icons/mob/vore_raptor.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index adc7011de9..34aee83974 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ