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-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,161 Commits 55 Branches 0 Tags
5dff3e9a044ed396a7c75ed1c8313206ab14126c
Commit Graph

37161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Letter N
5dff3e9a04 deletes ping 2020-08-18 11:35:10 +08:00
Letter N
83df9159de GOONCHAT IS DEAD! LONG LIVE THE KING! 2020-08-18 10:51:13 +08:00
Letter N
90cb13f6af Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-18 10:33:21 +08:00
Changelogs
20648fc1bb Automatic changelog compile [ci skip] 2020-08-18 00:12:17 +00:00
CitadelStationBot
0d3e95803c Automatic changelog generation for PR #13195 [ci skip] 2020-08-17 18:24:23 -05:00
silicons
7d5d2b969e Merge pull request #13195 from Detective-Google/hotfix 
makes glass floors actually deconstructable
 2020-08-17 16:24:19 -07:00
Detective Google
b13048f636 makes glass floors actually deconstructable 2020-08-17 12:15:09 -05:00
CitadelStationBot
f1b0e72676 Automatic changelog generation for PR #13108 [ci skip] 2020-08-17 10:58:04 -05:00
silicons
d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum 
.357 DumDum Rounds (they're adminspawn only don't worry)
 2020-08-17 08:58:00 -07:00
Letter N
55bd3ecc26 actual tgui code 2020-08-17 21:07:09 +08:00
Letter N
610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
CitadelStationBot
c1a2d907f1 Automatic changelog generation for PR #13190 [ci skip] 2020-08-17 05:15:50 -05:00
silicons
d16a1ae301 Merge pull request #13190 from Detective-Google/art 
adds art to ghost cafe
 2020-08-17 03:15:47 -07:00
silicons
56d49aac2e Merge pull request #13186 from Detective-Google/telebort 
a few snaxi improvements; chiefly labelling the telepads better.
 2020-08-17 03:15:37 -07:00
CitadelStationBot
1889092914 Automatic changelog generation for PR #13185 [ci skip] 2020-08-17 05:15:20 -05:00
silicons
3d69f65c6b Merge pull request #13185 from Hatterhat/large-demons 
slaughter demons to MOB_SIZE_LARGE
 2020-08-17 03:15:16 -07:00
CitadelStationBot
5c8378a6f0 Automatic changelog generation for PR #13180 [ci skip] 2020-08-17 05:14:19 -05:00
silicons
f611945b34 Merge pull request #13180 from Detective-Google/glass-floors 
ports multiz glass floors (tgstation/tgstation#50831)
 2020-08-17 03:14:15 -07:00
CitadelStationBot
7a24842c0a Automatic changelog generation for PR #13179 [ci skip] 2020-08-17 05:13:51 -05:00
silicons
7d2d4d870c Merge pull request #13179 from Detective-Google/if-chain-begoen 
kills an ugly if-chain in inventory code (probably)
 2020-08-17 03:13:48 -07:00
Putnam3145
23b4ba3714 Merge pull request #13063 from silicons/supermatter 
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
 2020-08-17 03:13:14 -07:00
Detective Google
eed7e4ad02 also painting frames 2020-08-17 00:39:25 -05:00
Detective Google
ee7c528185 adds art to ghost cafe 2020-08-17 00:36:09 -05:00
Lin
d285e9f005 Merge pull request #13187 from Citadel-Station-13/revert-13110-cum 
[TESTMERGE ONLY] FUCK
 2020-08-16 21:16:42 -05:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
Detective Google
3ac272c9be a few other little cleanups while I'm opening a PR 2020-08-16 21:03:11 -05:00
Detective Google
83332453b6 clarifies a bit more where each pad goes on snaxi. 2020-08-16 21:01:09 -05:00
CitadelStationBot
3b2d93dcce Automatic changelog generation for PR #13110 [ci skip] 2020-08-16 20:56:17 -05:00
CitadelStationBot
c210667237 Automatic changelog generation for PR #13122 [ci skip] 2020-08-16 20:56:16 -05:00
CitadelStationBot
56d15c7829 Automatic changelog generation for PR #13124 [ci skip] 2020-08-16 20:56:14 -05:00
CitadelStationBot
604fdff241 Automatic changelog generation for PR #13135 [ci skip] 2020-08-16 20:56:13 -05:00
CitadelStationBot
e86a51e302 Automatic changelog generation for PR #13141 [ci skip] 2020-08-16 20:56:12 -05:00
CitadelStationBot
514241e1fa Automatic changelog generation for PR #13144 [ci skip] 2020-08-16 20:56:11 -05:00
CitadelStationBot
6be76bdefd Automatic changelog generation for PR #13148 [ci skip] 2020-08-16 20:56:10 -05:00
CitadelStationBot
2b919f3888 Automatic changelog generation for PR #13159 [ci skip] 2020-08-16 20:56:07 -05:00
CitadelStationBot
17cb79cea4 Automatic changelog generation for PR #13164 [ci skip] 2020-08-16 20:56:06 -05:00
CitadelStationBot
b7530eff6d Automatic changelog generation for PR #13167 [ci skip] 2020-08-16 20:56:05 -05:00
CitadelStationBot
5be2587b1e Automatic changelog generation for PR #13168 [ci skip] 2020-08-16 20:56:04 -05:00
CitadelStationBot
054c7fe5c5 Automatic changelog generation for PR #13169 [ci skip] 2020-08-16 20:56:03 -05:00
CitadelStationBot
1194341659 Automatic changelog generation for PR #13176 [ci skip] 2020-08-16 20:56:01 -05:00
silicons
f3da72137d Merge branch 'master' of github.com-kevinz000:Citadel-Station-13/CitadelStation13 2020-08-16 18:55:36 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
ac7bdb5db5 Merge branch '13175' 2020-08-16 18:53:00 -07:00
silicons
1f0f5d621a Merge branch '13176' 2020-08-16 18:52:48 -07:00
silicons
83b41b1a0f Merge branch '13174' 2020-08-16 18:52:33 -07:00
silicons
2095e2705f Merge branch '13169' 2020-08-16 18:52:13 -07:00
silicons
690f610f62 Merge branch '13168' 2020-08-16 18:52:04 -07:00
silicons
384e5ae311 Merge branch '13167' 2020-08-16 18:51:48 -07:00
silicons
83e72b4f96 Merge branch '13164' 2020-08-16 18:51:36 -07:00
silicons
a900c07846 Merge branch '13163' 2020-08-16 18:51:24 -07:00