diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index 32e7ac49b4..4576edd2e0 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -107,7 +107,7 @@ if(user == target) to_chat(user, "Why would you ever do that?") return - if(ishostile(target) && (!allows_hostiles || istype(target, /mob/living/simple_animal/hostile/carp/cayenne)) || target.move_resist < MOVE_FORCE_VERY_STRONG) //don't allow goliaths into pet carriers, but let cayenne in! + if((ishostile(target) && (!allows_hostiles || !istype(target, /mob/living/simple_animal/hostile/carp/cayenne))) || target.move_resist >= MOVE_FORCE_VERY_STRONG) //don't allow goliaths into pet carriers, but let cayenne in! to_chat(user, "You have a feeling you shouldn't keep this as a pet.") return load_occupant(user, target) diff --git a/html/changelogs/AutoChangeLog-pr-12945.yml b/html/changelogs/AutoChangeLog-pr-12945.yml new file mode 100644 index 0000000000..730a2b8887 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12945.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "bluespace jars work as intended now"