Commit Graph

2980 Commits

Author SHA1 Message Date
timothyteakettle
4daf71d99e woo it works 2020-07-21 03:34:50 +01:00
timothyteakettle
3e0403a7e9 BEEPSKY FASHION 2020-07-21 02:22:42 +01:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
Putnam
d88ade40bf actually fixes uplink 2020-07-18 01:51:59 -07:00
silicons
183a929e42 Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix
wrestling rotation fix
2020-07-17 17:07:06 -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
Artur
af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N
819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08: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
Sneakyrat6
538e7c62cd Fixes seeing real name in OOC Notes 2020-07-15 13:32:56 -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
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
Timothy Teakettle
98f63772b3 fix wrestling rotation 2020-07-14 14:35:13 +01:00
Artur
d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03: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
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
silicons
4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
2020-07-11 00:14:47 -07:00
Artur
84a22a9f49 Fixes cloning species transfer 2020-07-09 23:06:57 +03:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01: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
Artur
e3ba2e60c6 Not supported 2020-07-08 20:31:08 +03: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
silicons
cee15792b7 ok 2020-07-07 07:25:10 -07:00
Ghom
e7d19f512e Merge pull request #12397 from Rohesie/cooldown
Ports TGMC timer cooldowns
2020-07-06 22:54:58 +02:00
Ghom
bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix
[READY] Fixes Small Strides Formula
2020-07-06 22:48:09 +02:00
Artur
7ebc785437 fIXES UPLINK 2020-07-05 21:52:24 +03:00
Ghom
871993ce14 Merge pull request #12593 from silicons/autobunker
adds verb to auto bunker override on linked servers
2020-07-04 18:36:59 +02:00
Ghom
17ee8c5960 Merge pull request #12660 from YakumoChen/master
Reverts improv small arms, makes guncrafting easier and faster
2020-07-04 18:35:22 +02:00
silicons
c10350f10e Merge pull request #12677 from Ghommie/Ghommie-cit830
Fixes items' skills list keys missing associated traits and improves modulability a little.
2020-07-04 00:12:37 -07:00
silicons
103b8b7600 Merge pull request #12662 from kappa-sama/patch-29
makes bows and arrows more feasible improv weapons
2020-07-04 00:11:45 -07:00
silicons
f6be57269d Merge pull request #12687 from Ghommie/Ghommie-cit832
Fixing obscured inventory slots unequip block, for real.
2020-07-04 00:10:49 -07:00
Weblure
bc76fa615d Fixed small strides formula 2020-07-03 17:05:56 -07:00
Ghommie
e3b1ca4942 Linter. 2020-07-03 19:57:38 +02:00
Ghom
ea8662572b Silences the skill panel check_rights() call. 2020-07-03 17:37:03 +02: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
Lin
fa1e92d588 Merge pull request #12656 from Ghommie/Ghommie-cit826
Fixing two handed items and etcetera.
2020-07-01 14:30:16 -05:00
Ghom
8de00e80dd Update bag_of_holding.dm 2020-07-01 15:04:51 +02:00
kappa-sama
ad4f909d79 ashwalkers 2020-07-01 08:19:27 -04:00
kappa-sama
3695595034 ammunition 2020-07-01 08:17:13 -04:00
kappa-sama
73d616b3a4 more accurate 2020-07-01 08:13:30 -04:00
kappa-sama
49af0d11c7 string 2020-07-01 08:09:39 -04:00
kappa-sama
1fffd0a608 45 seconds lol 2020-07-01 08:02:41 -04:00
kappa-sama
cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama
1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00