Hatterhat
4df9efb076
heho attack text
2020-08-04 00:29:30 -05:00
Hatterhat
ccee254546
proof of concept: crusherglaive - squashed
2020-08-02 12:30:14 -05:00
Changelogs
be0740a2e7
Automatic changelog compile [ci skip]
2020-08-01 00:11:48 +00:00
CitadelStationBot
f8de31695c
Automatic changelog generation for PR #12988 [ci skip]
2020-07-31 17:48:50 -05:00
Lin
b437383e55
Merge pull request #12988 from Citadel-Station-13/silicons-patch-65
...
so it turns out mob burning checked for no oxygen instead of yes oxygen due to some other pr so you can only die of being on fire if you're in space in a hardsuit
2020-07-31 17:48:47 -05:00
silicons
d1edbab264
Update life.dm
2020-07-31 14:39:40 -07:00
Lin
159d5c1896
Merge pull request #12985 from Citadel-Station-13/silicons-patch-64
...
okay so no-clickdelay telekinetic sharp-object-throwing is not okay.
2020-07-31 14:27:14 -05:00
CitadelStationBot
c7100d6e66
Automatic changelog generation for PR #12962 [ci skip]
2020-07-31 14:25:59 -05:00
Lin
0f07c8fca6
Merge pull request #12962 from dapnee/morechangestokilo
...
Another Pass Over Kilo
2020-07-31 14:25:56 -05:00
CitadelStationBot
82170264f5
Automatic changelog generation for PR #12952 [ci skip]
2020-07-31 14:24:51 -05:00
Lin
39bd5e74a4
Merge pull request #12952 from dapnee/hahabox
...
Minor Fixes to Box
2020-07-31 14:24:48 -05:00
CitadelStationBot
80c11fe998
Automatic changelog generation for PR #12967 [ci skip]
2020-07-31 14:22:15 -05:00
Lin
b9848dbaee
Merge pull request #12967 from Citadel-Station-13/silicons-patch-50
...
you need two hands free to fire the foam force crossbow! (no, you shouldn't.)
2020-07-31 14:22:11 -05:00
CitadelStationBot
96b44709a7
Automatic changelog generation for PR #12964 [ci skip]
2020-07-31 14:22:01 -05:00
Lin
16fb4b3291
Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot
...
monkeys stop bleeding nonstop
2020-07-31 14:21:57 -05:00
silicons
ad75ac0c6d
Update telekinesis.dm
2020-07-31 02:30:56 -07:00
silicons
ef9a82edde
Merge pull request #12981 from Arturlang/bloodsucker_life
...
Bloodsucker life
2020-07-30 18:33:13 -07:00
Artur
9020e59aa0
kevinz fix
2020-07-31 04:32:46 +03:00
Artur
2e3922d08e
Merge remote-tracking branch 'origin/master' into bloodsucker_life
2020-07-31 02:07:14 +03:00
Artur
b22ffd6b6e
Makes it properly work
2020-07-31 02:07:03 +03:00
dapnee
3fdd1654ad
aaaaaaa
...
I missed a SINGLE SINK
2020-07-30 16:44:24 -06:00
silicons
f02bc4a572
Update toy.dm
2020-07-29 19:49:11 -07:00
timothyteakettle
55be55ce0f
Revert "end our suffering"
...
This reverts commit 4e1fcc4e08
2020-07-30 02:29:13 +01:00
timothyteakettle
4e1fcc4e08
end our suffering
2020-07-30 02:28:53 +01:00
timothyteakettle
940fe8240d
monkey blood fix
2020-07-30 01:57:09 +01:00
Changelogs
0711e45d18
Automatic changelog compile [ci skip]
2020-07-30 00:11:15 +00:00
CitadelStationBot
62cbe95856
Automatic changelog generation for PR #12955 [ci skip]
2020-07-29 16:02:26 -05:00
silicons
c60e595d99
Merge pull request #12955 from Arturlang/bloodsucker_life
...
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-29 14:02:22 -07:00
Lin
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
Lin
a7fe7f1317
Merge pull request #12953 from Adelphon/pog
...
Adds Camo To AutoDrobe (fix)
2020-07-29 15:48:45 -05:00
dapnee
5a58cd6da0
Another pass over kilo
...
Added an air alarm to science near the bepis, fixed the active tiles around the arrivals shuttle, and fixed the commissary APC being only renamed and not area stringed correctly
2020-07-29 14:35:17 -06:00
silicons
ad3092d883
Merge branch 'master' into AAAAAAA
2020-07-29 11:13:33 -07:00
silicons
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 de3d6310b2f8f29826f5
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
silicons
9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
Lin
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
Lin
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
Lin
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
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
CitadelStationBot
be20861294
Automatic changelog generation for PR #12734 [ci skip]
2020-07-28 21:51:46 -05:00
