diff --git a/modular_ss220/mobs/code/pet_carrier.dm b/modular_ss220/mobs/code/pet_carrier.dm index 2c9563653baa..453499dd4c88 100644 --- a/modular_ss220/mobs/code/pet_carrier.dm +++ b/modular_ss220/mobs/code/pet_carrier.dm @@ -68,6 +68,9 @@ if(target.mob_size > mob_size) to_chat(user, "Ваша переноска слишком мала!") return FALSE + if(!istype(target, /mob/living/simple_animal/pet)) + to_chat(user, "Это существо не очень похоже на ручное животное.") + return FALSE //if(target.mob_size < mob_size) // to_chat(user, "Ваша переноска слишком большая!") // return FALSE diff --git a/modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm b/modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm index 64deb877e871..a7ad0195f406 100644 --- a/modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm +++ b/modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm @@ -49,7 +49,16 @@ tts_seed = "Thrall" /mob/living/simple_animal/pet/dog/security/detective/show_inv(mob/user) - return + if(user.incapacitated() || !Adjacent(user)) + return + user.set_machine(src) + + var/dat = {"
Inventory of [name]

"} + dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]" + + var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250) + popup.set_content(dat) + popup.open() /mob/living/simple_animal/pet/dog/security/show_inv(mob/user) if(user.incapacitated() || !Adjacent(user))