Skip to content

Commit a584f6c

Browse files
Holder examine will now examine contents.
1 parent b8069b1 commit a584f6c

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

code/modules/mob_holder/_holder.dm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
AM.vis_flags |= (VIS_INHERIT_ID|VIS_INHERIT_LAYER|VIS_INHERIT_PLANE)
2525
add_vis_contents(AM)
2626

27+
/obj/item/holder/examined_by(mob/user, distance, infix, suffix)
28+
for(var/atom/thing in get_contained_external_atoms())
29+
thing.examined_by(user, distance, infix, suffix)
30+
return TRUE
31+
2732
// No scooping mobs and handing them to people who can't scoop them.
2833
/obj/item/holder/equipped(mob/user, slot)
2934
. = ..()

code/modules/mob_holder/holder_mobs.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
var/obj/item/holder/H = new holder_type(get_turf(src))
2323
H.w_class = get_object_size()
2424
if(initiator == src)
25-
if(!target.equip_to_slot_if_possible(H, slot_back_str, del_on_fail=0, disable_warning=1))
25+
if(!target.equip_to_slot_if_possible(H, slot_back_str, del_on_fail=0, disable_warning=1) && !target.put_in_hands(H))
2626
if(!silent)
2727
to_chat(initiator, SPAN_WARNING("You can't climb onto [target]!"))
2828
return FALSE

0 commit comments

Comments
 (0)