Commit Graph

30854 Commits

Author SHA1 Message Date
Ghom 5ee2f0dcd8 Merge pull request #11169 from PersianXerxes/ohHeyKilo
Ports Kilo Station from Skyrat
2020-02-25 14:48:37 +01:00
Ghom ea5774e713 Merge pull request #11225 from r4d6/Random-Mining
Make the mining base's placement random
2020-02-25 14:41:40 +01:00
Ghom 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
Ghom 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
Ghom 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
Trilbyspaceclone cf23018b6a Update snacks_cake.dm 2020-02-24 22:51:43 -05:00
CitadelStationBot 270c5f26b5 Automatic changelog generation for PR #11192 [ci skip] 2020-02-24 16:12:47 -06:00
kevinz000 febb890c7f Merge pull request #11192 from Putnam3145/supermatter-hardcap
Made supermatter power increase with raw damage
2020-02-24 15:12:45 -07:00
CitadelStationBot 4205233e45 Automatic changelog generation for PR #11129 [ci skip] 2020-02-24 13:53:39 -06:00
Ghom 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
Ghom 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
Ghom 9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
2020-02-24 16:39:16 +01:00
CitadelStationBot 6b43ca03da Automatic changelog generation for PR #11201 [ci skip] 2020-02-24 03:33:56 -06:00
kevinz000 8cf41997f5 Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
kevinz000 0cfa6699b1 yeah ok fine 2020-02-24 02:31:14 -07:00
kevinz000 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-Google 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 ae6c388510 Merge pull request #11214 from Citadel-Station-13/Ghommie-patch-3
Fixing pAI radios inability to be toggled on/off
2020-02-24 02:23:30 -07:00
CitadelStationBot 76542208a6 Automatic changelog generation for PR #11199 [ci skip] 2020-02-24 03:23:20 -06:00
kevinz000 73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png
Lets pAIs hold encryption keys and play music.
2020-02-24 02:23:17 -07:00
kevinz000 e76eff6966 Update plushes.dm 2020-02-24 02:21:51 -07:00
kevinz000 27b7cd560c Update plushes.dm 2020-02-24 01:32:04 -07:00
Putnam f7e0eb43f8 Adds rename logging 2020-02-23 22:53:20 -08:00
Hatterhat 19ae30ea5b alright ghom i hope this works
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-23 21:20:57 -06:00
CitadelStationBot 5037f28eaf Automatic changelog generation for PR #11162 [ci skip] 2020-02-23 15:48:10 -06:00
Ghom 565fa77cf9 Merge pull request #11162 from Hatterhat/quickpatch-enzyme
biogen enzyme fix, multitool basic tools node fix
2020-02-23 22:48:07 +01:00
CitadelStationBot 6dce641061 Automatic changelog generation for PR #11187 [ci skip] 2020-02-23 15:47:39 -06:00
Ghom f5dbb0b20d Merge pull request #11187 from Trilbyspaceclone/sweet
New bar sign, The Hive
2020-02-23 22:47:37 +01:00
Ghom 3e232f93d9 Update barsigns.dm 2020-02-23 22:47:21 +01:00
Ghom 825beb41c1 Update paicard.dm 2020-02-23 22:44:38 +01:00
Winter Flare 4c03d552ee Gettin Salty. Fish is now Seafood. 2020-02-23 16:22:19 -05:00
Ghom 112c203216 Merge pull request #11213 from Hatterhat/combifans
combifan fix please speedmerge
2020-02-23 21:35:15 +01:00
Ghom b3149d930f Fixing pAI radios inability to be toggled on/off 2020-02-23 21:31:53 +01:00