ariaworld
56f9956fbc
Remove: Accidental code clone.
2023-11-18 17:36:37 +01:00
ariaworld
1f463a734c
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
2023-11-17 23:26:33 +01:00
ariaworld
e98019e91e
Push, push, push.
2023-11-17 21:34:27 +01:00
BongaTheProto
37bbecefb4
Merge remote-tracking branch 'upstream/master'
2023-11-05 18:01:32 -05:00
SandPoot
fd124b03e4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-11-03 21:27:30 -03:00
BlueWildrose and GitHub
720374a7ef
Merge pull request #16022 from SandPoot/fix-loadout-runtime-not-spawning-items
...
Fix loadout runtime (which prevents remaining items from spawning)
2023-10-31 14:47:20 -06:00
ariaworld
1594bd360e
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
2023-10-31 14:03:41 +01:00
ariaworld
23f141965e
First draft.
2023-10-31 14:03:34 +01:00
SandPoot
0b6d743e22
go
2023-10-28 17:51:02 -03:00
BongaTheProto
604b8ea867
Merge remote-tracking branch 'upstream/master' into hate-upstream
2023-10-20 22:29:47 -05:00
SandPoot
3aa3aead3d
re-do the whole goddamn thing.
2023-10-20 17:48:13 -03:00
Марк
73e33a788e
Choosable Laws.
2023-10-20 16:43:14 +05:00
BongaTheProto
3230992305
Merge remote-tracking branch 'upstream/master'
2023-10-12 13:28:32 -05:00
SandPoot
45d5d92775
oops
2023-10-12 14:28:57 -03:00
SandPoot
ee163aae68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-10-12 02:40:12 -03:00
BlueWildrose and GitHub
9f29f08cd0
Merge pull request #16013 from SandPoot/change-preferences
...
Preferences menu layout change
2023-10-11 13:51:37 -06:00
SandPoot
d4ea14c4ef
push
2023-10-09 16:15:49 -03:00
BongaTheProto and GitHub
4742a61480
Merge branch 'Sandstorm-Station:master' into master
2023-10-08 02:36:51 -05:00
BongaTheProto
0770dfc412
followup
2023-10-08 02:33:47 -05:00
BongaTheProto
7b5ecc7b49
Merge remote-tracking branch 'upstream/master'
2023-10-07 23:28:42 -05:00
SandPoot
b945e7a5ed
push
2023-10-07 20:48:02 -03:00
SandPoot and Марк
bcbecabf74
push
...
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com >
2023-10-06 01:11:28 -03:00
SandPoot
910263d2d9
Merge branch 'update-config' of https://github.com/SandPoot/Citadel-Station-13
2023-10-05 22:01:18 -03:00
SandPoot and Марк
a105852042
the stuff
...
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com >
2023-10-05 21:15:11 -03:00
BongaTheProto
c920c81e67
oop
...
eepy
2023-10-03 02:08:04 -05:00
BongaTheProto
e5d3783aa9
fixes and modularizes
...
it works woohooo
2023-10-03 02:04:17 -05:00
57a40ac3d9
Порт Scaled Appearance с Vore Station ( #140 )
...
* monophobia blind fix (#63 )
* Первый камень
* Тут явно достаточно лишнего, особенно в префах, что можно было бы удалить
---------
Co-authored-by: FelixRuin <31424899+FelixRuin@users.noreply.github.com >
2023-10-03 01:09:53 -05:00
BongaTheProto
83918aa030
Merge remote-tracking branch 'upstream/master'
2023-09-28 14:08:02 -05:00
SandPoot
e317be4989
oh boy i can't wait to find out people managing to exploit this
2023-09-27 17:11:10 -03:00
BongaTheProto and GitHub
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
Mateusz Dargiel
e5a1325095
fixed indents, added cum_onto pref to all the uis
2023-09-02 13:48:26 +02:00
Zattarra
6c59b03ce0
Changes the rest of the code to not use the extra var 'stomptext'
2023-07-31 11:06:20 -07:00
831bf2de66
Remove stomptext var; Replaces with better code.
...
Thank you Mos.
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com >
2023-07-31 11:02:26 -07:00
Zattarra
6ccaecc44a
Merge branch 'STOMPSHIELDING' of https://github.com/Zattarra/DATASTREAM into STOMPSHIELDING
2023-07-29 18:39:15 -07:00
Zattarra
c186b9daae
Switches the pref to be a boolean, switches the checks to be booleans, adds stomptext to even display the thing, and also hopefully saves the pref.
2023-07-29 18:39:00 -07:00
Zatarra and GitHub
9f9c8e8521
Merge branch 'SPLURT-Station:master' into STOMPSHIELDING
2023-07-28 20:28:51 -07:00
BongaTheProto
650642d379
Merge remote-tracking branch 'upstream/master'
2023-07-20 00:23:25 -05:00
SandPoot
1ec6b97ea3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-19 18:01:35 -03:00
SandPoot
217e23fc7f
push
2023-07-18 15:22:24 -03:00
Zattarra
8475e0cfec
Merge branch 'STOMPSHIELDING' of https://github.com/Zattarra/DATASTREAM into STOMPSHIELDING
...
UH OH.
2023-07-01 19:51:56 -07:00
WoolyAypa
e1c9bb9775
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system
2023-05-28 13:39:05 -03:00
BongaTheProto
8c42034e40
only 16 pixels??? Bruh?????
...
Reinstates the original pixelshift range and also makes the viewport shifting a config so people don't get vertigo from the sliding sprites
2023-05-19 23:35:56 -05: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
BongaTheProto and GitHub
994f14c5d5
Merge pull request #520 from Pin-alternative/rework
...
Reworks to genitals
2023-04-23 14:47:32 -05:00
BongaTheProto
525741658b
shaft beast? Like hype beast but with cocks?
2023-04-23 13:55:45 -05: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
4ff94bb142
add min size
2023-03-05 20:02:51 +11: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
Pin-alternative
d1b3acbc5c
Merge remote-tracking branch 'upstream/master' into rework
2023-03-05 19:16:26 +11:00
BongaTheProto
acf6b87535
Merge remote-tracking branch 'upstream/master'
2023-02-24 01:39:26 -05:00
ariaworld