 zerothebigboy
|
ee2de61b17
|
a
|
2020-07-26 06:27:30 -04:00 |
|
|
zerothebigboy
|
40d12fd02f
|
a
|
2020-07-26 06:20:06 -04:00 |
|
|
silicons
|
ec72015f4f
|
Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
|
2020-07-23 10:35:16 -07:00 |
|
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
|
Lin
|
210b7b281c
|
Merge pull request #12727 from Citadel-Station-13/silicons-patch-19
bandaids around turnstiles being bad code until it can have its movement checks refactored
|
2020-07-20 18:25:01 -05:00 |
|
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +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 |
|
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
|
BlackMajor
|
68475fe301
|
Forgot to let borgs use the iv drip
|
2020-07-18 17:39:41 +12:00 |
|
|
silicons
|
a8e2b84ad8
|
Merge pull request #12763 from zeroisthebiggay/b
hopefully fixes records possibly
|
2020-07-17 17:10:40 -07:00 |
|
|
silicons
|
655afda020
|
Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
|
2020-07-17 17:08:23 -07:00 |
|
|
BlackMajor
|
9b671b7dd1
|
I'm gonna regret this. Adds stock parts (meaning cells) to the gripper list
|
2020-07-18 03:08:52 +12:00 |
|
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01: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 |
|
|
Artur
|
57e0cafb15
|
Fixes clockwork sleepers
|
2020-07-14 20:01:04 +03:00 |
|
|
Artur
|
f5ee74803f
|
Updates minter to tg and the prereqs
|
2020-07-14 18:08:12 +03:00 |
|
|
Artur
|
c964cadd85
|
Makes amber alert work
|
2020-07-14 16:15:32 +03:00 |
|
|
zerothebigboy
|
5b3050f692
|
b
|
2020-07-13 17:01:41 -04:00 |
|
|
zerothebigboy
|
4c0248835f
|
b
|
2020-07-13 17:01:23 -04:00 |
|
|
zerothebigboy
|
85f8491003
|
b
|
2020-07-13 14:45:18 -04:00 |
|
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
|
Lin
|
955d9fa0cc
|
Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
|
2020-07-11 16:40:38 -05:00 |
|
|
silicons
|
4f4c6b85bf
|
Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
|
2020-07-11 00:14:47 -07:00 |
|
|
silicons
|
8686029009
|
Update turnstile.dm
|
2020-07-09 23:04:58 -07:00 |
|
|
silicons
|
6af7519727
|
Update turnstile.dm
|
2020-07-09 23:04:06 -07:00 |
|
|
Artur
|
9de8483bcf
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-09 22:14:20 +03:00 |
|
|
Timothy Teakettle
|
02f46322ad
|
port examine
|
2020-07-09 18:32:45 +01:00 |
|
|
Putnam
|
2a04ab19fd
|
windoors :b:roke
|
2020-07-09 01:36:57 -07:00 |
|
|
Putnam
|
75c0b01c86
|
Updated to july 2020.
|
2020-07-08 23:13:26 -07: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
|
0a9dc33ce1
|
Reverts cloning changes
|
2020-07-08 23:42:47 +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 |
|
|
Ghommie
|
afb5b5237c
|
linter & stuff.
|
2020-07-06 22:42:32 +02:00 |
|
|
Ghommie
|
562b57095d
|
mowing down the experimental cloner copypasta.
|
2020-07-05 03:04:53 +02:00 |
|
|
Ghommie
|
780f30bd4d
|
Fixing cloning
|
2020-07-04 21:01:44 +02:00 |
|
|
Artur
|
82c6a02feb
|
More Testmerge fixes
|
2020-07-03 15:34:45 +03:00 |
|
|
Artur
|
6c4e733a38
|
More testmerge fixes
|
2020-07-03 15:16:02 +03:00 |
|
|
Artur
|
7781296fb9
|
DNA CONSOLE FIX
|
2020-07-03 11:09:55 +03:00 |
|
|
Artur
|
365aadec54
|
Trying to fix the dna t
|
2020-07-03 00:55:18 +03:00 |
|
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
|
silicons
|
e2975a44a1
|
Merge branch 'master' into policy
|
2020-07-02 01:23:19 -07:00 |
|
|
Artur
|
e6dee77b79
|
Telecomms fixes
|
2020-06-30 17:01:54 +03:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +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 |
|
|
Putnam3145
|
ee2fedd4af
|
Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-06-29 12:44:33 -07:00 |
|
|
silicons
|
45a6061958
|
Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
|
2020-06-27 14:53:28 -07:00 |
|
|
silicons
|
2ea030ca3e
|
fix
|
2020-06-26 23:53:52 -07:00 |
|