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-22 07:43:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

1420 Commits

Author SHA1 Message Date
radar651
865236a582 Merge branch 'master' into cargonia 2022-03-26 15:18:21 -05:00
radar651
86cf557afd Update ammo_boxes.dm 2022-03-26 06:16:32 -05:00
radar651
09b1a04b14 Merge branch 'master' into cargonia 2022-03-26 05:22:19 -05:00
radar651
f816373439 Ready for merg 
At least I hope so
 2022-03-26 05:21:06 -05:00
LeonDuvall
a8524b6bf6 Merge branch 'SPLURT-Station:master' into master 2022-03-25 16:50:22 -07:00
BongaTheProto
b9b89fa6e4 new combat indicator 
been waiting for almost a month to be added in upstream
 2022-03-25 01:04:18 -05:00
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
LeonDuvall
e19f97b692 Merge branch 'SPLURT-Station:master' into master 2022-03-23 21:37:12 -07:00
BongaTheProto
59ae8d5c5a literally 
literally
 2022-03-23 13:48:44 -05:00
BongaTheProto
83b7aaecd0 Merge branch 'master' into anti-retard 2022-03-23 08:22:31 -05:00
LeonDuvall
83649ebe7b Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 2022-03-23 05:55:51 -07:00
BongaTheProto
5c6ee5c134 Update misc.dm 2022-03-23 07:31:00 -05:00
LeonDuvall
da21005a9a Merge branch 'SPLURT-Station:master' into master 2022-03-21 21:57:26 -07: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
e393c8b6f0 Revert "LOG_VICTIM fix removed" 
This reverts commit b375fd14f3.
 2022-03-21 20:43:14 -05:00
BongaTheProto
9509643abf Update accountlink.dm 
this is probably better
 2022-03-21 15:00:11 -05:00
BongaTheProto
309faab563 Update accountlink.dm 
should've done this way before
 2022-03-21 14:33:35 -05:00
LeonDuvall
fec21c8877 Merge branch 'SPLURT-Station:master' into master 2022-03-20 00:15:17 -07: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
LeonDuvall
b8067bb9d8 Merge branch 'SPLURT-Station:master' into master 2022-03-19 17:22:11 -07: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
LeonDuvall
443e5ac54c Merge branch 'SPLURT-Station:master' into master 2022-03-17 05:58:48 -07: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
LeonDuvall
c3552d8a2d clean area maps, again 2022-03-15 15:00:13 -07:00
LeonDuvall
811b97ccd5 Cleaned area atoms 2022-03-15 14:55:03 -07: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