 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 |
|
|
Lin
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
|
Lin
|
e93dddf5cc
|
Merge pull request #12930 from Citadel-Station-13/silicons-patch-60
so you think you can parry turrets
|
2020-07-28 21:45:10 -05:00 |
|
|
silicons
|
d52892f000
|
Update portable_turret.dm
|
2020-07-26 16:32:20 -07:00 |
|
|
silicons
|
d954588c9a
|
Update portable_turret.dm
|
2020-07-26 16:30:50 -07:00 |
|
|
zerothebigboy
|
ee2de61b17
|
a
|
2020-07-26 06:27:30 -04:00 |
|
|
zerothebigboy
|
40d12fd02f
|
a
|
2020-07-26 06:20:06 -04:00 |
|
|
silicons
|
08f905f5bc
|
Update portable_turret_construct.dm
|
2020-07-23 18:52:27 -07:00 |
|
|
silicons
|
cd67be32e0
|
Update wishgranter.dm
|
2020-07-23 11:12:09 -07:00 |
|
|
silicons
|
db24df58a0
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:36:46 -07: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 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
silicons
|
38a9e89687
|
ok bet
|
2020-07-23 09:49:56 -07:00 |
|
|
silicons
|
0858af4b85
|
ok
|
2020-07-23 09:43:43 -07:00 |
|
|
silicons
|
184e3992f3
|
fixes
|
2020-07-21 11:56:23 -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 |
|
|
silicons
|
692656b02d
|
Whew
|
2020-07-20 11:53:33 -07:00 |
|
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
|
silicons
|
58e26c540c
|
merge from master
|
2020-07-20 10:18:44 -07:00 |
|
|
silicons
|
910869d6bf
|
more
|
2020-07-18 19:44:12 -07:00 |
|
|
silicons
|
b1ccccb322
|
more
|
2020-07-18 18:51:16 -07:00 |
|
|
silicons
|
1a040dd2a6
|
changes
|
2020-07-18 18:44:17 -07:00 |
|
|
silicons
|
7c5d4f863d
|
click cd breakout
|
2020-07-18 18:10:21 -07: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 |
|