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-14 11:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,847 Commits 55 Branches 0 Tags
caed4b51b9ed1bf80dd1cae3bcdc1c1f7deb8a08
Commit Graph

26074 Commits

Author SHA1 Message Date
timothyteakettle
16b98adb9f no more debug 2020-12-06 23:40:00 +00:00
timothyteakettle
a84f1648f4 Update preferences_savefile.dm 2020-12-06 22:57:57 +00:00
Timothy Teakettle
e413fcb091 more fixes 2020-12-06 22:14:35 +00:00
Lin
d2949c64db Merge pull request #13728 from Citadel-Station-13/silicons-patch-12 
adds 8 save slots
 2020-12-06 22:10:48 +00:00
Timothy Teakettle
53a434cfb1 suggested change 2020-12-06 20:07:50 +00:00
qwerty
74c30dc3c1 better time length 2020-12-06 13:13:53 -06:00
qwerty
851f9afa20 bugfixes 2020-12-06 13:08:18 -06:00
qwerty
29141ba97d flash on climax 2020-12-06 12:36:30 -06:00
timothyteakettle
61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
timothyteakettle
0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
timothyteakettle
5566c00a69 fixes 2020-12-06 17:24:12 +00:00
DeltaFire
dd4f60a24b *snap 2020-12-06 17:37:46 +01:00
timothyteakettle
a478da678e bugfixes 2020-12-06 15:50:33 +00:00
Lin
3b6553899b Merge pull request #13711 from DeltaFire15/medbot-synthetic-ignore 
Medibots now only treat those they can actually treat
 2020-12-06 06:36:28 +00:00
Lin
cbcf60ff76 Merge pull request #13733 from DeltaFire15/tail-entwine-fix 
Tailcoilies fix
 2020-12-06 06:12:57 +00:00
DeltaFire
663fff03c6 Merge pull request #13720 from timothyteakettle/podpeople-green-blood 
podpeople have green blood but done correctly
 2020-12-06 03:43:19 +01:00
keronshb
7b3a5198dc Fixes blob reflection 2020-12-05 20:18:07 -05:00
timothyteakettle
cbbcc0c386 fix the migration 2020-12-06 00:16:56 +00:00
timothyteakettle
fa26f4c402 b 2020-12-06 00:02:14 +00:00
Timothy Teakettle
afdbac31fa test 2020-12-05 22:35:27 +00:00
DeltaFire
0c4e9ca1c5 better phrasing 2020-12-05 02:56:03 +01:00
DeltaFire
f0c1890a65 fix 2020-12-05 02:48:33 +01:00
Lin
c2954d1d6f Merge pull request #13727 from Citadel-Station-13/silicons-patch-11 
no more typing indicators while dead
 2020-12-04 22:52:04 +00:00
silicons
7b0cb7c5a4 FIXED 2020-12-03 22:07:41 -07:00
silicons
750f81920b Merge pull request #13717 from TheObserver-sys/shuttlefix 
Mining and Monastery Shuttle Fixes
 2020-12-03 16:34:00 -07:00
silicons
8d398b3e24 Merge pull request #13719 from shellspeed1/Adds-construction-bags-from-tg 
Ports construction bags and makes it easier to get material bags. (READY)
 2020-12-03 16:33:47 -07:00
Lin
a6eeb5d418 Merge pull request #13692 from Citadel-Station-13/silicons-patch-7 
fixes windoor spraycanning
 2020-12-03 20:34:16 +00:00
silicons
b721cf3128 Update preferences.dm 2020-12-03 05:41:56 -07:00
silicons
31cf8842e4 Update death.dm 2020-12-02 23:45:18 -07:00
silicons
d43086572d Update carbon.dm 2020-12-02 23:44:35 -07:00
silicons
c891a456e8 Update typing_indicator.dm 2020-12-02 23:43:00 -07:00
silicons
8d7f3aebc4 sigh 2020-12-02 09:20:23 -07:00
Putnam
809e270290 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into make-emotes-local 2020-12-02 08:16:22 -08:00
MrJWhit
19420a6274 moar crimmas 2020-12-01 04:08:39 -05:00
Timothy Teakettle
d0ebd6c2d8 green blood 2020-11-30 19:22:54 +00:00
shellspeed1
3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
DeltaFire
da3c28675a Merge pull request #13714 from Citadel-Station-13/silicons-patch-10 
fixes admin rank copy not transferring over exclude/can_edit_rights
 2020-11-29 18:18:45 +01:00
DeltaFire
6bdb54117b Merge pull request #13687 from Citadel-Station-13/silicons-patch-6 
https://github.com/tgstation/tgstation/pull/54991 - tail intertwining
 2020-11-29 18:13:12 +01:00
silicons
6bd13c9054 Merge pull request #13695 from shellspeed1/Better-Ling-change 
Better version of ling change
 2020-11-28 09:13:12 -07:00
silicons
0f9734b1f7 Merge pull request #13698 from timothyteakettle/communication-hotkeys 
ports rebindable communication hotkeys from tg
 2020-11-28 09:12:40 -07:00
The0bserver
4559a153c3 Map Tweak 2020-11-27 16:51:55 -05:00
DeltaFire15
a1d38033a4 Merge pull request #13576 from Sonic121x/patch-2 
Add a bunch of digitigrade uniform
 2020-11-27 22:31:10 +01:00
silicons
47c74c3fac sigh 2020-11-27 06:42:55 -07:00
silicons
ead209f507 sigh 2020-11-27 06:31:05 -07:00
silicons
ae756749cc woops 2020-11-27 05:15:40 -07:00
silicons
a6d73e0344 fix 2020-11-27 04:25:22 -07:00
silicons
0d6986d3a2 Update jellypeople.dm 2020-11-27 02:25:41 -07:00
The0bserver
884fbd0a52 found you. 2020-11-27 03:45:08 -05:00
silicons
564766d11d sigh 2020-11-27 00:16:53 -07:00
silicons
134fd0f858 k 2020-11-26 23:42:39 -07:00