Commit Graph
31046 Commits
Author SHA1 Message Date
kevinz000 ce8153e7fd aa 2020-02-27 20:12:52 -07:00
kevinz000 56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
kevinz000 67c857292f Aa 2020-02-27 20:09:33 -07:00
kevinz000 9bd4719c0a wrong type 2020-02-27 20:09:29 -07:00
kevinz000 995aa6cdec fix 2020-02-27 20:07:34 -07:00
kevinz000 045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
kevinz000 f4e49f339b k 2020-02-27 18:29:27 -07:00
GhomandGitHub 879032c52f Merge pull request #11255 from deathride58/sprintconfigdefaults
Makes the default sprint config options match live's actual config
2020-02-27 16:23:27 +01:00
CitadelStationBot 721f4f6bff Automatic changelog generation for PR #11249 [ci skip] 2020-02-27 05:40:43 -06:00
GhomandGitHub ebe16768d4 Merge pull request #11249 from Trilbyspaceclone/patch-298
Corrects bar stool name
2020-02-27 12:40:41 +01:00
kevinz000andGitHub b854cb5980 Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
Adds 2cat, again
2020-02-27 01:22:25 -07:00
YakumoChenandGitHub f6c170d31b Update tails.dm 2020-02-27 08:15:27 +00:00
YakumoChenandGitHub e682845ebf Update tails.dm 2020-02-27 08:09:34 +00:00
CitadelStationBot 2008c2f78f Automatic changelog generation for PR #11248 [ci skip] 2020-02-27 02:05:59 -06:00
kevinz000andGitHub b0018a246c Merge pull request #11248 from Putnam3145/lick-pref
Made lick prefs actually save
2020-02-27 01:05:56 -07:00
YakumoChenandGitHub 2cb95e200a Update tails.dm 2020-02-27 08:04:32 +00:00
CitadelStationBot 5f7097aa43 Automatic changelog generation for PR #11241 [ci skip] 2020-02-27 02:03:54 -06:00
kevinz000andGitHub 19962493a9 Merge pull request #11241 from Arturlang/Solar_updates
Ports TGs Solar updates.
2020-02-27 01:03:52 -07:00
YakumoChenandGitHub e0c7c98253 Update tails.dm 2020-02-27 08:01:13 +00:00
CitadelStationBot 8eaad92404 Automatic changelog generation for PR #11235 [ci skip] 2020-02-27 02:00:48 -06:00
kevinz000andGitHub 924c7e0d05 Merge pull request #11235 from Detective-Google/if-it-compiles-it-works
unfucks paramedics access + PDA
2020-02-27 01:00:45 -07:00
CitadelStationBot 62f823f9bb Automatic changelog generation for PR #11202 [ci skip] 2020-02-27 01:59:59 -06:00
kevinz000andGitHub f00a2c1cd3 Merge pull request #11202 from Hatterhat/beegions-but-actual-bees
Beegions, But With Actual Bees
2020-02-27 00:59:57 -07:00
CitadelStationBot d97d806ff4 Automatic changelog generation for PR #11220 [ci skip] 2020-02-27 01:59:22 -06:00
kevinz000andGitHub a92baba125 Merge pull request #11220 from Kraseo/powersink-of-tc
Gives traitors with power-draining sabotage objective a free powersink
2020-02-27 00:59:20 -07:00
CitadelStationBot d606d8670c Automatic changelog generation for PR #11244 [ci skip] 2020-02-27 01:57:56 -06:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 2c642d5507 Update kitchen_spike.dm 2020-02-27 01:10:38 +01:00
GhomandGitHub 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
GhomandGitHub 954f03f4e0 Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
kevinz000 1711fcaa06 k 2020-02-26 15:56:01 -07:00
LinandGitHub 69e3d857a8 derp 2020-02-26 21:39:53 +00:00
LinandGitHub ac384e4d70 consistency? 2020-02-26 21:01:34 +00:00
LinandGitHub c708d30d47 shitty webedit 2020-02-26 20:59:32 +00:00
deathride58 d7192a7c35 Makes the default sprint config options match live's actual config 2020-02-26 10:21:26 -05: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
Artur 27b6469c67 Forgot a var 2020-02-26 16:42:38 +02:00
kevinz000 25a2b34c38 some fixes 2020-02-26 05:59:53 -07:00
kevinz000 872872d9f9 move stuff 2020-02-26 05:38:34 -07:00
kevinz000andGitHub 626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -07:00