Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaning up the woeful zexcon #1229

Merged
merged 39 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
c4deafd
the real basic edits
Dec 4, 2024
8bed4fc
defines
Dec 4, 2024
5f7092f
de-zape
Dec 4, 2024
88919d6
and that's for dedicated coder than me to fight an uphill battle against
Dec 4, 2024
160b858
this too. also removes pregnancy
Dec 4, 2024
50f3b21
NO LOVE(BOLD) DEEP WEB
Dec 4, 2024
d4e52c7
i guess sound file replacements
Dec 4, 2024
97f5c4f
a whole lot of cleanups
Dec 4, 2024
07131da
a fucking penis overlay?
Dec 4, 2024
44dbb31
unpenis 2
Dec 4, 2024
494b458
a whole lot of wording changes
Dec 4, 2024
787a654
[in stodgy aristocrat voice] bosom
Dec 4, 2024
9773f55
well there once were two cowboys all alone out on the trail
Dec 4, 2024
7594244
a life thing
Dec 4, 2024
87dbae1
a few XTREEEEEME deletions
Dec 4, 2024
a75e70f
Merge branch 'main' into ohchristohfuck
lavillastrangiato Dec 4, 2024
836065f
i'm honestly not too sure how this works
Dec 4, 2024
4a760ce
Merge branch 'ohchristohfuck' of https://github.com/lavillastrangiato…
Dec 4, 2024
e692cc0
a small define
Dec 5, 2024
e8f38b4
more wording edits
Dec 5, 2024
afe9b88
deletes manual arousal cuz that was an overlay thing
Dec 5, 2024
b6d21c0
turns out the variables were fucked
Dec 5, 2024
eaed676
delete endless sexo and makes undies cover you properly
Dec 5, 2024
b2888fe
increases pleasure modifier so you don't have to goon
Dec 5, 2024
a3c402a
the sex... it's real!!
Dec 5, 2024
f9636da
anti-zape controls and some adminlogs
Dec 6, 2024
25ad16b
GETS THE LOGS WORKING
Dec 6, 2024
2826c91
untest
Dec 6, 2024
84529e8
Merge branch 'main' into ohchristohfuck
lavillastrangiato Dec 6, 2024
52a2f5b
minor fix here
Dec 6, 2024
6f44906
Merge branch 'main' into ohchristohfuck
NPC1314 Dec 6, 2024
2abf97a
FUCK FUCK FUCK
Dec 6, 2024
f5b8d73
lowers a pleasure modifier
Dec 7, 2024
0c7c9f1
rejigging the way churchy virginity loss happens
Dec 10, 2024
e598983
Merge branch 'main' into ohchristohfuck
lavillastrangiato Dec 10, 2024
323c9b7
a final slight edit for the typists out there
Dec 13, 2024
5317259
MONO'S DICK-BITING CODE I AM SO SORRY
Dec 18, 2024
2d8918e
Merge branch 'main' into ohchristohfuck
lavillastrangiato Dec 18, 2024
bc02401
crunchy code for the other oral bits
Dec 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions code/__DEFINES/sexcon_defines.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
GLOBAL_LIST_INIT(sex_actions, build_sex_actions())

#define SEX_ACTION(sex_action_type) GLOB.sex_actions[sex_action_type]

#define MAX_AROUSAL 150
#define PASSIVE_EJAC_THRESHOLD 100
#define ACTIVE_EJAC_THRESHOLD 100
#define SEX_MAX_CHARGE 300
#define CHARGE_FOR_CLIMAX 100
#define AROUSAL_HARD_ON_THRESHOLD 20
#define CHARGE_RECHARGE_RATE (CHARGE_FOR_CLIMAX / (5 MINUTES))
#define AROUSAL_TIME_TO_UNHORNY (5 SECONDS)
#define SPENT_AROUSAL_RATE (3 / (1 SECONDS))
#define IMPOTENT_AROUSAL_LOSS_RATE (3 / (1 SECONDS))


#define AROUSAL_HIGH_UNHORNY_RATE (1.5 / (1 SECONDS))
#define AROUSAL_MID_UNHORNY_RATE (0.4 / (1 SECONDS))
#define AROUSAL_LOW_UNHORNY_RATE (0.2 / (1 SECONDS))

#define MOAN_COOLDOWN 3 SECONDS

#define SEX_SPEED_LOW 1
#define SEX_SPEED_MID 2
#define SEX_SPEED_HIGH 3

#define SEX_SPEED_MIN 1
#define SEX_SPEED_MAX 3

#define SEX_FORCE_LOW 1
#define SEX_FORCE_MID 2
#define SEX_FORCE_HIGH 3

#define SEX_FORCE_MIN 1
#define SEX_FORCE_MAX 3

#define BLUEBALLS_GAIN_THRESHOLD 15
#define BLUEBALLS_LOOSE_THRESHOLD 10

/proc/build_sex_actions()
. = list()
for(var/path in typesof(/datum/sex_action))
if(is_abstract(path))
continue
.[path] = new path()
return .
1 change: 1 addition & 0 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#define TRAIT_VAMPMANSION "vampiremansion"
#define TRAIT_INHUMENCAMP "inhumencamp"
#define TRAIT_LIMPDICK "limp_dick"
#define TRAIT_MINCED "minced" // from monochrome/catalaria. your dick fell off
#define TRAIT_SEXPASS "sexpass"
#define TRAIT_INTRAINING "intraining" //allows certain roles to bypass the average skill limitation of training dummies
#define TRAIT_STEELHEARTED "steelhearted" //no bad mood from dismembering or seeing this
Expand Down
Loading
Loading