cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimized some copypasted code (#285)

Browse Source 
* less copypaste = good

* fix

* Update lewd_definitions.dm

oops
This commit is contained in:
BongaTheProto
2023-01-17 05:59:18 -05:00
committed by GitHub
parent e4fc069f87
commit 68649df86c
2 changed files with 25 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__HELPERS/_cit_helpers.dm
View File

@@ -125,12 +125,12 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
if(getorganslot(ORGAN_SLOT_BREASTS))
return TRUE
return FALSE
*/
/mob/living/carbon/proc/has_butt()
if(getorganslot(ORGAN_SLOT_BUTT))
return TRUE
return FALSE
*/
/mob/living/carbon/proc/is_groin_exposed(list/L)
if(!L)

94
modular_sand/code/datums/interactions/lewd_definitions.dm
View File

@@ -18,8 +18,10 @@
/mob/living
var/has_penis = FALSE
var/has_balls = FALSE
var/has_vagina = FALSE
var/has_anus = TRUE
var/has_butt = FALSE
var/anus_always_accessible = FALSE
var/has_breasts = FALSE
var/anus_exposed = FALSE
@@ -87,99 +89,45 @@
/mob/living/proc/toggle_anus_always_accessible()
anus_always_accessible = !anus_always_accessible
/mob/living/proc/has_penis(visibility = REQUIRE_ANY)
/mob/living/proc/has_genital(slot, visibility = REQUIRE_ANY)
var/mob/living/carbon/C = src
if(has_penis && !istype(C))
return TRUE
if(istype(C))
var/obj/item/organ/genital/peepee = C.getorganslot(ORGAN_SLOT_PENIS)
if(peepee)
var/obj/item/organ/genital/genital = C.getorganslot(slot)
if(genital)
switch(visibility)
if(REQUIRE_ANY)
return TRUE
if(REQUIRE_EXPOSED)
if(peepee.is_exposed() || peepee.always_accessible)
return TRUE
else
return FALSE
return genital.is_exposed() || genital.always_accessible
if(REQUIRE_UNEXPOSED)
if(!peepee.is_exposed())
return TRUE
else
return FALSE
return !genital.is_exposed()
else
return TRUE
return FALSE
/mob/living/proc/has_penis(visibility = REQUIRE_ANY)
var/mob/living/carbon/C = src
if(has_penis && !istype(C))
return TRUE
return has_genital(ORGAN_SLOT_PENIS, visibility)
/mob/living/proc/has_balls(visibility = REQUIRE_ANY)
var/mob/living/carbon/C = src
if(istype(C))
var/obj/item/organ/genital/peepee = C.getorganslot(ORGAN_SLOT_TESTICLES)
if(peepee)
switch(visibility)
if(REQUIRE_ANY)
return TRUE
if(REQUIRE_EXPOSED)
if(peepee.is_exposed() || peepee.always_accessible)
return TRUE
else
return FALSE
if(REQUIRE_UNEXPOSED)
if(!peepee.is_exposed())
return TRUE
else
return FALSE
else
return TRUE
return FALSE
if(has_balls && !istype(C))
return TRUE
return has_genital(ORGAN_SLOT_TESTICLES, visibility)
/mob/living/proc/has_vagina(visibility = REQUIRE_ANY)
var/mob/living/carbon/C = src
if(has_vagina && !istype(C))
return TRUE
if(istype(C))
var/obj/item/organ/genital/peepee = C.getorganslot(ORGAN_SLOT_VAGINA)
if(peepee)
switch(visibility)
if(REQUIRE_ANY)
return TRUE
if(REQUIRE_EXPOSED)
if(peepee.is_exposed() || peepee.always_accessible)
return TRUE
else
return FALSE
if(REQUIRE_UNEXPOSED)
if(!peepee.is_exposed())
return TRUE
else
return FALSE
else
return TRUE
return FALSE
return has_genital(ORGAN_SLOT_VAGINA, visibility)
/mob/living/proc/has_breasts(visibility = REQUIRE_ANY)
var/mob/living/carbon/C = src
if(has_breasts && !istype(C))
return TRUE
if(istype(C))
var/obj/item/organ/genital/peepee = C.getorganslot(ORGAN_SLOT_BREASTS)
if(peepee)
switch(visibility)
if(REQUIRE_ANY)
return TRUE
if(REQUIRE_EXPOSED)
if(peepee.is_exposed() || peepee.always_accessible)
return TRUE
else
return FALSE
if(REQUIRE_UNEXPOSED)
if(!peepee.is_exposed())
return TRUE
else
return FALSE
else
return TRUE
return FALSE
return has_genital(ORGAN_SLOT_BREASTS, visibility)
/mob/living/proc/has_anus(visibility = REQUIRE_ANY)
if(has_anus && !iscarbon(src))
@@ -369,6 +317,12 @@
return TRUE
return FALSE
/mob/living/proc/has_butt(visibility = REQUIRE_ANY)
var/mob/living/carbon/C = src
if(has_butt && !istype(C))
return TRUE
return has_genital(ORGAN_SLOT_BUTT, visibility)
///Are we wearing something that covers our chest?
/mob/living/proc/is_topless()
for(var/slot in GLOB.slots)