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.

Sign up for GitHub

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

[MIRROR] Fix; pet carrier unfriending pets put in it. #2525

Merged
merged 1 commit into from
Mar 24, 2024
Merged

[MIRROR] Fix; pet carrier unfriending pets put in it. #2525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions code/game/objects/items/pet_carrier.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,13 @@
playsound(user, 'sound/machines/boltsup.ogg', 30, TRUE)
update_appearance()

/obj/item/pet_carrier/attack(mob/living/target, mob/living/user)
if(user.combat_mode)
return ..()
/obj/item/pet_carrier/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(user.combat_mode || !isliving(interacting_with))
return NONE
if(!open)
to_chat(user, span_warning("You need to open [src]'s door!"))
return
return ITEM_INTERACT_BLOCKING
var/mob/living/target = interacting_with
if(target.mob_size > max_occupant_weight)
if(ishuman(target))
var/mob/living/carbon/human/H = target
Expand All @@ -92,11 +93,12 @@
to_chat(user, span_warning("Humans, generally, do not fit into pet carriers."))
else
to_chat(user, span_warning("You get the feeling [target] isn't meant for a [name]."))
return
return ITEM_INTERACT_BLOCKING
if(user == target)
to_chat(user, span_warning("Why would you ever do that?"))
return
return ITEM_INTERACT_BLOCKING
load_occupant(user, target)
return ITEM_INTERACT_SUCCESS

/obj/item/pet_carrier/relaymove(mob/living/user, direction)
if(open)
Expand Down
Loading