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 2025-12-24 16:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,331 Commits 55 Branches 0 Tags
57c913a1dbdba57add4f8cc67ff12f94e78ceb7a
Commit Graph

352 Commits

Author SHA1 Message Date
radar651
57c913a1db Merge branch 'master' into cargonia 2022-03-24 10:39:30 -05:00
radar651
d01a0c9d7c HOly shit 
I am doing a lot
 2022-03-24 09:48:55 -05:00
BongaTheProto
59ae8d5c5a literally 
literally
 2022-03-23 13:48:44 -05:00
BongaTheProto
5c6ee5c134 Update misc.dm 2022-03-23 07:31:00 -05:00
BongaTheProto
5a8d4aeef4 guess it wasn't fixed yet 
Honestly quite disappointing to see they didn't even put effort in it
 2022-03-21 20:52:53 -05:00
BongaTheProto
951966aa3c Revert "LOG_VICTIM fix removed" 
This reverts commit b375fd14f3.
 2022-03-21 20:46:36 -05:00
BongaTheProto
0c9960bf60 Revert "CL didn't fucking compile, who would've thought" 
This reverts commit 201f716245.
 2022-03-20 01:36:58 -05:00
BongaTheProto
201f716245 CL didn't fucking compile, who would've thought 
at least give it a timer or wait for the workflow to end ffs
 2022-03-20 01:36:52 -05:00
BongaTheProto
b08642d47b adds corpus gear to cargo 2022-03-20 01:18:41 -05:00
BongaTheProto
b2e38d2f25 Merge branch 'master' into sploinky-2 2022-03-19 15:03:38 -05:00
BongaTheProto
583c5cb407 Merge pull request #216 from Crowbar764/slaver-patch-5 
Slaver Patch 5 (small)
 2022-03-19 15:00:38 -05:00
BongaTheProto
6c5c31424f Merge pull request #214 from Crowbar764/player-panel-tgui 
Player Panel - TGUI
 2022-03-19 14:59:08 -05:00
BongaTheProto
7fd3b4e6f4 Merge branch 'master' into sploinky-2 2022-03-19 12:27:51 -05:00
BongaTheProto
bdcbb08719 Psycho 
https://github.com/quotefox/Hyper-Station-13/pull/1046
https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11180 (mostly used this one to guide myself on adding it, idk why it was removed from the commit in first place)
 2022-03-19 12:27:04 -05:00
BongaTheProto
0cf2380431 Even more 
https://github.com/quotefox/Hyper-Station-13/pull/1513
https://github.com/quotefox/Hyper-Station-13/pull/1515
https://github.com/quotefox/Hyper-Station-13/pull/1547
https://github.com/quotefox/Hyper-Station-13/pull/1548

still gotta look into:
https://github.com/quotefox/Hyper-Station-13/pull/1511
 2022-03-18 19:11:11 -05:00
BongaTheProto
b375fd14f3 LOG_VICTIM fix removed 
I guess it works fine now
 2022-03-17 23:40:58 -05:00
BongaTheProto
305c7a61a8 Merge pull request #251 from The-Sun-In-Splendour/webedit-moment 
fixes typos ig
 2022-03-17 22:54:48 -05:00
BongaTheProto
5b665af64f how tf did I miss this for so long 
I definitely need more people checking on the code I swear
 2022-03-17 22:53:20 -05:00
The-Sun-In-Splendour
f4082d74d9 Update goodies.dm 2022-03-18 00:15:22 +01:00
BongaTheProto
0ddb66b750 Merge branch 'master' into sploinky-2 2022-03-15 19:38:56 -05:00
BongaTheProto
84e57cee40 Makes the required votes a config 
Not gonna lie, I just like longer round more
 2022-03-15 19:32:36 -05:00
BongaTheProto
2a6189b9e3 Merge branch 'master' into sploinky-2 2022-03-13 02:04:10 -05:00
BongaTheProto
3af3c2d663 A lot 
https://github.com/quotefox/Hyper-Station-13/pull/621
https://github.com/quotefox/Hyper-Station-13/pull/421
https://github.com/quotefox/Hyper-Station-13/pull/1405
https://github.com/quotefox/Hyper-Station-13/pull/698
https://github.com/quotefox/Hyper-Station-13/pull/853
https://github.com/quotefox/Hyper-Station-13/pull/1147
https://github.com/quotefox/Hyper-Station-13/pull/440
https://github.com/quotefox/Hyper-Station-13/pull/457
https://github.com/quotefox/Hyper-Station-13/pull/1174
https://github.com/quotefox/Hyper-Station-13/pull/1221
https://github.com/quotefox/Hyper-Station-13/pull/424
https://github.com/quotefox/Hyper-Station-13/pull/934/files
 2022-03-13 02:00:58 -05:00
