cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 13:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

let's check for structure.climbable instead!

Browse Source
This commit is contained in:
SandPoot
2023-01-24 22:07:15 -03:00
parent da5c66c5b8
commit d2e08f17ea
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_sand/code/datums/elements/skirt_peeking.dm
+11 -8
View File
@@ -10,7 +10,7 @@
RegisterSignal(peeked, COMSIG_PARENT_EXAMINE_MORE, .proc/on_closer_look)
/datum/element/skirt_peeking/proc/can_skirt_peek(mob/living/carbon/human/peeked, mob/peeker)
var/mob/living/living = peeker
var/mob/living/living_peeker = peeker
var/obj/item/clothing/under/worn_uniform = peeked.get_item_by_slot(ITEM_SLOT_ICLOTHING)
// Unfortunately, you can't see it
@@ -20,18 +20,21 @@
//
// Valid clothing section
if(worn_uniform && is_type_in_typecache(worn_uniform.type, GLOB.skirt_peekable) \
if(worn_uniform && is_type_in_typecache(worn_uniform.type, GLOB.skirt_peekable))
// We are being peeked by a spooky ghost who sees all?
&& (isobserver(peeker) \
if(isobserver(peeker))
return TRUE
// Are you a living creature (and not us)?
|| (istype(living) && (peeker != peeked) \
if(istype(living) && (living_peeker != peeked))
// And are you under us while we're standing up?
&& (!(CHECK_BITFIELD(living.mobility_flags, MOBILITY_STAND)) && (CHECK_BITFIELD(peeked.mobility_flags, MOBILITY_STAND)) && (peeked.loc == living.loc)))) \
if(!(CHECK_BITFIELD(living_peeker.mobility_flags, MOBILITY_STAND)) && (CHECK_BITFIELD(peeked.mobility_flags, MOBILITY_STAND)) && (peeked.loc == living_peeker.loc))
return TRUE
// Or are you nearby and we are up high
|| ((locate(/obj/structure/table) in get_turf(peeked)) && CHECK_BITFIELD(peeked.mobility_flags, MOBILITY_STAND)) && \
// to-do SOMEONE PLEASE PORT /datum/element/climbable
var/obj/structure/high_ground = locate(/obj/structure/table) in get_turf(peeked)
if(high_ground && high_ground.climbable && CHECK_BITFIELD(peeked.mobility_flags, MOBILITY_STAND) && \
peeked.Adjacent(peeker))
return TRUE
return TRUE
return FALSE
/datum/element/skirt_peeking/proc/on_examine(mob/living/carbon/human/peeked, mob/peeker, list/examine_list)