Commit Graph

20806 Commits

Author SHA1 Message Date
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
Artur b536c061fb Reviewer suggestion and co 2020-02-26 16:26:57 +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
kevinz000 626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -07:00
Seris02 de6e8012f3 balances yee 2020-02-26 17:49:37 +08:00
BlackMajor be740ba690 Merge branch 'master' into SpaceRuins 2020-02-26 20:58:46 +13:00
Trilbyspaceclone 7fe6ebb2c9 Update chair.dm 2020-02-26 00:24:09 -05:00
Putnam c906f8f17f lickable. 2020-02-25 20:49:01 -08:00
Putnam 0a698d1eeb oy. 2020-02-25 20:07:07 -08:00
Putnam ebac066b2f lets add traitor classes 2020-02-25 16:10:23 -08:00
Seris02 6b2bbe0133 there fixed 2020-02-26 06:51:03 +08:00
kevinz000 76c1d5ddb9 k 2020-02-25 15:40:00 -07:00
kevinz000 5a320c7933 fugg u 2020-02-25 14:37:40 -07:00
kevinz000 40c2bdf5ee oh boy 2020-02-25 14:06:12 -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
Ghom 56d5899bbc Merge pull request #11236 from bunny232/master
Sentience event preference xenomorph to sentience potion
2020-02-25 15:19:28 +01:00
Ghom 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
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
Kraseo 170e092a24 this is going to end well 2020-02-25 13:14:18 +01:00
kevinz000 bfb8139225 DefaultCombatknockdown 2020-02-25 03:18:37 -07:00
kevinz000 8b06f6d4e9 message fix 2020-02-25 03:08:34 -07:00
Artur f8469c89a4 Conflict fix 2020-02-25 10:46:20 +02:00
Trilbyspaceclone 2aeb1e1b4a Update overmind.dm 2020-02-25 00:32:45 -05:00
Trilbyspaceclone 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
kevinz000 2eae147e93 ok 2020-02-24 16:51:35 -07:00
bunny232 53d5328c0c Update sentience.dm 2020-02-24 18:49:34 -05:00
Detective Google 569ea6bd61 unfucks paramedics access + PDA 2020-02-24 16:36:45 -06:00
kevinz000 5144e45ba9 it works now :D 2020-02-24 15:32:46 -07:00
kevinz000 bbcc9cf4e5 never ever webeditor 2020-02-24 15:15:21 -07: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 672da86c51 NEVERWEBEDITORGUYS 2020-02-24 15:08:08 -07:00
kevinz000 5ad51758e0 fix 2020-02-24 15:04:25 -07:00
kevinz000 388a804add Merge remote-tracking branch 'citadel/kevinz000-patch-15' into kevinz000-patch-17 2020-02-24 15:03:20 -07:00
kevinz000 c739091285 Merge remote-tracking branch 'citadel/kevinz000-patch-11' into kevinz000-patch-17 2020-02-24 15:03:05 -07:00
kevinz000 526471510f Merge remote-tracking branch 'citadel/kevinz000-patch-17-1' into kevinz000-patch-17 2020-02-24 15:03:02 -07:00
kevinz000 306b711ab1 Update reagents.dm 2020-02-24 14:30:50 -07:00
kevinz000 2b3e8a64f7 Update holder.dm 2020-02-24 14:23:44 -07:00
kevinz000 5cece42c1a Update glass.dm 2020-02-24 14:20:40 -07:00
kevinz000 23aa38a381 Update reagent_containers.dm 2020-02-24 14:17:48 -07:00
kevinz000 c6a0418946 Update reagent_containers.dm 2020-02-24 14:10:53 -07:00
kevinz000 3709992b46 Update reagent_containers.dm 2020-02-24 14:07:58 -07:00
kevinz000 77edc602dc Update glass.dm 2020-02-24 13:59:27 -07:00
kevinz000 d4657df9f5 Update glass.dm 2020-02-24 13:58:51 -07:00
kevinz000 1668bc598a Update glass.dm 2020-02-24 13:55:44 -07:00