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-31 08:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
BongaTheProto
2023-09-23 18:15:45 -05:00
parent 1143196d31 3a7e5c8111
commit f405132915
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__SANDCODE/DEFINES/dcs/signals/lewd.dm
+8
View File
@@ -0,0 +1,8 @@
/*
* From /mob/living/cum(): (mob/source, mob/living/partner, target_orifice)
* This one may return TRUE to prevent cumming.
*
*/
#define COMSIG_MOB_PRE_CAME "mob_pre_came"
/// From /mob/living/cum(): (mob/source, mob/living/partner, target_orifice)
#define COMSIG_MOB_POST_CAME "mob_post_came"
html/changelogs/archive/2023-09.yml
+2
View File
@@ -91,3 +91,5 @@
Zattarra:
- rscadd: Added stepping preference toggle, which allows or disables macro - micro
stomping interactions.
SandPoot:
- code_imp: Adds signals for sex to be used by coders in the future.
modular_sand/code/datums/interactions/lewd_definitions.dm
+7 -4
View File
@@ -411,6 +411,8 @@
/mob/living/proc/cum(mob/living/partner, target_orifice)
if(HAS_TRAIT(src, TRAIT_NEVERBONER))
return FALSE
if(SEND_SIGNAL(src, COMSIG_MOB_PRE_CAME, target_orifice, partner))
return FALSE
var/message
var/u_His = p_their()
var/u_He = p_they()
@@ -796,6 +798,8 @@
set_lust(0)
SEND_SIGNAL(src, COMSIG_MOB_CAME, target_orifice, partner, cumin, last_genital)
SEND_SIGNAL(src, COMSIG_MOB_POST_CAME, target_orifice, partner)
return TRUE
/mob/living/proc/is_fucking(mob/living/partner, orifice, obj/item/organ/genital/genepool, datum/interaction/lewd/lewd_datum)
@@ -847,12 +851,11 @@
if(lust >= lust_tolerance)
if(prob(10))
to_chat(src, "<b>You struggle to not orgasm!</b>")
moan()
return FALSE
if(lust >= (lust_tolerance * 3))
cum(partner, orifice)
return TRUE
else
moan()
if(cum(partner, orifice))
return TRUE
return FALSE
/mob/living/proc/get_unconsenting(extreme = FALSE, list/ignored_mobs)
tgstation.dme
+1
View File
@@ -261,6 +261,7 @@
#include "code\__SANDCODE\DEFINES\traits.dm"
#include "code\__SANDCODE\DEFINES\wires.dm"
#include "code\__SANDCODE\DEFINES\dcs\signals.dm"
#include "code\__SANDCODE\DEFINES\dcs\signals\lewd.dm"
#include "code\__SANDCODE\DEFINES\dcs\signals\signals_mob_main.dm"
#include "code\__SANDCODE\DEFINES\dcs\signals\sizecode.dm"
#include "code\__SANDCODE\HELPERS\sizecode.dm"