 siliconsandGitHub
|
1c2bc1b632
|
Update _song.dm
|
2020-07-31 00:24:48 -07:00 |
|
|
siliconsandGitHub
|
3a773809b6
|
Update guardian.dm
|
2020-07-31 00:22:46 -07:00 |
|
|
silicons
|
ba0c77a8bd
|
fix
|
2020-07-29 20:13:39 -07:00 |
|
|
silicons
|
b8522a2ae0
|
ok
|
2020-07-29 20:04:47 -07:00 |
|
|
CitadelStationBot
|
62cbe95856
|
Automatic changelog generation for PR #12955 [ci skip]
|
2020-07-29 16:02:26 -05:00 |
|
|
siliconsandGitHub
|
c60e595d99
|
Merge pull request #12955 from Arturlang/bloodsucker_life
Plugs bloodsucker LifeTick into BiologicalLife
|
2020-07-29 14:02:22 -07:00 |
|
|
LinandGitHub
|
41a711ff01
|
Merge pull request #12959 from Citadel-Station-13/AAAAAAA
FIXES LINTER ON MASTER
|
2020-07-29 15:59:20 -05:00 |
|
|
CitadelStationBot
|
d4469b8db8
|
Automatic changelog generation for PR #12953 [ci skip]
|
2020-07-29 15:48:47 -05:00 |
|
|
LinandGitHub
|
a7fe7f1317
|
Merge pull request #12953 from Adelphon/pog
Adds Camo To AutoDrobe (fix)
|
2020-07-29 15:48:45 -05:00 |
|
|
siliconsandGitHub
|
ad3092d883
|
Merge branch 'master' into AAAAAAA
|
2020-07-29 11:13:33 -07:00 |
|
|
siliconsandGitHub
|
446e0df667
|
Merge pull request #12961 from timothyteakettle/travis-patch-1
if travis approves this then it fixes travis
|
2020-07-29 11:12:35 -07:00 |
|
|
Timothy Teakettle
|
097327b4f3
|
Revert "Merge branch 'master' into travis-patch-1"
This reverts commit de3d6310b2, reversing
changes made to f8f29826f5.
|
2020-07-29 19:02:18 +01:00 |
|
|
Timothy Teakettle
|
9a9993c7be
|
yep
|
2020-07-29 19:00:06 +01:00 |
|
|
Timothy Teakettle
|
de3d6310b2
|
Merge branch 'master' into travis-patch-1
|
2020-07-29 18:59:21 +01:00 |
|
|
silicons
|
bc823b544f
|
sigh
|
2020-07-29 01:17:16 -07:00 |
|
|
CitadelStationBot
|
f8f29826f5
|
Automatic changelog generation for PR #12924 [ci skip]
|
2020-07-29 03:09:51 -05:00 |
|
|
siliconsandGitHub
|
9ff94e019b
|
Merge pull request #12924 from SiliconMain/analyzer
Ports long range atmos analyzer from skyrat
|
2020-07-29 01:09:48 -07:00 |
|
|
LinandGitHub
|
fbf81930c3
|
Merge pull request #12958 from silicons/fix_142
haha nothing to see here woops
|
2020-07-29 00:20:45 -05:00 |
|
|
silicons
|
1c2eefb8d6
|
.
|
2020-07-28 22:11:51 -07:00 |
|
|
silicons
|
78312c23bf
|
sigh
|
2020-07-28 21:53:07 -07:00 |
|
|
CitadelStationBot
|
dbc766a7ca
|
Automatic changelog generation for PR #12922 [ci skip]
|
2020-07-28 22:17:10 -05:00 |
|
|
LinandGitHub
|
a560920f3c
|
Merge pull request #12922 from timothyteakettle/let-bots-wear-hats
beepsky hats now move with beepsky when he bobs up and down
|
2020-07-28 22:17:06 -05:00 |
|
|
CitadelStationBot
|
481f29fc07
|
Automatic changelog generation for PR #12944 [ci skip]
|
2020-07-28 22:11:34 -05:00 |
|
|
LinandGitHub
|
447a0b24bf
|
Merge pull request #12944 from timothyteakettle/fixes-crates
fixes some crafted crates containing items
|
2020-07-28 22:11:30 -05:00 |
|
|
CitadelStationBot
|
105cc8dc70
|
Automatic changelog generation for PR #12883 [ci skip]
|
2020-07-28 22:05:42 -05:00 |
|
|
LinandGitHub
|
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 |
|
|
CitadelStationBot
|
be20861294
|
Automatic changelog generation for PR #12734 [ci skip]
|
2020-07-28 21:51:46 -05:00 |
|
|
LinandGitHub
|
a5dd08a054
|
Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
|
2020-07-28 21:51:43 -05:00 |
|
|
CitadelStationBot
|
2e63c17456
|
Automatic changelog generation for PR #12834 [ci skip]
|
2020-07-28 21:51:14 -05:00 |
|
|
LinandGitHub
|
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 |
|
|
CitadelStationBot
|
3371022275
|
Automatic changelog generation for PR #12929 [ci skip]
|
2020-07-28 21:48:17 -05:00 |
|
|
LinandGitHub
|
ae02a7348c
|
Merge pull request #12929 from Citadel-Station-13/silicons-patch-59
silicons (and all other nonhuman mobs) can now block (with the right items)
|
2020-07-28 21:48:14 -05:00 |
|
|
CitadelStationBot
|
13e50ced55
|
Automatic changelog generation for PR #12928 [ci skip]
|
2020-07-28 21:48:07 -05:00 |
|
|
LinandGitHub
|
e8ab87c396
|
Merge pull request #12928 from Citadel-Station-13/silicons-patch-58
silicons (and any other nonhuman mob) can now parry
|
2020-07-28 21:48:03 -05:00 |
|
|
CitadelStationBot
|
9e07eeb84d
|
Automatic changelog generation for PR #12932 [ci skip]
|
2020-07-28 21:45:58 -05:00 |
|
|
LinandGitHub
|
91dc8b96d0
|
Merge pull request #12932 from silicons/ok_2
perfect parries with an energy sword now reflect projectiles back at their shooter
|
2020-07-28 21:45:53 -05:00 |
|
|
LinandGitHub
|
18fa47e479
|
Merge pull request #12931 from Citadel-Station-13/silicons-patch-61
nerfs parrying bullets with a wooden stick following complaints
|
2020-07-28 21:45:36 -05:00 |
|
|
CitadelStationBot
|
3825bb73df
|
Automatic changelog generation for PR #12930 [ci skip]
|
2020-07-28 21:45:14 -05:00 |
|
|
LinandGitHub
|
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 |
|
|
Changelogs
|
7bc458b43e
|
Automatic changelog compile [ci skip]
|
2020-07-29 00:11:03 +00:00 |
|
|
Artur
|
e0d9c7972d
|
Makes it actually work
|
2020-07-29 01:50:40 +03:00 |
|
|
CitadelStationBot
|
8c2e23e603
|
Automatic changelog generation for PR #12948 [ci skip]
|
2020-07-28 15:27:16 -05:00 |
|
|
siliconsandGitHub
|
93da2515b6
|
Merge pull request #12948 from Hatterhat/windows
[speedmerge? it's not that bad i swear] directional window rotation fix
|
2020-07-28 13:27:12 -07:00 |
|
|
CitadelStationBot
|
08a6d140aa
|
Automatic changelog generation for PR #12942 [ci skip]
|
2020-07-28 15:26:26 -05:00 |
|
|
siliconsandGitHub
|
d8378e64be
|
Merge pull request #12942 from DeltaFire15/outfit-fix
Fixes the 'Naked' outfit
|
2020-07-28 13:26:23 -07:00 |
|
|
CitadelStationBot
|
1ef086dffb
|
Automatic changelog generation for PR #12951 [ci skip]
|
2020-07-28 15:26:11 -05:00 |
|
|
siliconsandGitHub
|
ab67ae3291
|
Merge pull request #12951 from timothyteakettle/haha-yes-blood
bloodsucker blood loss fix
|
2020-07-28 13:26:07 -07:00 |
|
|
silicons
|
0152dcda65
|
fix
|
2020-07-28 13:24:45 -07:00 |
|
|
Artur
|
09f2594c37
|
Plugs bloodsucker LifeTick into BiologicalLife
|
2020-07-28 22:58:13 +03:00 |
|
|
Adelphon
|
1f508ef15d
|
Adds Camo To AutoDrobe (fix)
Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
|
2020-07-28 15:04:58 -04:00 |
|