 BlackMajor
|
be740ba690
|
Merge branch 'master' into SpaceRuins
|
2020-02-26 20:58:46 +13:00 |
|
|
BlackMajorandGitHub
|
f7058617c2
|
Merge pull request #33 from Citadel-Station-13/master
Merge gang
|
2020-02-26 20:56:20 +13:00 |
|
|
GhomandGitHub
|
5bd62d129f
|
Merge pull request #10877 from kevinz000/staves
Riot Electrostaves
|
2020-02-25 20:32:36 +01:00 |
|
|
CitadelStationBot
|
5bdbe1a60a
|
Automatic changelog generation for PR #11236 [ci skip]
|
2020-02-25 08:19:31 -06:00 |
|
|
GhomandGitHub
|
56d5899bbc
|
Merge pull request #11236 from bunny232/master
Sentience event preference xenomorph to sentience potion
|
2020-02-25 15:19:28 +01:00 |
|
|
CitadelStationBot
|
3ab027aca6
|
Automatic changelog generation for PR #11169 [ci skip]
|
2020-02-25 07:48:40 -06:00 |
|
|
GhomandGitHub
|
5ee2f0dcd8
|
Merge pull request #11169 from PersianXerxes/ohHeyKilo
Ports Kilo Station from Skyrat
|
2020-02-25 14:48:37 +01:00 |
|
|
GhomandGitHub
|
ea5774e713
|
Merge pull request #11225 from r4d6/Random-Mining
Make the mining base's placement random
|
2020-02-25 14:41:40 +01:00 |
|
|
GhomandGitHub
|
b8fa0c0977
|
Merge pull request #11217 from Citadel-Station-13/kevinz000-patch-12
plushies now use SAFEPICK
|
2020-02-25 14:31:07 +01:00 |
|
|
CitadelStationBot
|
d37112d330
|
Automatic changelog generation for PR #11212 [ci skip]
|
2020-02-25 07:23:59 -06:00 |
|
|
GhomandGitHub
|
5adfb5ca46
|
Merge pull request #11212 from r4d6/engine
Fix AM engine map
|
2020-02-25 14:23:56 +01:00 |
|
|
CitadelStationBot
|
bf8a91b4f7
|
Automatic changelog generation for PR #11238 [ci skip]
|
2020-02-25 07:22:34 -06:00 |
|
|
GhomandGitHub
|
f98e181820
|
Merge pull request #11238 from Trilbyspaceclone/patch-296
Corrects Peach Cake Slice to have an icon
|
2020-02-25 14:22:31 +01:00 |
|
|
Persi
|
f48fd43e82
|
Fixed dining room sofas, oops
|
2020-02-25 00:29:19 -05:00 |
|
|
BlackMajor
|
f2fe25d118
|
Updates maps with ruin border. Lowers ore gen on roids.
|
2020-02-25 17:33:18 +13:00 |
|
|
TrilbyspacecloneandGitHub
|
cf23018b6a
|
Update snacks_cake.dm
|
2020-02-24 22:51:43 -05:00 |
|
|
BlackMajor
|
fc85f62546
|
Merge branch 'master' into SpaceRuins
|
2020-02-25 16:51:39 +13:00 |
|
|
BlackMajorandGitHub
|
acf78d4b2d
|
Merge pull request #32 from Citadel-Station-13/master
Merge time
|
2020-02-25 16:47:49 +13:00 |
|
|
bunny232
|
53d5328c0c
|
Update sentience.dm
|
2020-02-24 18:49:34 -05:00 |
|
|
CitadelStationBot
|
270c5f26b5
|
Automatic changelog generation for PR #11192 [ci skip]
|
2020-02-24 16:12:47 -06:00 |
|
|
kevinz000andGitHub
|
febb890c7f
|
Merge pull request #11192 from Putnam3145/supermatter-hardcap
Made supermatter power increase with raw damage
|
2020-02-24 15:12:45 -07:00 |
|
|
kevinz000
|
00c70acee9
|
Target wew
|
2020-02-24 13:20:12 -07:00 |
|
|
kevinz000
|
26b908f53d
|
thonk
|
2020-02-24 13:19:38 -07:00 |
|
|
kevinz000
|
90d7fd81b1
|
k
|
2020-02-24 13:17:08 -07:00 |
|
|
kevinz000
|
fa9e275237
|
k
|
2020-02-24 13:16:12 -07:00 |
|
|
kevinz000
|
59e95555bb
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-24 13:09:45 -07:00 |
|
|
CitadelStationBot
|
4205233e45
|
Automatic changelog generation for PR #11129 [ci skip]
|
2020-02-24 13:53:39 -06:00 |
|
|
GhomandGitHub
|
f86e17d945
|
Merge pull request #11129 from Owai-Seek/movefood-2-16-20
Reorganize Food Recipes, "Balance" Tweaks
|
2020-02-24 20:53:36 +01:00 |
|
|
r4d6
|
f76a1c15f3
|
Port random mining base
|
2020-02-24 13:27:54 -05:00 |
|
|
CitadelStationBot
|
85150b651e
|
Automatic changelog generation for PR #11167 [ci skip]
|
2020-02-24 09:40:20 -06:00 |
|
|
GhomandGitHub
|
213a406568
|
Merge pull request #11167 from Citadel-Station-13/kevinz000-patch-11
hand teles uses a (slightly) less atrocious sprite for the beam
|
2020-02-24 16:40:17 +01:00 |
|
|
CitadelStationBot
|
645da9010a
|
Automatic changelog generation for PR #11110 [ci skip]
|
2020-02-24 09:39:19 -06:00 |
|
|
GhomandGitHub
|
9355e9319b
|
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
|
2020-02-24 16:39:16 +01:00 |
|
|
BlackMajor
|
6624155e3d
|
Hey you know this is probably a smarter way to go about ruin spawning in station space.
|
2020-02-25 02:21:28 +13:00 |
|
|
CitadelStationBot
|
6b43ca03da
|
Automatic changelog generation for PR #11201 [ci skip]
|
2020-02-24 03:33:56 -06:00 |
|
|
kevinz000andGitHub
|
8cf41997f5
|
Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
|
2020-02-24 02:33:54 -07:00 |
|
|
kevinz000andGitHub
|
0cfa6699b1
|
yeah ok fine
|
2020-02-24 02:31:14 -07:00 |
|
|
kevinz000andGitHub
|
43c17b4ab3
|
Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
|
2020-02-24 02:30:36 -07:00 |
|
|
Detective-GoogleandGitHub
|
0caed52ca5
|
removes the epic and cool access and makes it less epic and more cool
|
2020-02-24 03:28:33 -06:00 |
|
|
CitadelStationBot
|
fc3ca40b06
|
Automatic changelog generation for PR #11216 [ci skip]
|
2020-02-24 03:27:29 -06:00 |
|
|
kevinz000andGitHub
|
3e77952652
|
Merge pull request #11216 from Putnam3145/rename-logging
[S] Adds rename logging
|
2020-02-24 02:27:27 -07:00 |
|
|
CitadelStationBot
|
14565025fa
|
Automatic changelog generation for PR #11183 [ci skip]
|
2020-02-24 03:27:08 -06:00 |
|
|
kevinz000andGitHub
|
59074d1174
|
Merge pull request #11183 from Trilbyspaceclone/patch-291
Removes more Trek armor.
|
2020-02-24 02:27:05 -07:00 |
|
|
CitadelStationBot
|
9a9558f95f
|
Automatic changelog generation for PR #11188 [ci skip]
|
2020-02-24 03:24:22 -06:00 |
|
|
kevinz000andGitHub
|
6dcbf4df6f
|
Merge pull request #11188 from Trilbyspaceclone/more_sweets
The plywood chair sprites now looks better
|
2020-02-24 02:24:19 -07:00 |
|
|
CitadelStationBot
|
1c8afe1a5b
|
Automatic changelog generation for PR #11185 [ci skip]
|
2020-02-24 03:24:08 -06:00 |
|
|
kevinz000andGitHub
|
4fc0ef5e74
|
Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N
Makes all IPC organs look robotic!
|
2020-02-24 02:24:06 -07:00 |
|
|
CitadelStationBot
|
592c3fb843
|
Automatic changelog generation for PR #11184 [ci skip]
|
2020-02-24 03:23:47 -06:00 |
|
|
kevinz000andGitHub
|
493d62c17e
|
Merge pull request #11184 from Trilbyspaceclone/patch-292
Remember when Kev made IPCs hearts no longer emp? Me ether!
|
2020-02-24 02:23:45 -07:00 |
|
|
CitadelStationBot
|
f7d8f8f59b
|
Automatic changelog generation for PR #11214 [ci skip]
|
2020-02-24 03:23:32 -06:00 |
|