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 2026-08-25 21:56:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system

Browse Source
This commit is contained in:
WoolyAypa
2023-04-26 16:12:15 -03:00
parent dd10708b61 dd0fdaaee8
commit 36f8a4ea71
77 changed files with 1535 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_sand/code/datums/components/interaction_menu_granter.dm
-37
View File
@@ -136,14 +136,8 @@
else
visibility = "Hidden by clothes"
var/extras = "None"
if(CHECK_BITFIELD(genital.genital_flags, GENITAL_CAN_STUFF))
extras = "Allows egg stuffing"
genital_entry["extras"] = extras
genital_entry["visibility"] = visibility
genital_entry["possible_choices"] = GLOB.genitals_visibility_toggles
genital_entry["extra_choices"] = list(GEN_ALLOW_EGG_STUFFING)
genital_entry["can_arouse"] = (
!!CHECK_BITFIELD(genital.genital_flags, GENITAL_CAN_AROUSE) \
&& !(HAS_TRAIT(get_genitals, TRAIT_PERMABONER) \
@@ -169,37 +163,6 @@
genitals += list(simulated_ass)
.["genitals"] = genitals
//Get their genitals
var/list/genital_fluids = list()
var/mob/living/carbon/target_genitals = target || self
if(istype(target_genitals))
for(var/obj/item/organ/genital/genital in target_genitals.internal_organs)
if(!(CHECK_BITFIELD(genital.genital_flags, GENITAL_FUID_PRODUCTION)))
continue
var/fluids = (clamp(genital.fluid_rate * ((world.time - genital.last_orgasmed) / (10 SECONDS)) * genital.fluid_mult, 0, genital.fluid_max_volume) / genital.fluid_max_volume)
var/list/genital_entry = list()
genital_entry["name"] = "[genital.name]"
genital_entry["key"] = REF(genital)
genital_entry["fluid"] = fluids
genital_fluids += list(genital_entry)
.["genital_fluids"] = genital_fluids
var/list/genital_interactibles = list()
if(istype(target_genitals))
for(var/obj/item/organ/genital/genital in target_genitals.internal_organs)
if(!genital.is_exposed())
continue
var/list/equipment_names = list()
for(var/obj/equipment in genital.contents)
equipment_names += equipment.name
var/list/genital_entry = list()
genital_entry["name"] = "[genital.name]"
genital_entry["key"] = REF(genital)
genital_entry["possible_choices"] = GLOB.genitals_interactions
genital_entry["equipments"] = equipment_names
genital_interactibles += list(genital_entry)
.["genital_interactibles"] = genital_interactibles
var/datum/preferences/prefs = self?.client.prefs
if(prefs)
//Getting char prefs