Commit Graph

19989 Commits

Author SHA1 Message Date
kevinz000
f00a2c1cd3 Merge pull request #11202 from Hatterhat/beegions-but-actual-bees
Beegions, But With Actual Bees
2020-02-27 00:59:57 -07:00
kevinz000
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
kevinz000
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
kevinz000
a8a8e242d8 Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1
Adds 2cat (tail)
2020-02-27 00:54:47 -07:00
kevinz000
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
Ghom
6e25a34aaa Merge pull request #11257 from Linzolle/pacifist-spike
pacifists can no longer meatspike
2020-02-27 01:18:57 +01:00
Ghom
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
Ghom
2c642d5507 Update kitchen_spike.dm 2020-02-27 01:10:38 +01:00
Ghom
7eac87d2e0 Merge pull request #11252 from Citadel-Station-13/kevinz000-patch-12
fixes electrostaves being invisible
2020-02-27 01:09:47 +01:00
Ghom
954f03f4e0 Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
Lin
69e3d857a8 derp 2020-02-26 21:39:53 +00:00
Lin
ac384e4d70 consistency? 2020-02-26 21:01:34 +00:00
Lin
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
kevinz000
626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -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
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
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
bunny232
53d5328c0c Update sentience.dm 2020-02-24 18:49:34 -05: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
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
Ghom
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
r4d6
f76a1c15f3 Port random mining base 2020-02-24 13:27:54 -05:00
Ghom
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
Ghom
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
YakumoChen
6385445fd5 ruining the joke 2020-02-24 10:31:47 +00:00
YakumoChen
ff10b70ffe 2cat heating up 2020-02-24 10:20:47 +00:00
YakumoChen
7a759f68aa Merge pull request #24 from YakumoChen/master
k
2020-02-24 04:58:07 -05:00
YakumoChen
96bf8d6969 Update tails.dm 2020-02-24 09:55:39 +00:00
kevinz000
8cf41997f5 Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
kevinz000
0cfa6699b1 yeah ok fine 2020-02-24 02:31:14 -07:00
kevinz000
43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
2020-02-24 02:30:36 -07:00
Detective-Google
0caed52ca5 removes the epic and cool access and makes it less epic and more cool 2020-02-24 03:28:33 -06:00
kevinz000
3e77952652 Merge pull request #11216 from Putnam3145/rename-logging
[S] Adds rename logging
2020-02-24 02:27:27 -07:00
kevinz000
59074d1174 Merge pull request #11183 from Trilbyspaceclone/patch-291
Removes more Trek armor.
2020-02-24 02:27:05 -07:00
kevinz000
4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N
Makes all IPC organs look robotic!
2020-02-24 02:24:06 -07:00
kevinz000
493d62c17e Merge pull request #11184 from Trilbyspaceclone/patch-292
Remember when Kev made IPCs hearts no longer emp? Me ether!
2020-02-24 02:23:45 -07:00
kevinz000
ae6c388510 Merge pull request #11214 from Citadel-Station-13/Ghommie-patch-3
Fixing pAI radios inability to be toggled on/off
2020-02-24 02:23:30 -07:00
kevinz000
73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png
Lets pAIs hold encryption keys and play music.
2020-02-24 02:23:17 -07:00