 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
|
bfc964b76b
|
do you know the definition of insanity
|
2023-12-09 20:27:19 -03:00 |
|
|
Mateusz Dargiel
|
e5a1325095
|
fixed indents, added cum_onto pref to all the uis
|
2023-09-02 13:48:26 +02:00 |
|
|
BongaTheProto
|
cdd5bb87d8
|
Merge remote-tracking branch 'upstream/master'
|
2023-08-08 01:42:46 -05:00 |
|
|
SandPoot
|
6fb4267b56
|
upload
|
2023-08-04 23:26:33 -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
|
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
|
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 |
|
|
Pin-alternative
|
5ce56db316
|
Merge branch 'rework' of pin:Pin-alternative/S.P.L.U.R.T-Station-13 into rework
|
2023-03-05 19:17:54 +11:00 |
|
|
BongaTheProtoandGitHub
|
e42db7f37c
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-02-17 18:50:34 -05:00 |
|
|
Pin-alternative
|
05e486ea8e
|
Merge remote-tracking branch 'upstream/master' into rework
|
2023-02-17 21:13:35 +11:00 |
|
|
SandPoot
|
beb9ffbe36
|
simple fix for admin spawn
|
2023-02-17 02:07:30 -03:00 |
|
|
BongaTheProto
|
972df3f711
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-16 16:30:59 -05:00 |
|
|
SandPoot
|
04eb7226e6
|
general better handling of code + interaction screen tip
|
2023-02-15 23:26:59 -03:00 |
|
|
BongaTheProtoandGitHub
|
0a48421882
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-02-12 16:13:29 -05:00 |
|
|
SandPoot
|
e1c9fdaf00
|
fucking fix that mosley annoys me about
|
2023-02-12 18:03:41 -03:00 |
|
|
BongaTheProto
|
a65cd6c96b
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-11 21:26:36 -05:00 |
|
|
BongaTheProto
|
ce464a6903
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-11 21:25:29 -05:00 |
|
|
SandPoot
|
243e7ea02f
|
safety i guess, people are afraid that someone is SOMEHOW gonna manage to open their menu without being admin
|
2023-02-11 21:54:20 -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
|
4cd6975b3b
|
conflictos
|
2023-01-18 21:27:19 -03:00 |
|
|
SandPootandGitHub
|
0fe80e9234
|
Puts span defines on sandstorm's strings (#284)
|
2023-01-15 00:40:48 -03:00 |
|
|
BongaTheProto
|
557fbe7803
|
back home
this works apparently...?
|
2022-04-18 21:19:35 -05:00 |
|
|
BongaTheProtoandGitHub
|
fca6400273
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-02-04 11:56:50 -05:00 |
|
|
SandPootandGitHub
|
805ff012fc
|
Fix drinks (#225)
|
2022-02-04 11:20:21 -03:00 |
|
|
BongaTheProto
|
f6dbf66e73
|
Revert "Revert "Merge pull request #132 from SPLURT-Station/milkjming""
This reverts commit a87acfb92f.
|
2022-01-17 12:08:15 -05:00 |
|
|
BongaTheProto
|
a87acfb92f
|
Revert "Merge pull request #132 from SPLURT-Station/milkjming"
This reverts commit 00e0fd04c3, reversing
changes made to 8e70b187e5.
|
2022-01-16 23:27:26 -05:00 |
|
|
BongaTheProto
|
4eb967d3ea
|
mmmm milk
- Added milking machines
- Added pleasuremaws
- Added a lot of deleted dogborg content
|
2022-01-14 12:02:57 -05:00 |
|
|
BongaTheProtoandGitHub
|
5cccf484b7
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-01-11 20:24:10 -05:00 |
|
|
SandPoot
|
511be2f745
|
no EZ mode
|
2022-01-11 18:14:15 -03:00 |
|
|
BongaTheProto
|
0de6f8b2e7
|
Merge remote-tracking branch 'upstream/master'
|
2022-01-08 12:56:44 -05:00 |
|
|
SandPoot
|
2c2b60e4d7
|
ghost proof
|
2022-01-08 13:30:23 -03:00 |
|
|
BongaTheProto
|
f3aec6cb79
|
Merge remote-tracking branch 'upstream/master'
|
2021-12-11 15:20:50 -05:00 |
|
|
SandPootandGitHub
|
7b34851794
|
Adds functionality to dressers once again (#209)
|
2021-12-11 16:52:48 -03:00 |
|
|
BongaTheProtoandGitHub
|
d99c468053
|
Merge branch 'Sandstorm-Station:master' into master
|
2021-12-11 12:49:56 -05:00 |
|
|
SandPootandGitHub
|
67719f786d
|
Sanity is now visible around your mood (#208)
|
2021-12-11 14:46:47 -03:00 |
|
|
BongaTheProto
|
dc015e6c02
|
Update recipes_misc.dm
these recipes are broken
|
2021-12-10 19:51:52 -05:00 |
|
|
BongaTheProto
|
5d55affd90
|
Lots of fucking shit
- vibrators
- slutcurity stuff
- condoms
|
2021-12-10 11:39:53 -05:00 |
|
|
SandPoot
|
dd09f0b785
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-07-19 02:57:23 -03:00 |
|