Commit Graph

30924 Commits

Author SHA1 Message Date
CitadelStationBot d606d8670c Automatic changelog generation for PR #11244 [ci skip] 2020-02-27 01:57:56 -06:00
kevinz000 40c36213df Merge pull request #11244 from Ghommie/Ghommie-cit589
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
2020-02-27 00:57:54 -07:00
CitadelStationBot 420856b385 Automatic changelog generation for PR #11219 [ci skip] 2020-02-27 01:54:50 -06:00
kevinz000 a8a8e242d8 Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1
Adds 2cat (tail)
2020-02-27 00:54:47 -07:00
CitadelStationBot 3049ab3e51 Automatic changelog generation for PR #11240 [ci skip] 2020-02-27 01:53:13 -06:00
kevinz000 648e304ef8 Merge pull request #11240 from Trilbyspaceclone/patch-297
Raises blob point cap by 150 (aka they can store 250 now)
2020-02-27 00:53:10 -07:00
CitadelStationBot 46c76d9848 Automatic changelog generation for PR #11257 [ci skip] 2020-02-26 18:19:00 -06:00
Ghom 6e25a34aaa Merge pull request #11257 from Linzolle/pacifist-spike
pacifists can no longer meatspike
2020-02-27 01:18:57 +01:00
CitadelStationBot 176d263d3a Automatic changelog generation for PR #11254 [ci skip] 2020-02-26 18:11:26 -06:00
Ghom 803ac258f8 Merge pull request #11254 from deathride58/fuckclosets
Makes harm intent clicking closets attack them rather than place an item inside
2020-02-27 01:11:23 +01:00
Ghom 2c642d5507 Update kitchen_spike.dm 2020-02-27 01:10:38 +01:00
Ghom 7eac87d2e0 Merge pull request #11252 from Citadel-Station-13/kevinz000-patch-12
fixes electrostaves being invisible
2020-02-27 01:09:47 +01:00
CitadelStationBot 1ca755e358 Automatic changelog generation for PR #10877 [ci skip] 2020-02-26 17:54:56 -06:00
CitadelStationBot 6dd35355ef Automatic changelog generation for PR #11150 [ci skip] 2020-02-26 17:54:44 -06:00
Ghom 954f03f4e0 Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
Lin 69e3d857a8 derp 2020-02-26 21:39:53 +00:00
Lin ac384e4d70 consistency? 2020-02-26 21:01:34 +00:00
Lin c708d30d47 shitty webedit 2020-02-26 20:59:32 +00:00
deathride58 c232356a88 Makes clicking open closets with items on harm intent attack the closet rather than put the item in the closet 2020-02-26 09:51:48 -05:00
kevinz000 626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -07:00
Ghom 5bd62d129f Merge pull request #10877 from kevinz000/staves
Riot Electrostaves
2020-02-25 20:32:36 +01:00
Ghommie e02a6f6dea Fixing virology cause someone didn't covert ALL mob/species biotypes to flags. 2020-02-25 15:37:02 +01:00
CitadelStationBot 5bdbe1a60a Automatic changelog generation for PR #11236 [ci skip] 2020-02-25 08:19:31 -06:00
Ghom 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
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
Trilbyspaceclone 2aeb1e1b4a Update overmind.dm 2020-02-25 00:32:45 -05: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
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
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
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
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