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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,603 Commits 55 Branches 0 Tags
76f885e1a6f7c2c3b65b83404456ed03de47bada
Commit Graph

23376 Commits

Author SHA1 Message Date
Arturlang
92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
Artur
af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N
7eab0263ba https://github.com/tgstation/tgstation/pull/51213 2020-07-16 20:51:25 +08:00
Letter N
819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Letter N
abd0ac089d https://github.com/tgstation/tgstation/pull/51687 2020-07-16 20:36:08 +08:00
Letter N
8083efd1ad https://github.com/tgstation/tgstation/pull/51864 2020-07-16 20:29:56 +08:00
Letter N
9575c52b13 https://github.com/tgstation/tgstation/pull/52059 - the forgotten part 2020-07-16 20:21:39 +08:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
nik707
fa8a6dd3e1 Merge pull request #12788 from silicons/gasmixture_vv 
"""user-friendly""" vv handling for new c++ atmos gas mixtures
 2020-07-16 01:19:20 -05:00
timothyteakettle
8bfc30c8ac i can't spell 2020-07-16 02:54:31 +01:00
timothyteakettle
03bd806c73 pickle 2020-07-16 02:51:07 +01:00
silicons
7f9571f239 ok 2020-07-15 17:17:09 -07:00
silicons
b279c82bb2 whew 2020-07-15 17:10:08 -07:00
silicons
dba5855929 epic 2020-07-15 17:01:22 -07:00
silicons
96fb3cad8f ok 2020-07-15 17:00:17 -07:00
silicons
6fbd7914f5 stuff 2020-07-15 16:58:44 -07:00
Timothy Teakettle
a7e2668eff funniest 2020-07-15 23:50:39 +01:00
silicons
147a905b5d Merge pull request #12783 from Sneakyrat6/oocNotesExploit 
Fixes seeing real name in OOC Notes
 2020-07-15 14:48:55 -07:00
silicons
8f478ce66a quirky uh oh 2020-07-15 14:47:59 -07:00
Timothy Teakettle
0184739005 undo the woopsy 2020-07-15 19:53:37 +01:00
Sneakyrat6
538e7c62cd Fixes seeing real name in OOC Notes 2020-07-15 13:32:56 -05:00
silicons
6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders 
the travelling trader midround event
 2020-07-15 08:50:20 -07:00
BlackMajor
06a4e57de9 changing this just means they can pick up jetpacks 2020-07-16 02:11:38 +12:00
BlackMajor
bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
b1tt3r1n0
d678806143 Circle Game, Updated 
Title
 2020-07-14 23:40:09 -04:00
Timothy Teakettle
6be10d041c add to clothesmate 2020-07-14 21:10:37 +01:00
Timothy Teakettle
0a4a0fadb3 snails 2020-07-14 20:59:25 +01:00
Timothy Teakettle
55af5f8ea2 give me my snails 2020-07-14 20:26:31 +01:00
Lin
b6d8167c1e Merge pull request #12760 from Sonic121x/patch-2 
Fix Paramedic Jumpsuit
 2020-07-14 14:22:17 -05:00
Timothy Teakettle
11148b0a26 optimisaiton 2020-07-14 18:51:46 +01:00
Timothy Teakettle
1f8e47c0f5 actually works 2020-07-14 18:40:20 +01:00
Artur
57e0cafb15 Fixes clockwork sleepers 2020-07-14 20:01:04 +03:00
Timothy Teakettle
dd1cce50e8 better solution 2020-07-14 17:23:18 +01:00
Timothy Teakettle
657810bb13 please fix it 2020-07-14 17:08:57 +01:00
Artur
8af78d1189 Merge remote-tracking branch 'origin/TGUI-3.0' into TGUI-3.0 2020-07-14 18:10:29 +03:00
Artur
f5ee74803f Updates minter to tg and the prereqs 2020-07-14 18:08:12 +03:00
Timothy Teakettle
98f63772b3 fix wrestling rotation 2020-07-14 14:35:13 +01:00
Arturlang
75eb276c98 Merge branch 'master' into TGUI-3.0 2020-07-14 16:17:23 +03:00
Artur
d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03:00
Artur
c964cadd85 Makes amber alert work 2020-07-14 16:15:32 +03:00
silicons
c333a71c74 Update life.dm 2020-07-14 04:30:38 -07:00
zerothebigboy
5b3050f692 b 2020-07-13 17:01:41 -04:00
zerothebigboy
4c0248835f b 2020-07-13 17:01:23 -04:00
Timothy Teakettle
8de062adbb fix 2020-07-13 19:46:51 +01:00
zerothebigboy
85f8491003 b 2020-07-13 14:45:18 -04:00
zerothebigboy
3ccd994080 a 2020-07-13 13:52:56 -04:00
Lin
004c00325f Merge pull request #12747 from Citadel-Station-13/silicons-patch-24 
refactors circuit screens a bit, no more messages coming out of the floor
 2020-07-13 12:22:58 -05:00
Lin
2be790e8d7 Merge pull request #12736 from Citadel-Station-13/silicons-patch-21 
hey let's not have 25% micro borgs going around killing people
 2020-07-13 11:51:10 -05:00
Lin
55c4e40fbb Merge pull request #12706 from silicons/records 
adds security/medical records to character setup
 2020-07-13 11:50:02 -05:00
Lin
e143b69aa6 Merge pull request #12741 from Hatterhat/vog-but-with-less-line-changes 
removing vog's ability to commit sin, probably
 2020-07-13 11:31:25 -05:00