cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into xpokee-test-upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-10 14:12:16 -04:00
parent ee99d0e5b0 392f1d93e8
commit 939f2fc9ac
277 changed files with 8854 additions and 7401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+9 -7
View File
@@ -714,18 +714,25 @@
return
// check to see if their face is blocked or, if not, a signal blocks it
if(examined_mob.is_face_visible() && SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT)
if(examined_mob.can_eye_contact() && SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT)
var/obj/item/clothing/eye_cover = examined_mob.is_eyes_covered()
if (!eye_cover || (!eye_cover.tint && !eye_cover.flash_protect))
var/msg = span_smallnotice("You make eye contact with [examined_mob].")
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), src, msg), 0.3 SECONDS) // so the examine signal has time to fire and this will print after
if(!imagined_eye_contact && is_face_visible() && !examined_mob.is_blind() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT)
if(!imagined_eye_contact && can_eye_contact() && !examined_mob.is_blind() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT)
var/obj/item/clothing/eye_cover = is_eyes_covered()
if (!eye_cover || (!eye_cover.tint && !eye_cover.flash_protect))
var/msg = span_smallnotice("[src] makes eye contact with you.")
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), examined_mob, msg), 0.3 SECONDS)
/// Checks if we can make eye contact or someone can make eye contact with us
/mob/living/proc/can_eye_contact()
return TRUE
/mob/living/carbon/can_eye_contact()
return !(obscured_slots & HIDEFACE)
/**
* Called by using Activate Held Object with an empty hand/limb
*
@@ -1563,11 +1570,6 @@
else
living_flags |= QUEUE_NUTRITION_UPDATE
/// Update mob stats based on equipment we are wearing when an item is equipped/dropped, to be overriden by children
/// source - Item that caused the update by being equipped/dropped
/mob/proc/update_equipment(obj/item/source)
update_equipment_speed_mods()
/// Apply a proper movespeed modifier based on items we have equipped
/mob/proc/update_equipment_speed_mods()
var/speedies = 0