Commit Graph
30946 Commits
Author SHA1 Message Date
kevinz000andGitHub b0018a246c Merge pull request #11248 from Putnam3145/lick-pref
Made lick prefs actually save
2020-02-27 01:05:56 -07: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
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
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 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
kevinz000andGitHub 626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -07:00
Putnam c906f8f17f lickable. 2020-02-25 20:49:01 -08:00
Putnam 0a698d1eeb oy. 2020-02-25 20:07:07 -08:00
GhomandGitHub 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
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
Artur 00403a39c6 Reverts tracker changes somewhat 2020-02-25 15:47:15 +02: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
Artur f8469c89a4 Conflict fix 2020-02-25 10:46:20 +02:00
TrilbyspacecloneandGitHub 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
TrilbyspacecloneandGitHub 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