Skip to content

Commit

Permalink
[MIRROR] Fix clown PDA not slipping while not worn (#1654) (#2585)
Browse files Browse the repository at this point in the history
* Fix clown PDA not slipping while not worn (#82240)

## About The Pull Request

`slipper` can and will be `null` if not worn, so this runtimed. broken
for who-knows-how long, probably a year or so.

## Changelog

:cl: Melbert
fix: Clown PDAs slip people when not worn
/:cl:

---------



* Fix clown PDA not slipping while not worn

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: John Willard <[email protected]>
  • Loading branch information
4 people authored Mar 27, 2024
1 parent f9b9a95 commit 0201610
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,10 @@
)
AddComponent(/datum/component/wearertargeting/sitcomlaughter, CALLBACK(src, PROC_REF(after_sitcom_laugh)))

/// Return true if our wearer is in a position to slip someone
/// Returns whether the PDA can slip or not, if we have a wearer then check if they are in a position to slip someone.
/obj/item/modular_computer/pda/clown/proc/try_slip(mob/living/slipper, mob/living/slippee)
if(isnull(slipper))
return TRUE
if(!istype(slipper.get_item_by_slot(ITEM_SLOT_FEET), /obj/item/clothing/shoes/clown_shoes))
to_chat(slipper,span_warning("[src] failed to slip anyone. Perhaps I shouldn't have abandoned my legacy..."))
return FALSE
Expand Down

0 comments on commit 0201610

Please sign in to comment.