 BongaTheProto
|
2d1d665e41
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
|
2023-12-16 10:48:35 -05:00 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPoot
|
aeabd21ed5
|
push
|
2023-12-12 22:00:26 -03:00 |
|
|
SandPoot
|
2428e642bf
|
all of those already inherit from /datum/interaction, unless they're anywhere not 1, i won't allow
|
2023-12-09 21:18:40 -03:00 |
|
|
SandPoot
|
bfc964b76b
|
do you know the definition of insanity
|
2023-12-09 20:27:19 -03:00 |
|
|
ariaworld
|
d8a726e4dd
|
Lewd verbs spelling. (Note some verbs are without periods because they default to it)
|
2023-10-23 22:32:45 +02:00 |
|
|
ariaworld
|
cf406724d6
|
Climax positive mood lasts more, less sex verb cooldown.
|
2023-10-23 22:28:01 +02:00 |
|
|
BongaTheProto
|
7b5ecc7b49
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-07 23:28:42 -05:00 |
|
|
SandPootandМарк
|
bcbecabf74
|
push
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
|
2023-10-06 01:11:28 -03:00 |
|
|
BongaTheProto
|
cd026aaddb
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-05 13:38:12 -05:00 |
|
|
SandPoot
|
b7af940a28
|
fix lack of message for special cases
|
2023-10-04 13:35:50 -03:00 |
|
|
BongaTheProto
|
d9a628e027
|
followup
|
2023-09-23 18:31:45 -05:00 |
|
|
BongaTheProto
|
f405132915
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-23 18:15:45 -05:00 |
|
|
SandPoot
|
eba26a5775
|
push
|
2023-09-23 19:16:12 -03:00 |
|
|
BongaTheProto
|
f353115f71
|
the cum bathing is real!!!!!
cum overlays have been fixed once and for all
|
2023-08-26 03:42:29 -05:00 |
|
|
BongaTheProto
|
cdd5bb87d8
|
Merge remote-tracking branch 'upstream/master'
|
2023-08-08 01:42:46 -05:00 |
|
|
SandPoot
|
1ae7c2272a
|
quick-fix
|
2023-08-07 16:53:05 -03:00 |
|
|
BongaTheProto
|
650642d379
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-20 00:23:25 -05:00 |
|
|
SandPoot
|
2b9660664e
|
poosh
|
2023-07-19 17:48:43 -03:00 |
|
|
BongaTheProto
|
148ae75649
|
Merge remote-tracking branch 'upstream/master' into upstream-update
|
2023-06-21 18:49:14 -05:00 |
|
|
SandPoot
|
15d52e5b15
|
update content
|
2023-06-20 15:39:24 -03:00 |
|
|
WoolyAypa
|
71983d21a8
|
Merge branch 'Chastity-system' of https://github.com/WoolyAypa/S.P.L.U.R.T-Station-13 into Chastity-system
|
2023-05-28 18:33:09 -03:00 |
|
|
WoolyAypa
|
7b9d0f43a5
|
, B gone
|
2023-05-28 18:33:01 -03:00 |
|
|
|
2bc6ce835f
|
Update modular_sand/code/datums/interactions/lewd_definitions.dm
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
|
2023-05-28 16:36:30 -03:00 |
|
|
WoolyAypa
|
f475015d09
|
removed unnecessary stuff
|
2023-05-28 15:02:01 -03:00 |
|
|
WoolyAypa
|
36f8a4ea71
|
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system
|
2023-04-26 16:12:15 -03:00 |
|
|
WoolyAypa
|
f70e1e901e
|
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system
|
2023-03-24 23:46:54 -03:00 |
|
|
Pin-alternative
|
d1b3acbc5c
|
Merge remote-tracking branch 'upstream/master' into rework
|
2023-03-05 19:16:26 +11:00 |
|
|
BongaTheProto
|
ce464a6903
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-11 21:25:29 -05:00 |
|
|
WoolyAypa
|
e4d35beb7d
|
hope it works
|
2023-02-11 16:28:54 -03:00 |
|
|
SandPootandGitHub
|
117919fe2b
|
Componentizes Interaction menu + prepares it for screentips by adding a shortcut (#301)
* files
* let's just use our own parent
* necessary
* two istypes on a row
|
2023-02-11 14:39:29 -03:00 |
|
|
WoolyAypa
|
94d24dfb31
|
mebbe?
|
2023-02-11 12:22:05 -03:00 |
|
|
WoolyAypa
|
f04f9ce559
|
doone, opt-out pref
|
2023-01-19 00:43:16 -03:00 |
|
|
WoolyAypa
|
4cd6975b3b
|
conflictos
|
2023-01-18 21:27:19 -03:00 |
|
|
BongaTheProtoandGitHub
|
68649df86c
|
optimized some copypasted code (#285)
* less copypaste = good
* fix
* Update lewd_definitions.dm
oops
|
2023-01-17 07:59:18 -03:00 |
|
|
Pin-alternative
|
17a8fb452e
|
Merge remote-tracking branch 'upstream/master' into rework
|
2023-01-16 20:26:27 +11:00 |
|
|
BongaTheProto
|
41e15dd097
|
follow-up
I HOPE this doesn't break stuff
|
2023-01-16 02:20:22 -05:00 |
|
|
BongaTheProto
|
596ab81dd0
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-16 01:06:20 -05:00 |
|
|
SandPootandGitHub
|
0fe80e9234
|
Puts span defines on sandstorm's strings (#284)
|
2023-01-15 00:40:48 -03:00 |
|
|
SandPootandGitHub
|
32159792ad
|
Adds a button to toggle the capability of interacting through clothes (#283)
* here it is
* damn typo
|
2023-01-14 23:47:25 -03:00 |
|
|
WoolyAypa
|
b70d5b903a
|
something like this mebbe
|
2023-01-01 00:09:19 -03:00 |
|
|
WoolyAypa
|
1aadf01bbc
|
Merge branch 'Chastity-system' of https://github.com/WoolyAypa/S.P.L.U.R.T-Station-13 into Chastity-system
|
2022-12-31 03:15:00 -03:00 |
|
|
WoolyAypa
|
dcb7c6729c
|
here! :>
|
2022-12-31 03:14:51 -03:00 |
|
|
AypaandGitHub
|
821b14c006
|
Merge branch 'master' into Chastity-system
|
2022-12-23 16:21:32 -03:00 |
|
|
Pin-alternative
|
74841cfabc
|
Merge remote-tracking branch 'upstream/master' into rework
|
2022-12-15 19:48:05 +11:00 |
|
|
BongaTheProto
|
3666faccf9
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-15 01:25:03 -05:00 |
|
|
SandPootandGitHub
|
a102c785e2
|
Adds an arousal button to the interaction ui (also does some ui "niceing") (#275)
* the entire content
* out of scope but critical.
|
2022-12-14 20:05:37 -03:00 |
|
|
WoolyAypa
|
b1c288d267
|
help!
|
2022-12-12 12:38:18 -03:00 |
|
|
Pin-alternative
|
5cc27b4be6
|
Merge remote-tracking branch 'upstream/master' into rework
|
2022-10-23 16:53:43 +11:00 |
|
|
Pin-alternative
|
d57be23411
|
sizes rework
|
2022-10-23 16:53:39 +11:00 |
|