Commit Graph
253 Commits
Author SHA1 Message Date
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 d71ae369d6 reorganizes flags to be alphabetical 2023-12-11 15:23:53 -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
BongaTheProtoandGitHub de5e1e7611 Merge pull request #981 from ariaworld/lewd-smallupdate
[Lewd] [Semi-Modular] - Human Erect Penis and Balls Sprites-Fix & More!
2023-11-06 15:06:15 -05:00
BongaTheProto 37bbecefb4 Merge remote-tracking branch 'upstream/master' 2023-11-05 18:01:32 -05:00
SandPoot 3bb6783438 content 2023-11-03 21:17:22 -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
BongaTheProtoandGitHub 31d43c4fe7 Merge pull request #947 from remuluson2/messy
Adding Messy trait, Pref for getting splashed with cum
2023-09-23 18:57:28 -05: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 085bb06e94 Merge remote-tracking branch 'upstream/master' 2023-09-16 14:32:38 -05:00
SandPoot cff56847dc quick-fix 2023-09-14 22:52:04 -03:00
SandPoot 73db2b7c94 balance 2023-09-14 22:44:17 -03:00
SandPoot 0b04af4b76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-14 22:32:47 -03:00
Mateusz Dargiel e5a1325095 fixed indents, added cum_onto pref to all the uis 2023-09-02 13:48:26 +02: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
SandPoot 6fb4267b56 upload 2023-08-04 23:26:33 -03:00
BongaTheProto ea324c5bc1 Merge remote-tracking branch 'upstream/master' 2023-07-28 20:43:43 -05:00
SandPoot 613f6694d3 extra behavior 2023-07-28 21:09:20 -03:00
SandPoot 5fb9aa4152 change 2023-07-28 21:00:29 -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 f4e7294296 Merge remote-tracking branch 'upstream/master' 2023-07-13 19:57:48 -05:00
SandPoot 737c2f200d content 2023-07-12 13:04:01 -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 c0cfc5a807 chastity cages work again and can be deleted 2023-04-29 17:10:16 -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 c9457047aa Merge remote-tracking branch 'upstream/master' into rework 2023-03-22 15:45:09 +11:00
BongaTheProto 017c235b4f Merge remote-tracking branch 'upstream/master' 2023-03-14 17:43:38 -05:00
SandPoot 50620b906f gone 2023-03-14 18:40:17 -03:00
BongaTheProto 9e65955803 Update holder_micro.dm
makes you able to interact with mobs you're holding again
2023-03-14 16:37:59 -05:00
BongaTheProto c7569b07a5 Merge remote-tracking branch 'upstream/master' 2023-03-13 02:25:18 -05:00
SandPoot 0dd6daf5d5 lust sight 2023-03-12 03:02:00 -03:00