From 5c8e211a1ad757d0e25a7a0c85713d173ba153fb Mon Sep 17 00:00:00 2001 From: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Date: Wed, 26 Feb 2025 18:24:19 +0000 Subject: [PATCH] Fixes mantraps and mob names (#17208) --- code/modules/mob/living/simple_mob/subtypes/vore/devil.dm | 2 +- .../modules/mob/living/simple_mob/subtypes/vore/plants.dm | 8 ++++++-- .../mob/living/simple_mob/subtypes/vore/scrubble.dm | 2 +- .../mob/living/simple_mob/subtypes/vore/sonadile.dm | 2 +- .../mob/living/simple_mob/subtypes/vore/stalker.dm | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm index e21854b4c56..9c07faa3e17 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm @@ -1,5 +1,5 @@ /mob/living/simple_mob/vore/devil - name = "Statue of Temptation" + name = "statue of temptation" desc = "A tall statue made of red-tinted metal in the shape of some sort of demon or devil." catalogue_data = list(/datum/category_item/catalogue/fauna/devil) tt_desc = "Metal Statue" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm b/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm index f35a5424f93..87157892643 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm @@ -1,7 +1,7 @@ /////////////////////////////////////Man-Trap///////////////////////////////////////// /mob/living/simple_mob/vore/mantrap - name = "Mantrap" + name = "mantrap" desc = "This massive plant lays in wait in the brush, and can be very difficult to spot. When laying open on the ground, the trap mechanism resembles a massive saw-toothed maw." catalogue_data = list(/datum/category_item/catalogue/fauna/mantrap) tt_desc = "Dionaea Humanis" @@ -36,6 +36,7 @@ vore_default_mode = DM_SELECT vore_pounce_maxhealth = 1000 vore_bump_emote = "encloses on" + var/list/eaten_mobs = list() /mob/living/simple_mob/vore/mantrap/init_vore() if(!voremob_loaded) @@ -73,8 +74,11 @@ return if(isliving(AM)) var/mob/living/L = AM + if(L in eaten_mobs) + return if(L.devourable && L.allowmobvore && (src.vore_fullness < src.vore_capacity)) perform_the_nom(src,L,src,src.vore_selected,1) + L |= eaten_mobs return else return @@ -84,7 +88,7 @@ /mob/living/simple_mob/vore/pitcher - name = "Pitcher Plant" + name = "pitcher plant" desc = "This large pitcher plant looks big enough to fit an entire person, with a little stretching. Long tendrils rest at the entrance." catalogue_data = list(/datum/category_item/catalogue/fauna/pitcher) tt_desc = "Nepenthes Titanis" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm b/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm index 98e31178b1e..b857427f9cc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm @@ -1,5 +1,5 @@ /mob/living/simple_mob/vore/scrubble - name = "Scrubble" + name = "scrubble" desc = "A small skittish animal with some features resembling rodents and foxes. Usually seen coated with beige and brown fur, the scrubble has four ears that pivot quickly, two long fluffy tails and dark red eyes." catalogue_data = list(/datum/category_item/catalogue/fauna/scrubble) tt_desc = "vuldentia" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sonadile.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sonadile.dm index f28c646f8f9..f423abe71fa 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sonadile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sonadile.dm @@ -1,5 +1,5 @@ /mob/living/simple_mob/vore/sonadile - name = "Sonadile" + name = "sonadile" desc = "A tall, oddly proportioned bipedal reptile. Whilst its body is fairly large on its own, the incredibly long neck brings its height up to near 14 feet tall. Covered in green scales with a yellow underbelly, with a long thin tail, short legs and stubby arms. It has orange frills down its spine and the eyes are an odd grey colour, it doesn't appear to be able to see very well." catalogue_data = list(/datum/category_item/catalogue/fauna/sonadile) tt_desc = "Crocodylidae" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm b/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm index 968b91bcc48..f9fc1e9c310 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm @@ -1,5 +1,5 @@ /mob/living/simple_mob/vore/stalker - name = "Cave Stalker" + name = "cave stalker" desc = "A strange slim creature that lurks in the dark. It's features could be described as a mix of feline and canine, but it's most notable alien property is the second set of forelegs. Additionally, it has a series of boney blue spikes running down it's spine, a similarly hard tip to it's tail and dark blue fangs hanging from it's snout." catalogue_data = list(/datum/category_item/catalogue/fauna/stalker) tt_desc = "Canidfelanis"