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

Refractored ERP interactions #61

Merged
merged 49 commits into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
c799a73
makes the interactions subsystem
MosleyTheMalO Dec 21, 2024
868fced
Interaction checks (needs unholy and extreme checks)
MosleyTheMalO Dec 21, 2024
8b9ac02
Interactions climax edits
MosleyTheMalO Dec 23, 2024
da8df7b
Add extreme, harmful, and unholy ERP preferences and interactions
MosleyTheMalO Dec 24, 2024
9731b76
forgor
MosleyTheMalO Dec 24, 2024
6aeaceb
fixes unsafe interactions again
MosleyTheMalO Dec 24, 2024
7965175
refractor genital expansion reagents and adds prefs
MosleyTheMalO Dec 25, 2024
257079b
no
MosleyTheMalO Dec 25, 2024
4b99495
ugh
MosleyTheMalO Dec 25, 2024
e7317de
Fixes some stuff + fluids system + proper vagina climax handling
MosleyTheMalO Dec 26, 2024
311c088
implements sexual potency and lust tolerance
MosleyTheMalO Dec 26, 2024
dd24dba
fuck interactions - needs sounds
MosleyTheMalO Dec 26, 2024
77f58d1
bruh
MosleyTheMalO Dec 26, 2024
4abf070
tgstation.dme
MosleyTheMalO Dec 26, 2024
495d243
Interaction sounds (modular_sand)
MosleyTheMalO Dec 26, 2024
2896a11
guh
MosleyTheMalO Dec 26, 2024
78cc6a4
frotting interactions
MosleyTheMalO Dec 26, 2024
e7d201a
Extra logic necessary for some interactions
MosleyTheMalO Dec 27, 2024
fb243ad
forgor
MosleyTheMalO Dec 27, 2024
7bb38be
that was unnecessary
MosleyTheMalO Dec 27, 2024
f109dc6
feet interactions
MosleyTheMalO Dec 27, 2024
e8f6db5
handjob
MosleyTheMalO Dec 27, 2024
b86c61c
breasts
MosleyTheMalO Dec 27, 2024
9357b88
guess this could work
MosleyTheMalO Dec 27, 2024
c60f1e4
some extra checks on climax
MosleyTheMalO Dec 27, 2024
56ccc84
fixes
MosleyTheMalO Dec 27, 2024
551640e
nipsuck
MosleyTheMalO Dec 27, 2024
f150d3b
oral and facefuck interactions
MosleyTheMalO Dec 27, 2024
131c283
Makes the interactions folder less of a mess
MosleyTheMalO Dec 27, 2024
774de31
yeah this isn't gonna work as intended
MosleyTheMalO Dec 27, 2024
0a6e2e2
fingering and kisses
MosleyTheMalO Dec 27, 2024
b421967
lick (mmm feet)
MosleyTheMalO Dec 27, 2024
0d3856d
Mount and thighs
MosleyTheMalO Dec 27, 2024
f1d72de
testicles
MosleyTheMalO Dec 27, 2024
2701f3a
Update mount.dm
MosleyTheMalO Dec 27, 2024
d4b487b
fixes
MosleyTheMalO Dec 27, 2024
ad829db
slap
MosleyTheMalO Dec 27, 2024
bf9e2ed
extreme interactions, self interactions, and other improvements
MosleyTheMalO Dec 27, 2024
77c72e0
fix
MosleyTheMalO Dec 27, 2024
61540b7
Finishing touches (modular_sand interactions)
MosleyTheMalO Dec 27, 2024
d605652
honestly it's easier to keep these than adding them manually again
MosleyTheMalO Dec 27, 2024
2eb9a28
honk!
MosleyTheMalO Dec 27, 2024
88da777
better implementation
MosleyTheMalO Dec 28, 2024
b1bf329
adds our custom interactions (normal)
MosleyTheMalO Dec 29, 2024
8872b46
shit
MosleyTheMalO Dec 29, 2024
4593d6b
Some adjustments
MosleyTheMalO Dec 29, 2024
82f390b
fix
MosleyTheMalO Dec 29, 2024
a661076
fixes things again
MosleyTheMalO Dec 29, 2024
acdda01
scat fix
MosleyTheMalO Dec 29, 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
Prev Previous commit
Next Next commit
Makes the interactions folder less of a mess
  • Loading branch information
MosleyTheMalO committed Dec 29, 2024
commit 131c283a82a5d5ba26d0be75b8ba57ad65691b78
4 changes: 2 additions & 2 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -9580,17 +9580,17 @@
#include "modular_zzplurt\code\modules\language\_language_holder.dm"
#include "modular_zzplurt\code\modules\language\buzzwords.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interaction_datum.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\_extreme.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\_lewd.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\_unholy.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\breasts.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\extreme.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\facefuck.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\feet.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\frotting.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\fuck.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\handjob.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\nipsuck.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\oral.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\unholy.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\lewd_helpers\human.dm"
#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\_aphrodisiac.dm"
#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\belly_enlarger.dm"
Expand Down