Commit Graph
20163 Commits
Author SHA1 Message Date
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
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
GhomandGitHub 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
Putnam feaadffd93 Gave jittering to salbutamol. 2020-02-24 11:23:51 -08:00
r4d6 f76a1c15f3 Port random mining base 2020-02-24 13:27:54 -05:00
GhomandGitHub 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
GhomandGitHub 9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
2020-02-24 16:39:16 +01:00
Kraseo 80ebdc44c7 moral of the story is doublecheck your code 2020-02-24 14:13:52 +01:00
Kraseo 08829fe535 why don't they get a powersink by default 2020-02-24 14:03:18 +01:00
Artur 528a226dae Done. 2020-02-24 13:36:55 +02:00
YakumoChenandGitHub 6385445fd5 ruining the joke 2020-02-24 10:31:47 +00:00
YakumoChenandGitHub ff10b70ffe 2cat heating up 2020-02-24 10:20:47 +00:00
YakumoChenandGitHub 7a759f68aa Merge pull request #24 from YakumoChen/master
k
2020-02-24 04:58:07 -05:00
YakumoChenandGitHub 96bf8d6969 Update tails.dm 2020-02-24 09:55:39 +00:00