PurpleFenn
f487ae8838 Gas miners and circuit boards! 2022-03-11 04:22:00 -05:00
BongaTheProto
fa8d2cf2fc Merge branch 'master' into pr/216 2022-03-10 21:07:28 -05:00
BongaTheProto
f985127d2c Merge branch 'master' into pr/214 2022-03-10 21:06:01 -05:00
BongaTheProto
b61649224c Add Cow stuff to clothesmate 
uwu
 2022-03-08 15:47:47 -05:00
BongaTheProto
90008494b7 Update signs.dm 2022-03-07 18:35:58 -05:00
BongaTheProto
e920750834 signs 
signs
 2022-03-07 18:18:32 -05:00
BongaTheProto
d72f0e59ca Merge pull request #239 from NopemanMcHalt/hehehaha 
hehehahaa
 2022-03-07 16:54:01 -06:00
BongaTheProto
cf52649600 Merge pull request #238 from catrock31/master 
makes drinks for degenerates cleaner
 2022-03-07 16:53:07 -06:00
Anonymous
0a4d37f352 hehehahaa 2022-03-07 22:43:09 +03:00
BongaTheProto
5c4bbd0901 Merge branch 'cowkini' of https://github.com/The-Sun-In-Splendour/S.P.L.U.R.T-Station-13 into pr/237 2022-03-07 14:15:57 -05:00
BongaTheProto
f20c7eda80 Merge branch 'master' into pr/237 2022-03-07 14:15:39 -05:00
Ludox
375235c7cb Revert "TRYING TO FETCH AGAIN WOOHOO" 
This reverts commit b7fd6dbc20.
 2022-03-07 20:12:18 +01:00
Ludox
b7fd6dbc20 TRYING TO FETCH AGAIN WOOHOO 2022-03-07 20:11:25 +01:00
Ludox
abc7f6a2d5 Revert "Fetch ?" 
This reverts commit a7148ba918.
 2022-03-07 20:06:30 +01:00
Ludox
a7148ba918 Fetch ? 2022-03-07 20:05:58 +01:00
catrock31
d606bcbea4 Update drink_recipes.dm 2022-03-07 14:01:34 -05:00
Ludox
bd8d44d8dc makes the binder bra & strapless binder bra available in loadout 2022-03-07 19:16:08 +01:00
Ludox
8eb6a10b38 Available in loadout now 2022-03-07 19:04:05 +01:00
BongaTheProto
571547b64d Merge pull request #231 from NopemanMcHalt/splurt-specific-loadout-access 
Loadout update for new jobs
 2022-03-06 21:51:50 -06:00
BongaTheProto
a7ccea48ac fix 
some of the fixes will go upstream too
 2022-03-06 18:02:11 -05:00
BongaTheProto
eb9c69f45b Merge branch 'master' into pr/237 2022-03-06 16:57:41 -05:00
Ludox
2f9272dc4b FUCK YOU 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2022-03-06 21:29:34 +01:00
Anonymous
22c2460a47 Modularizes chalice of cum 
Cannot test it because auxmos may GO F**K ITSELF
 2022-03-06 22:41:51 +03:00
BongaTheProto
4f65bb3434 No more vomitn*ris 
gayass company. Hail NT
 2022-03-05 23:37:17 -05:00
CloverIsLucky
dcb1b87597 Found a typo error. 
Replaced the Bruhnaris typo to Nanotrasen... As intended.
 2022-03-05 21:38:28 -06:00
BongaTheProto
f9dbd26f47 WHY DOES IT ADD "_3" 
WHY CAN'T THE ICON_STATE JUST WORK NORMALLY FFS????????????????????????????????????????????
 2022-03-05 19:00:08 -05:00
Anonymous
784b8fe59b Merge branch 'master' into splurt-specific-loadout-access 2022-03-05 21:21:47 +03:00