Commit Graph

13110 Commits

Author SHA1 Message Date
kevinz000
ce8153e7fd aa 2020-02-27 20:12:52 -07:00
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
kevinz000
9bd4719c0a wrong type 2020-02-27 20:09:29 -07:00
kevinz000
045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
kevinz000
f4e49f339b k 2020-02-27 18:29:27 -07:00
kevinz000
b854cb5980 Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
Adds 2cat, again
2020-02-27 01:22:25 -07:00
YakumoChen
f6c170d31b Update tails.dm 2020-02-27 08:15:27 +00:00
YakumoChen
e682845ebf Update tails.dm 2020-02-27 08:09:34 +00:00
kevinz000
b0018a246c Merge pull request #11248 from Putnam3145/lick-pref
Made lick prefs actually save
2020-02-27 01:05:56 -07:00
YakumoChen
2cb95e200a Update tails.dm 2020-02-27 08:04:32 +00:00
kevinz000
19962493a9 Merge pull request #11241 from Arturlang/Solar_updates
Ports TGs Solar updates.
2020-02-27 01:03:52 -07:00
YakumoChen
e0c7c98253 Update tails.dm 2020-02-27 08:01:13 +00:00
kevinz000
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
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
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
954f03f4e0 Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
kevinz000
1711fcaa06 k 2020-02-26 15:56:01 -07:00
Artur
27b6469c67 Forgot a var 2020-02-26 16:42:38 +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
Putnam
c906f8f17f lickable. 2020-02-25 20:49:01 -08:00
Putnam
0a698d1eeb oy. 2020-02-25 20:07:07 -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
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
Artur
00403a39c6 Reverts tracker changes somewhat 2020-02-25 15:47:15 +02: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
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
febb890c7f Merge pull request #11192 from Putnam3145/supermatter-hardcap
Made supermatter power increase with raw damage
2020-02-24 15:12: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
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
Artur
528a226dae Done. 2020-02-24 13:36:55 +02: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
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