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-01-10 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,448 Commits 55 Branches 0 Tags
dbcc95ea28d08bd4ba05f1ae87c60bad2acdf79c
Commit Graph

9274 Commits

Author SHA1 Message Date
silicons
a42fa987ba ok 2020-12-26 22:43:25 -08:00
silicons
5266ae1437 okay 2020-12-26 22:28:41 -08:00
silicons
a6ae0fe5c2 ok 2020-12-26 20:56:48 -08:00
silicons
bfb3d087c3 ok 2020-12-26 20:50:28 -08:00
silicons
d3414a4d23 ok 2020-12-26 20:47:50 -08:00
silicons
dafc6bf89f fix 2020-12-26 20:41:21 -08:00
silicons
3228435237 errors 2020-12-26 20:33:16 -08:00
silicons
6044086de0 changes 2020-12-26 20:29:52 -08:00
silicons
b7cd14b41e poggy? 2020-12-26 20:09:24 -08:00
Lin
b0b483105a Merge pull request #13857 from silicons/contractor_fix_for_real 
fixes contractor pods this time for real (and 25% tested instead of 0%)
 2020-12-26 23:52:51 +00:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
silicons
9f130e0c5a blood 2020-12-26 14:09:10 -08:00
silicons
5c0b4f824f hoh boy 2020-12-26 12:42:03 -08:00
silicons
45af2360ad changes 2020-12-26 11:35:47 -08:00
raspy-on-osu
0e652cb64c init 2020-12-26 06:02:09 -05:00
Letter N
1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
silicons
5cf717e75d self message 2020-12-25 16:10:32 -08:00
silicons
5e66e4509f wew 2020-12-25 16:07:17 -08:00
silicons
6c7b2386d8 Merge pull request #13850 from DeltaFire15/welder-autorefuel-fix 
Fixes self-refueling welders
 2020-12-25 10:28:59 -07:00
DeltaFire
146135f059 Merge pull request #13836 from silicons/statpanel 
refactors statpanel a bit to send topics to client instead of item which bypasses problematic /Topic overrides entirely
 2020-12-24 18:29:33 +01:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
silicons
bff30f587b sigh 2020-12-23 09:16:16 -07:00
zeroisthebiggay
3f36b95f92 a 
a
 2020-12-23 09:42:10 -05:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFire
7da2f871d0 corrects comment 2020-12-23 03:02:42 +01:00
DeltaFire
8a5cdddb67 actually increases brass welder refueling speed 2020-12-23 02:57:01 +01:00
Chiirno
35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
DeltaFire
4d4d0e9ec3 a fix fix 2020-12-23 02:50:15 +01:00
silicons
2faf0d3fd1 ok 2020-12-22 13:42:03 -07:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2 
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
 2020-12-22 17:40:33 +01:00
silicons
c58a32b9c5 Merge pull request #13820 from DeltaFire15/temp-reebe-removal 
[TESTMERGE ONLY] Temporarily disables Reebe
 2020-12-22 09:35:47 -07:00
DeltaFire
7a9e3fcb40 Merge pull request #13825 from raspy-on-osu/screw-windoors 
Windoors stay open longer
 2020-12-22 16:16:08 +01:00
DeltaFire
bdbe1bc404 Merge pull request #13829 from silicons/keyloop 
Bandaid fix for input controller lockup due to sleeping
 2020-12-22 06:00:29 +01:00
silicons
000e525157 ok 2020-12-21 21:11:54 -07:00
zerothebigboy
dcecd6f03a pogbox 2020-12-21 18:28:52 -05:00
zerothebigboy
cca8dc3a36 pogbox 2020-12-21 18:25:33 -05:00
silicons
901fcddf44 Merge pull request #13819 from Hatterhat/surv-dag-buf 
survival dagger light fix + butchery buff
 2020-12-21 10:30:13 -07:00
silicons
0e7a597a2b alright 2020-12-21 10:27:28 -07:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
Letter N
98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
raspy-on-osu
d3e224d9c1 init 2020-12-21 04:54:19 -05:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
DeltaFire
8414db5add Merge pull request #13814 from Xantholne/TwinSwordSheath 
Fixes twin sword sheaths icon/item state from being blank sprites
 2020-12-21 02:20:32 +01:00
Xantholne
1c968e6ebe period equals 2020-12-20 16:00:18 -07:00
silicons
db6f9349c5 Merge pull request #13785 from Putnam3145/fix-grab-bag 
Makes grab bag ONLY make station antags; triples alien dynamic threat.
 2020-12-20 15:42:04 -07:00
Lin
36a94c97e0 Merge pull request #13802 from Citadel-Station-13/silicons-patch-29 
bandaid fixes meteors not spawning properly due to off by 1 error with zlevel transition
 2020-12-20 18:27:47 +00:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates 
ports colormates from rp/vorestation
 2020-12-20 18:14:48 +00:00
silicons
11aad4e6db Merge pull request #13801 from SandPoot/master 
Makes limb grower better
 2020-12-20 10:34:21 -07:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges 
Scarp Changes and Bundle
 2020-12-20 09:23:20 -07:00