cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-30 08:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
22590 Commits
Author SHA1 Message Date
SandPoot b624de1c10 you go 2023-10-08 13:01:15 -03:00
SandPoot c5ba21994d If i had a nickel for every time incapacitated() had some issue, i would have... 2023-10-08 12:49:40 -03:00
BongaTheProtoandGitHub 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
SandPootandМарк 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 6cd2cfcd01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-config 2023-10-05 21:25:29 -03:00
SandPootandМарк a105852042 the stuff 
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
 2023-10-05 21:15:11 -03:00
SandPootandGitHub c3735c05ac Merge branch 'master' into throwing-updat 2023-10-04 15:15:15 -03:00
SandPoot 5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
nickstershovel caab49d5b3 Body Morpher: Skin Tone edit (LAST COMMIT) 2023-10-03 14:32:14 +02:00
BongaTheProto c920c81e67 oop 
eepy
 2023-10-03 02:08:04 -05:00
BongaTheProto f0c5148b0f Update preferences_savefile.dm 2023-10-03 02:04:22 -05:00
BongaTheProto e5d3783aa9 fixes and modularizes 
it works woohooo
 2023-10-03 02:04:17 -05:00
Kush1Push1BongaTheProtoFelixRuin
 		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
BongaTheProtoandGitHub 872b687de2 Merge branch 'Sandstorm-Station:master' into master 2023-10-02 21:01:43 -05:00
SandPoot 5945726d63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-02 15:21:26 -03:00
SandPoot a034a96fc2 part 2 2023-10-02 13:54:40 -03: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
nickstershovel 33d50fddf7 Body morpher expansion. 2023-09-26 21:21:48 +02: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
BongaTheProtoandGitHub a59e9f45da Merge pull request #870 from Zattarra/STOMPSHIELDING 
Adds stepping interaction preference toggle.
 2023-09-23 17:39:22 -05:00
BongaTheProtoandGitHub 7c6737ab22 Merge pull request #956 from LeChatGuid2/Bayonet 
Add diagonal bayonet and adds it to hunting rifle
 2023-09-23 17:17:38 -05:00
BongaTheProtoandGitHub 7d7ce3dc1c Merge pull request #928 from SpaceCheetah/master 
Hydroponics plumbing
 2023-09-23 17:11:54 -05:00
BongaTheProto 64b8394482 Merge remote-tracking branch 'upstream/master' 2023-09-23 17:03:39 -05:00
SandPoot 4a99937139 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-19 16:33:14 -03:00
SandPoot 39aab0dc82 go 2023-09-19 15:16:37 -03:00
BongaTheProto cf3f27f3a0 Merge branch 'master' into pr/870 2023-09-16 15:25:40 -05:00
BongaTheProto 085bb06e94 Merge remote-tracking branch 'upstream/master' 2023-09-16 14:32:38 -05:00
SandPoot 0b04af4b76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-14 22:32:47 -03:00
siliconsandGitHub 98c0f38de3 Merge pull request #15999 from SandPoot/do_after 
Implements timed_action_flags for do_after-like procs
 2023-09-14 17:59:55 -07:00
LagardereMathis 0c4fbe0914 Add diagonal bayonet and adds it to hunting rifle 2023-09-13 22:06:44 +02:00
BongaTheProtoandGitHub 27df3d0753 Merge pull request #840 from Comicao1/Races-port 
Teshari [TESTING]
 2023-09-10 23:59:28 -05:00
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
BongaTheProtoandGitHub a04c0dda6f Merge pull request #944 from Vhariik/Dum 
Adds shuttle nav beacons to every space ruins
 2023-09-07 21:41:26 -05:00
Comicao1 cec654a181 Modularizes stuff that needs to me modularized 2023-09-07 22:07:26 +03:00
Comicao1 3cbf9ed3f0 Go on 2023-09-07 04:42:07 +03:00
BongaTheProto fb1dc86226 Merge remote-tracking branch 'upstream/master' 2023-09-03 18:06:53 -05:00
SandPoot f53a7a1f40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-03 17:47:27 -03:00
BongaTheProtoandGitHub 27ae0f03f2 Merge pull request #910 from miguelop1/Detective_access_fix 
Detective_access_fix
 2023-09-03 14:59:48 -05:00
SandPootandGitHub f1d9fb376e Merge pull request #15969 from Phoenix4O4/port-ability-to-change-AI/Robot-laws 
[PORT-YOG] Gives admins the ability to change AI/Robot Laws at wil
 2023-09-03 15:24:48 -03:00
Mateusz Dargiel e5a1325095 fixed indents, added cum_onto pref to all the uis 2023-09-02 13:48:26 +02:00
SpaceCheetah bcd9528417 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 2023-08-27 22:25:10 -07:00
Vhariik d35affb5de Shuttle research is now a roundstart tech 2023-08-27 23:55:11 -03:00
BongaTheProto 0da5902b20 Update breasts.dm 
snowflake code moment
 2023-08-26 16:54:20 -05:00
BongaTheProtoandGitHub 9b8ce2457d Merge pull request #938 from SPLURT-Station/tram-surname-station 
Ports modular ruins
 2023-08-25 00:32:33 -05:00
ZatarraandGitHub ceb685ab7d Merge branch 'SPLURT-Station:master' into STOMPSHIELDING 2023-08-22 16:35:10 -07:00