=cat lizard ventcrawl + lizard scooping

cmss13-devs · Jul 28, 2024 · 47a9ee4 · 47a9ee4
1 parent c3742c9
commit 47a9ee4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
@@ -91,6 +91,11 @@
 	desc = "D'aaawwww"
 	icon_state = "cat2"
 
+/obj/item/holder/lizard
+	name = "Lizard"
+	desc = "A cute tiny lizard."
+	icon_state = "lizard"
+
 /obj/item/holder/mouse
 	name = "mouse"
 	desc = "It's a small mouse."

diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -144,6 +144,10 @@
 		return
 	..()
 
+/mob/living/simple_animal/cat/can_ventcrawl()
+	return TRUE
+
+
 //RUNTIME IS ALIVE! SQUEEEEEEEE~
 /mob/living/simple_animal/cat/Runtime
 	name = "Runtime"

diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -19,3 +19,20 @@
 	black_market_value = 50
 	dead_black_market_value = 0
 	squeeze_under = TRUE
+	holder_type = /obj/item/holder/lizard
+
+/mob/living/simple_animal/lizard/MouseDrop(atom/over_object)
+	if(!CAN_PICKUP(usr, src))
+		return ..()
+	var/mob/living/carbon/H = over_object
+	if(!istype(H) || !Adjacent(H) || H != usr) return ..()
+
+	if(H.a_intent == INTENT_HELP)
+		get_scooped(H)
+		return
+	else
+		return ..()
+
+/mob/living/simple_animal/lizard/can_ventcrawl()
+	return TRUE
+
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi