Commit Graph
20127 Commits
Author SHA1 Message Date
GhomandGitHub 6e25a34aaa Merge pull request #11257 from Linzolle/pacifist-spike
pacifists can no longer meatspike
2020-02-27 01:18:57 +01: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
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 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
Artur b536c061fb Reviewer suggestion and co 2020-02-26 16:26:57 +02:00
kevinz000andGitHub 626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -07:00
Seris02 de6e8012f3 balances yee 2020-02-26 17:49:37 +08:00
TrilbyspacecloneandGitHub 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
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
GhomandGitHub 56d5899bbc Merge pull request #11236 from bunny232/master
Sentience event preference xenomorph to sentience potion
2020-02-25 15:19:28 +01: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
Kraseo 170e092a24 this is going to end well 2020-02-25 13:14:18 +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
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
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
kevinz000andGitHub 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
kevinz000andGitHub 306b711ab1 Update reagents.dm 2020-02-24 14:30:50 -07:00
kevinz000andGitHub 2b3e8a64f7 Update holder.dm 2020-02-24 14:23:44 -07:00
kevinz000andGitHub 5cece42c1a Update glass.dm 2020-02-24 14:20:40 -07:00
kevinz000andGitHub 23aa38a381 Update reagent_containers.dm 2020-02-24 14:17:48 -07:00
kevinz000andGitHub c6a0418946 Update reagent_containers.dm 2020-02-24 14:10:53 -07:00
kevinz000andGitHub 3709992b46 Update reagent_containers.dm 2020-02-24 14:07:58 -07:00
kevinz000andGitHub 77edc602dc Update glass.dm 2020-02-24 13:59:27 -07:00
kevinz000andGitHub d4657df9f5 Update glass.dm 2020-02-24 13:58:51 -07:00
kevinz000andGitHub 1668bc598a Update glass.dm 2020-02-24 13:55:44 -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