diff --git a/code/modules/mob/living/simple_mob/hands.dm b/code/modules/mob/living/simple_mob/hands.dm index 9d869df6317..a7aab1bee8e 100644 --- a/code/modules/mob/living/simple_mob/hands.dm +++ b/code/modules/mob/living/simple_mob/hands.dm @@ -135,13 +135,6 @@ to_chat(src, "Your [hand_form] are not fit for use of \the [display_name].") return humanoid_hands -/mob/living/simple_mob/drop_from_inventory(var/obj/item/W, var/atom/target = null) - . = ..(W, target) - if(!target) - target = src.loc - if(.) - W.forceMove(src.loc) - /mob/living/simple_mob/is_holding_item_of_type(typepath) for(var/obj/item/I in list(l_hand, r_hand)) if(istype(I, typepath)) diff --git a/code/modules/mob/living/simple_mob/on_click.dm b/code/modules/mob/living/simple_mob/on_click.dm index 4b824c9580d..e5dd3a5f2dc 100644 --- a/code/modules/mob/living/simple_mob/on_click.dm +++ b/code/modules/mob/living/simple_mob/on_click.dm @@ -13,14 +13,15 @@ switch(a_intent) if(I_HELP) - if(isliving(A)) + var/mob/living/L = A + if(istype(L) && (!has_hands || !L.attempt_to_scoop(src))) custom_emote(1,"[pick(friendly)] \the [A]!") if(I_HURT) if(can_special_attack(A) && special_attack_target(A)) return - else if(melee_damage_upper == 0 && istype(A,/mob/living)) + else if(melee_damage_upper == 0 && isliving(A)) custom_emote(1,"[pick(friendly)] \the [A]!") else diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm index 6687b1f3804..1c8f1f69ad1 100644 --- a/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/code/modules/mob/living/simple_mob/simple_mob.dm @@ -160,6 +160,7 @@ var/limb_icon // Used for if the mob can drop limbs. Overrides the icon cache key, so it doesn't keep remaking the icon needlessly. var/limb_icon_key + var/understands_common = TRUE //VOREStation Edit - Makes it so that simplemobs can understand galcomm without being able to speak it. /mob/living/simple_mob/Initialize() verbs -= /mob/verb/observe @@ -280,3 +281,10 @@ hud_list[STATUS_HUD] = gen_hud_image(buildmode_hud, src, "ai_0", plane = PLANE_BUILDMODE) hud_list[LIFE_HUD] = gen_hud_image(buildmode_hud, src, "ais_1", plane = PLANE_BUILDMODE) add_overlay(hud_list) + +//VOREStation Add Start Makes it so that simplemobs can understand galcomm without being able to speak it. +/mob/living/simple_mob/say_understands(var/mob/other, var/datum/language/speaking = null) + if(understands_common && speaking?.name == LANGUAGE_GALCOM) + return TRUE + return ..() +//Vorestation Add End \ No newline at end of file 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 new file mode 100644 index 00000000000..7d6df51f444 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -0,0 +1,196 @@ +//No relation to slugcat :) + +/datum/category_item/catalogue/fauna/catslug + name = "Alien Wildlife - Catslug" + desc = "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_MEDIUM + +/mob/living/simple_mob/vore/alienanimals/catslug + name = "catslug" + desc = "A noodley bodied creature with thin arms and legs, and gloomy dark eyes." + tt_desc = "Mollusca Feline" + icon_state = "catslug" + icon_living = "catslug" + icon_dead = "catslug_dead" + icon_rest = "catslug_rest" + icon = 'icons/mob/alienanimals_x32.dmi' + + faction = "catslug" + maxHealth = 50 + health = 50 + movement_cooldown = 2 + meat_amount = 2 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + + response_help = "hugs" + response_disarm = "rudely paps" + response_harm = "punches" + + harm_intent_damage = 2 + melee_damage_lower = 2 + melee_damage_upper = 5 + + has_hands = TRUE + mob_size = MOB_MEDIUM + friendly = list("hugs") + + catalogue_data = list(/datum/category_item/catalogue/fauna/catslug) + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/catslug + player_msg = "You have escaped the foul weather, into this much more pleasant place. You are an intelligent creature capable of more than most think. You can pick up and use many things, and even carry some of them with you into the vents, which you can use to move around quickly. You're quiet and capable, you speak with your hands and your deeds!
- - - - -
Keep in mind, your goal should generally be to survive. You're expected to follow the same rules as everyone else, so don't go self antagging without permission from the staff team, but you are able and capable of defending yourself from those who would attack you for no reason." + + has_langs = list("Sign Language") + + var/heal_countdown = 0 + var/picked_color = FALSE + + can_enter_vent_with = list( + /obj/item/weapon/implant, + /obj/item/device/radio/borg, + /obj/item/weapon/holder, + /obj/machinery/camera, + /obj/belly, + /obj/screen, + /atom/movable/emissive_blocker, + /obj/item/weapon/material, + /obj/item/weapon/melee, + /obj/item/stack/material, + /obj/item/weapon/tool, + /obj/item/weapon/reagent_containers/food + ) + + vore_active = 1 + vore_capacity = 1 + vore_bump_chance = 1 + vore_ignores_undigestable = 0 + vore_default_mode = DM_DIGEST + vore_icons = SA_ICON_LIVING + vore_stomach_name = "Stomach" + vore_default_contamination_flavor = "Wet" + vore_default_contamination_color = "grey" + vore_default_item_mode = IM_DIGEST + + +/mob/living/simple_mob/vore/alienanimals/catslug/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "The hot slick gut of a catslug!! Copious slime smears over you as you’re packed away into the gloom and oppressive humidity of this churning gastric sac. The pressure around you is intense, the squashy flesh bends and forms to your figure, clinging to you insistently! There’s basically no free space at all as your ears are filled with the slick slide of flesh against flesh and the burbling of gastric juices glooping all around you. The thumping of a heart booms from somewhere nearby, making everything pulse in against you in time with it! This is it! You’ve been devoured by a catslug!!!" + B.mode_flags = 40 + B.belly_fullscreen = "yet_another_tumby" + B.digest_brute = 0.5 + B.digest_burn = 0.5 + B.digestchance = 10 + B.absorbchance = 1 + B.escapechance = 15 + +/datum/ai_holder/simple_mob/melee/evasive/catslug + hostile = FALSE + cooperative = FALSE + retaliate = TRUE + speak_chance = 0 + wander = TRUE + +/mob/living/simple_mob/vore/alienanimals/catslug/Initialize() + . = ..() + verbs += /mob/living/proc/ventcrawl + verbs += /mob/living/proc/hide + verbs += /mob/living/simple_mob/vore/alienanimals/catslug/proc/catslug_color + +/mob/living/simple_mob/vore/alienanimals/catslug/attackby(var/obj/item/weapon/reagent_containers/food/snacks/O as obj, var/mob/user as mob) + if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks)) + return ..() + if(resting) + to_chat(user, "\The [src] is napping, and doesn't respond to \the [O].") + return + if(nutrition >= max_nutrition) + if(user == src) + to_chat(src, "You're too full to eat another bite.") + return + to_chat(user, "\The [src] seems too full to eat.") + return + var/nutriment_amount = O.reagents?.get_reagent_amount("nutriment") //does it have nutriment, if so how much? + var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much? + var/glucose_amount = O.reagents?.get_reagent_amount("glucose") //does it have glucose, if so how much? + var/yum = nutriment_amount + protein_amount + glucose_amount + if(yum) + yum = (yum * 20) / 3 + adjust_nutrition(yum) //add the nutriment! + O.bitecount ++ + if(O.bitecount >= 3) + user.drop_from_inventory(O) + qdel(O) + visible_message("\The [src] eats \the [O].") + else + to_chat(user, "\The [src] takes a bite of \the [O].") + if(user != src) + to_chat(user, "\The [user] feeds \the [O] to you.") + playsound(src, 'sound/items/eatfood.ogg', 75, 1) + +/mob/living/simple_mob/vore/alienanimals/catslug/Life() + . = ..() + if(nutrition < 150) + return + if(health == maxHealth) + return + if(heal_countdown > 0) + heal_countdown -- + return + if(resting) + if(bruteloss > 0) + adjustBruteLoss(-10) + else if(fireloss > 0) + adjustFireLoss(-10) + nutrition -= 50 + heal_countdown = 5 + return + if(bruteloss > 0) + adjustBruteLoss(-1) + else if(fireloss > 0) + adjustFireLoss(-1) + nutrition -= 5 + heal_countdown = 5 + +/mob/living/simple_mob/vore/alienanimals/catslug/Login() //If someone plays as us let's just be a passive mob in case accidents happen if the player D/Cs + . = ..() + ai_holder.hostile = FALSE + ai_holder.wander = FALSE + +/mob/living/simple_mob/vore/alienanimals/catslug/proc/catslug_color() + set name = "Pick Color" + set category = "Abilities" + set desc = "You can set your color!" + if(picked_color) + to_chat(src, "You have already picked a color! If you picked the wrong color, ask an admin to change your picked_color variable to 0.") + return + var/newcolor = input(usr, "Choose a color.", "", color) as color|null + if(newcolor) + color = newcolor + picked_color = TRUE + +/datum/ai_holder/simple_mob/melee/evasive/catslug/handle_wander_movement() + if(holder.client) + return + if(holder.resting) + if(prob(5)) + holder.lay_down() + return + if(prob(0.5)) + holder.lay_down() + return + return ..() + +/datum/ai_holder/simple_mob/melee/evasive/catslug/on_hear_say(mob/living/speaker, message) + if(holder.client) + return + if(!speaker.client) + return + if(findtext(message, "psps") || stance == STANCE_IDLE) + set_follow(speaker, follow_for = 5 SECONDS) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index 93c9f0d25a8..59ab8e7585a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -129,7 +129,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? mob_size = MOB_LARGE - has_langs = list("Teppi", "Galactic Common") + has_langs = list("Teppi") say_list_type = /datum/say_list/teppi player_msg = "Teppi are large omnivorous quadrupeds. You have four toes on each paw, a long, strong tail, and are quite tough and powerful. You’re a lot more intimidating than you are actually harmful though. Your kind are ordinarily rather passive, only really rising to violence when someone does violence to you or others like you. You’re not stupid though, you can commiunicate with others of your kind, and form bonds with those who are kind to you, be they Teppi or otherwise.
- - - - -
While you may have access to galactic common, this is purely meant for making it so you can understand people in an OOC manner, for facilitating roleplay. You almost certainly should not be speaking to people or roleplaying as though you understand everything everyone says perfectly, but it's not unreasonable to be able to intuit intent and such through people's tones when they speak. Teppi are kind of smart, but they are animals, and should be roleplayed as such. ADDITIONALLY, you have the ability to produce offspring if you're well fed enough every once in a while, and the ability to disable this from happening to you. These verbs exist for to preserve the mechanical functionality of the mob you are playing. You should be aware of your surroundings when you use this verb, and NEVER use it to prefbreak or be disruptive. If in doubt, don't use it. Also, to note, AI Teppi will never initiate breeding with player Teppi." loot_list = list(/obj/item/weapon/bone/horn = 100) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 88101fdc6c9..3ca22757826 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -34,6 +34,7 @@ abstract = 1 item_state = "nothing" w_class = ITEMSIZE_HUGE + destroy_on_drop = TRUE //VOREStation Edit /obj/item/weapon/grab/New(mob/user, mob/victim) diff --git a/icons/mob/alienanimals_x32.dmi b/icons/mob/alienanimals_x32.dmi index 2f94d618da6..c6fc251dc38 100644 Binary files a/icons/mob/alienanimals_x32.dmi and b/icons/mob/alienanimals_x32.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 06323137d8e..44abb87e730 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2941,6 +2941,7 @@ #include "code\modules\mob\living\simple_mob\simple_mob_vr.dm" #include "code\modules\mob\living\simple_mob\taming.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\animal.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\catslug.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\teppi.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\borer\borer.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\borer\borer_captive.dm"