From 7e7fe53fdf5c7a892dd50f3cb37a42543f641bdb Mon Sep 17 00:00:00 2001 From: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com> Date: Tue, 10 Mar 2020 01:03:32 -0400 Subject: [PATCH] Adds Weekend at Bernies'ing People (#49749) * in addition to the meme i also fixed some comments! * Update code/modules/mob/living/carbon/human/examine.dm Co-Authored-By: Jordie <4343468+Jordie0608@users.noreply.github.com> Co-authored-by: Jordie <4343468+Jordie0608@users.noreply.github.com> --- code/modules/mob/living/carbon/human/examine.dm | 5 ++++- code/modules/mob/mob_defines.dm | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index fa946fabd8b..67fba038a1b 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -114,7 +114,10 @@ if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) appears_dead = TRUE - if(isliving(user) && HAS_TRAIT(user, TRAIT_NAIVE)) + var/obj/item/clothing/glasses/G = get_item_by_slot(ITEM_SLOT_EYES) + var/are_we_in_weekend_at_bernies = G?.tint && buckled && istype(buckled, /obj/vehicle/ridden/wheelchair) + + if(isliving(user) && (HAS_TRAIT(user, TRAIT_NAIVE) || are_we_in_weekend_at_bernies)) just_sleeping = TRUE if(!just_sleeping) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 95762ec048b..7f1ffcbe6d3 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -106,9 +106,9 @@ /// The last known IP of the client who was in this mob var/lastKnownIP = null - /// movable atoms buckled to this mob - var/atom/movable/buckled = null//Living /// movable atom we are buckled to + var/atom/movable/buckled = null//Living + /// movable atoms buckled to this mob var/atom/movable/buckling //Hands