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
36,430 Commits 55 Branches 0 Tags
ed6780159053450cbc1b51c82cf1ba8f8bc51da4
Commit Graph

746 Commits

Author SHA1 Message Date
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N
e40470f553 h. Updates NTOS, and axes p2p filetransfer! 2020-07-30 20:54:13 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N
10fefca674 another batch. MAJOR: chem_master, pandemic 2020-07-30 14:06:20 +08:00
Letter N
0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08:00
silicons
90d3cff53f Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 11:53:59 -07:00
silicons
e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
silicons
9ff94e019b Merge pull request #12924 from SiliconMain/analyzer 
Ports long range atmos analyzer from skyrat
 2020-07-29 01:09:48 -07:00
Lin
bbffd41d55 Merge pull request #12883 from Citadel-Station-13/silicons-patch-49 
beam rifles are now practical in emitters
 2020-07-28 22:05:39 -05:00
SiliconMain
abdafe15fa fuck 2020-07-26 15:21:24 -05:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
aabe3c3b32 Update emitter.dm 2020-07-23 18:52:39 -07:00
silicons
286e5384d1 fix 2020-07-21 12:07:24 -07:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
silicons
5c189b310e ok, snaxi 2020-07-20 15:43:48 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
984796b8c6 sigh 2020-07-20 10:46:52 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
Heretical Lizard
7e836837f9 Merge pull request #4 from DeltaFire15/COGGERS 
Stablegateway stuff from Deltafire but I put it in my own repo
 2020-07-20 03:04:44 -04:00
silicons
55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
DeltaFire
8f1e191500 stealthy cogging 
APC locks after cogging, drain gets averted by prioritized powerallocation
 2020-07-14 00:39:21 +02:00
Artur
732a1ca438 Fixes linter and conflict shit 2020-07-13 16:35:12 +03:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Artur
0867f92c4a Fixes APC Interface locks 2020-07-10 19:52:49 +03:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Artur
6c4e733a38 More testmerge fixes 2020-07-03 15:16:02 +03:00
Artur
0d9609af29 Fixes SMES 2020-07-03 13:36:18 +03:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Artur
765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
silicons
39b58f0057 Merge pull request #12581 from Detective-Google/shunties 
prevents shunted AIs from doomsdaying (tg#51284)
 2020-06-24 08:44:48 -07:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Detective Google
099f594a30 SMESes should now work with self-charging cells (tg#51240) 2020-06-22 15:56:51 -05:00
Detective Google
715b1f85da prevents shunted AIs from doomsdaying (tg#51284) 2020-06-22 15:53:55 -05:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Lin
bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework 
"Unofficial" Combat Rework Part 3: Blocking/Parrying
 2020-06-12 16:39:11 -05:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00