Commit Graph

767 Commits

Author SHA1 Message Date
silicons
40b489006d Merge pull request #13225 from raspy-on-osu/teg-castration
Heavily nerfs the TEG.
2020-08-23 17:52:44 -07:00
DeltaFire
bf799472d1 fixes the APC access check 2020-08-21 19:35:58 +02:00
raspyosu
95cb1faa37 remove redefinition of logistic function
oops! all redefines
2020-08-21 00:30:12 -04:00
raspyosu
2bd63023d1 fix it again
FIXITFIXITFIXITFIXITFIXITFIXITFIXIT

makes teg logistic (thanks to putnam for the function)
2020-08-21 00:19:46 -04:00
raspyosu
c1468923d8 nerf the teg
it had to be done, my child.
2020-08-20 21:32:52 -04: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
silicons
07e2423c22 regarding malf ais, apcs, space, and engineering cyborg grippers (#12933)
* Update areas.dm

* Update apc.dm

* Update apc.dm
2020-08-09 15:57:53 +02:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
fd9e3f5079 hugbox 2020-08-08 18:01:15 -07:00
silicons
908044e995 fix 2020-08-08 07:27:19 -07:00
silicons
16131f55a4 fix 2020-08-08 05:00:20 -07:00
silicons
e25905df2c fix 2020-08-08 04:08:23 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons
da48196863 stuff 2020-08-07 07:29:57 -07:00
silicons
8a0f44cb19 sounds 2020-08-07 07:23:34 -07:00
silicons
0668941669 fix 2020-08-07 07:19:41 -07:00
silicons
67b5695691 fix 2020-08-07 07:15:30 -07:00
silicons
375e764e4c support updates 2020-08-07 06:19:39 -07:00
silicons
53f908e32b putnamos 2020-08-07 06:09:42 -07:00
silicons
f787e2d525 whew 2020-08-07 06:03:31 -07:00
silicons
7330ee18bb insanity 2020-08-07 05:59:26 -07:00
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