Commit Graph
25 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 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
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 7b9d0f43a5 , B gone 2023-05-28 18:33: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 4cd6975b3b conflictos 2023-01-18 21:27:19 -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
WoolyAypa b70d5b903a something like this mebbe 2023-01-01 00:09:19 -03:00
WoolyAypa b1c288d267 help! 2022-12-12 12:38:18 -03:00
Pin-alternative d57be23411 sizes rework 2022-10-23 16:53:39 +11:00
LamkasDev 8aa1a96f97 fix: fix wrong strapon interaction checks 2022-09-08 15:41:18 +02:00
LamkasDev fba9cd66de feat: add strapons 2022-09-05 16:34:26 +02:00
BongaTheProto 8b7fa8233c emotes and quirks
ok maybe it happened... but 40 votes? in only 2 days??
2022-06-04 18:46:02 -05:00
SandPoot 616efb0ac3 bad check 2022-05-10 18:16:06 -03:00
SandPootandGitHub 771f468ba6 Interaction Panel Upgrade Again! (#250)
* Upload files

* command is now deprecated

* cooldown defines!
2022-05-06 14:58:58 -03:00