silicons
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
Letter N
|
3ff770b38f
|
wrong state
|
2020-08-13 12:13:42 +08:00 |
|
Letter N
|
2eb6eb5032
|
state moment
|
2020-08-13 12:01:36 +08:00 |
|
Letter N
|
081f07e259
|
bye!
|
2020-08-12 16:38:36 +08:00 |
|
lolman360
|
6f7badda41
|
Merge branch 'master' into plumb
|
2020-08-12 09:03:11 +10:00 |
|
silicons
|
a8d61b60ef
|
Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
|
2020-08-11 01:47:32 -07:00 |
|
kiwedespars
|
eb8574d6d6
|
heretics from tg (with changes)
|
2020-08-10 19:17:26 -07:00 |
|
lolman360
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
silicons
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
Letter N
|
2615506ae9
|
oops, forgot about this
|
2020-08-09 13:18:10 +08:00 |
|
Letter N
|
4bed3a5349
|
OH FUCK
|
2020-08-09 12:49:14 +08:00 |
|
Letter N
|
5abcc1c220
|
reverts this change
|
2020-08-09 12:00:12 +08:00 |
|
Letter N
|
c4b4801132
|
shockies
|
2020-08-08 15:20:03 +08:00 |
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
Letter N
|
71bf63d0dd
|
this is needed
|
2020-08-07 14:06:14 +08:00 |
|
Letter N
|
c6c78667cb
|
atmo control fix
|
2020-08-07 13:58:08 +08:00 |
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
silicons
|
815ddd1866
|
oh boy
|
2020-08-05 21:34:26 -07:00 |
|
silicons
|
ffe3eeecde
|
Merge pull request #13017 from Hatterhat/coor-dharges
door charges no longer unconscious() you
|
2020-08-05 15:09:14 -07:00 |
|
timothyteakettle
|
9d52189364
|
add ricochets to way more things
|
2020-08-05 02:41:37 +01:00 |
|
timothyteakettle
|
3fc554d482
|
haha machinery go brr
|
2020-08-05 02:29:19 +01:00 |
|
Letter N
|
7c7d635193
|
what if atmos relief works? and all the other ui's gets updated
|
2020-08-04 12:54:55 +08:00 |
|
Hatterhat
|
6420914290
|
k
|
2020-08-03 23:45:34 -05:00 |
|
Letter N
|
454baea55f
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-04 09:31:34 +08:00 |
|
silicons
|
3b1826ce82
|
Update portable_turret.dm
|
2020-08-03 18:29:11 -07:00 |
|
Hatterhat
|
157d5c29a6
|
door charge nerf (tentative)
|
2020-08-03 19:47:04 -05:00 |
|
Letter N
|
a19e306137
|
less redtext - updates anomalies
|
2020-08-03 20:53:36 +08:00 |
|
Timothy Teakettle
|
289c186f32
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-08-02 18:11:07 +01:00 |
|
Timothy Teakettle
|
03d01d917f
|
Merge branch 'master' into wounds-part-2
|
2020-08-02 18:10:31 +01:00 |
|
silicons
|
320c91f4d3
|
Merge pull request #12742 from KeRSedChaplain/clockcultrework
Clockwork Cult rework
|
2020-08-01 00:17:11 -07:00 |
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
silicons
|
bc823b544f
|
sigh
|
2020-07-29 01:17:16 -07:00 |
|
silicons
|
e4148fe4ad
|
Merge remote-tracking branch 'citadel/master' into 12742
|
2020-07-29 01:11:11 -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 |
|
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 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
Letter N
|
22d5aebaa5
|
second batch - MAJOR: mech_fab, turrets
|
2020-07-24 14:38:04 +08: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 |
|