forked from Bubberstation/Bubberstation
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into quirks_from_Splurt
- Loading branch information
Showing
5 changed files
with
180 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| author: "Majkl-J" | ||
| delete-after: True | ||
| changes: | ||
| - rscadd: "Skirt peeking" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /datum/element/skirt_peeking | ||
| element_flags = ELEMENT_DETACH_ON_HOST_DESTROY | ||
|
|
||
| /datum/element/skirt_peeking/Attach(datum/peeked) | ||
| . = ..() | ||
| if(!ishuman(peeked)) | ||
| return ELEMENT_INCOMPATIBLE | ||
|
|
||
| RegisterSignal(peeked, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) | ||
| RegisterSignal(peeked, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_closer_look)) | ||
|
|
||
| /datum/element/skirt_peeking/Detach(datum/peeked, ...) | ||
| . = ..() | ||
| UnregisterSignal(peeked, list(COMSIG_ATOM_EXAMINE, COMSIG_ATOM_EXAMINE_MORE)) | ||
|
|
||
| /datum/element/skirt_peeking/proc/can_skirt_peek(mob/living/carbon/human/peeked, mob/peeker) | ||
| if(peeked == peeker) | ||
| return FALSE | ||
|
|
||
| var/mob/living/living_peeker = peeker | ||
| var/obj/item/clothing/under/worn_uniform = peeked.get_item_by_slot(ITEM_SLOT_ICLOTHING) | ||
| var/obj/item/clothing/suit/outer_clothing = peeked.get_item_by_slot(ITEM_SLOT_OCLOTHING) | ||
|
|
||
| // Check if the clothing is valid | ||
| if(outer_clothing && outer_clothing.body_parts_covered & (CHEST | GROIN | LEGS | FEET)) | ||
| return FALSE | ||
|
|
||
| // We are now peeking under a uniform | ||
| if(worn_uniform && (is_type_in_typecache(worn_uniform.type, GLOB.skirt_peekable) || worn_uniform.female_sprite_flags & FEMALE_UNIFORM_TOP_ONLY)) // FEMALE_UNIFORM_TOP_ONLY fallback incase something is missed | ||
| if(isobserver(peeker)) | ||
| return TRUE | ||
| if(istype(living_peeker)) | ||
| // Is the peeker not standing and the peeked not laying down | ||
| if((living_peeker.loc == peeked.loc) && (living_peeker.resting && !peeked.resting)) | ||
| return TRUE | ||
|
|
||
| var/obj/structure/high_ground_peeked = locate(/obj/structure) in get_turf(peeked) | ||
| var/obj/structure/high_ground_peeker = locate(/obj/structure) in get_turf(peeker) | ||
| if(high_ground_peeked && HAS_TRAIT(high_ground_peeked, TRAIT_CLIMBABLE) && (peeked.mobility_flags & MOBILITY_STAND) && peeked.Adjacent(peeker)) | ||
| if(!(high_ground_peeker && HAS_TRAIT(high_ground_peeker, TRAIT_CLIMBABLE))) | ||
| return TRUE | ||
| return FALSE | ||
|
|
||
| /datum/element/skirt_peeking/proc/on_examine(mob/living/carbon/human/peeked, mob/peeker, list/examine_list) | ||
| if(can_skirt_peek(peeked, peeker)) | ||
| examine_list += span_purple("[peeked.p_theyre(TRUE)] wearing a skirt! I can probably give it a little peek <b>looking closer</b>.") | ||
|
|
||
| /datum/element/skirt_peeking/proc/on_closer_look(mob/living/carbon/human/peeked, mob/peeker, list/examine_content) | ||
| if(can_skirt_peek(peeked, peeker)) | ||
| for(var/obj/item/organ/external/genital/genital in peeked.organs) | ||
| if(genital.zone != BODY_ZONE_PRECISE_GROIN) | ||
| continue | ||
| if(genital.visibility_preference == GENITAL_SKIP_VISIBILITY) | ||
| continue | ||
| examine_content += genital.get_description_string() | ||
| addtimer(CALLBACK(src, PROC_REF(try_notice), peeked, peeker), 1) | ||
|
|
||
| /// Alright, they've peeked us and everything, did we notice it though? | ||
| /datum/element/skirt_peeking/proc/try_notice(mob/living/carbon/human/peeked, mob/living/peeker) | ||
| if(isnull(peeked) || isnull(peeker)) | ||
| return | ||
| if(!istype(peeked) || !istype(peeker)) | ||
| return | ||
| var/obj/item/clothing/under/worn_uniform = peeked.get_item_by_slot(ITEM_SLOT_ICLOTHING) | ||
| if(!istype(worn_uniform)) | ||
| return | ||
| if(!(!peeked.client && (peeked.stat == CONSCIOUS) && peeked.has_status_effect(/datum/status_effect/grouped/blindness))) | ||
| return | ||
| to_chat(peeked, span_warning("You notice [peeker] looking under your [worn_uniform.name]!")) | ||
| to_chat(peeker, span_warning("[peeked] notices you peeking under [peeked.p_their()] [worn_uniform.name]!")) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters