Commit Graph

13393 Commits

Author SHA1 Message Date
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
Ghommie
a91464bf64 Fixing escaped characters in flavor texts. 2020-02-27 02:29:44 +01:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01: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
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
Seris02
de6e8012f3 balances yee 2020-02-26 17:49:37 +08: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
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
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
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
Putnam
feaadffd93 Gave jittering to salbutamol. 2020-02-24 11:23:51 -08:00
TrilbySpaceClone
525cedf16a this just works 2020-02-24 11:45:47 -05: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