shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,960 Commits 5 Branches 0 Tags
bc882b2126587a6bfebac717dedb618b1465d0b4
Commit Graph

20013 Commits

Author SHA1 Message Date
raspyosu
bc882b2126 nerf mesmerize range 
lunge should have more range than mesmerize imo so let's just yoink
 2020-02-27 19:10:31 -05:00
raspyosu
9ec828f1f2 lunge & mesmerize tweaks 
lunge nerfed (holy FUCK)
- windup reverted to 0.7s
- range reverted to 3
- adjacency check fixed (must've been tired)
mesmerize
- now can be broken via line of sight breaking (checks for LoS every 0.5s there is probably a better way of doing this)
 2020-02-27 16:29:15 -05:00
Ghom
879032c52f Merge pull request #11255 from deathride58/sprintconfigdefaults 
Makes the default sprint config options match live's actual config
 2020-02-27 16:23:27 +01:00
Ghom
ebe16768d4 Merge pull request #11249 from Trilbyspaceclone/patch-298 
Corrects bar stool name
 2020-02-27 12:40:41 +01: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
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
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
kevinz000
626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -07:00
Trilbyspaceclone
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
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
Artur
00403a39c6 Reverts tracker changes somewhat 2020-02-25 15:47:15 +02: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
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
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
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