Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

=cat lizard ventcrawl + lizard scooping #349

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/modules/mob/holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/simple_animal/friendly/cat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
17 changes: 17 additions & 0 deletions code/modules/mob/living/simple_animal/friendly/lizard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Binary file modified icons/obj/objects.dmi
Binary file not shown.
Loading