Commit Graph

26358 Commits

Author SHA1 Message Date
Fox-McCloud
38edeada02 Chem Grenades Log Reagents 2017-07-28 00:56:37 -04:00
tigercat2000
26ca00714e Merge pull request #7873 from Fox-McCloud/theft-fix
Fixes Getting Weird/Undefined Objective
2017-07-25 13:29:55 -07:00
Fox-McCloud
81d3acb6d6 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-25 15:21:28 -04:00
Fox-McCloud
d5b4a031cc Fixes Getting Weird/Undefined Objective 2017-07-25 15:01:16 -04:00
Fox McCloud
98ad0cdb76 Merge pull request #7523 from FlattestGuitar/no-stel-ples
Removes boring theft objectives
2017-07-25 14:55:37 -04:00
Crazy Lemon
1b8af7dc94 Merge pull request #7708 from Fox-McCloud/you-cant-outmeme-memers
Darts no longer proc reaction
2017-07-25 10:42:42 -07:00
Crazy Lemon
e5a6d4a96c Merge pull request #7849 from Fox-McCloud/remove-comments
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-25 10:41:02 -07:00
FlattestGuitar
930f0f6ddb Fox's subjective objectives 2017-07-25 18:31:18 +02:00
Fox McCloud
14da673a8b Merge pull request #7782 from Kyep/emag_syndi_drone
Makes emagged drones more identifiable
2017-07-25 12:26:29 -04:00
Fox McCloud
d4f305cc72 Merge pull request #7583 from Kyep/smite_hunter
Expands Smite / Dark Priest to cover many characters
2017-07-25 12:24:45 -04:00
Fox McCloud
afa34c51e0 Merge pull request #7740 from owenowen212/honksquad_fix
Fix: Adds the clownish language to honksquad members
2017-07-25 12:02:58 -04:00
Fox McCloud
d29d285aef Merge pull request #7764 from Kyep/shotgun_noreact
Shotgun darts are no longer noreact like cryobeakers
2017-07-25 11:48:14 -04:00
Fox McCloud
ae1128b33d Merge pull request #7787 from imsxz/honk-rifle-self-charge
Makes HONK Rifle selfcharge
2017-07-25 11:46:36 -04:00
Fox McCloud
74b54570d9 Merge pull request #7830 from Crazylemon64/admeme_turrets
Turrets set to shoot non-projectile objects now launch them
2017-07-25 11:45:02 -04:00
Fox McCloud
42818caad9 Merge pull request #7860 from Kyep/corgi_eat_tweak
Ian is no longer Kirby
2017-07-25 06:52:23 -04:00
Crazy Lemon
da7bea7c61 Merge pull request #7850 from Fox-McCloud/reagenttssss
Reagents Cleanup
2017-07-25 03:43:17 -07:00
Crazy Lemon
7a206292d4 Merge pull request #7853 from Fox-McCloud/pointing
Can Point While Lying Down
2017-07-25 03:42:56 -07:00
Crazy Lemon
0d64bdd655 Merge pull request #7854 from Fox-McCloud/stat-improvements
Reduces Stat Calls
2017-07-25 03:40:31 -07:00
Crazy Lemon
e574c84935 Merge pull request #7858 from Fox-McCloud/health-implant-fix
Fixes Health Implants
2017-07-25 03:39:32 -07:00
Fox-McCloud
5d2429e15f Merge remote-tracking branch 'upstream/master' into reagenttssss 2017-07-25 06:31:11 -04:00
Crazy Lemon
d9a64e23bf Merge pull request #7333 from FlattestGuitar/taste-test
Adds a taste system!
2017-07-24 11:53:35 -07:00
Fox McCloud
6eaf1b59c5 Merge pull request #7691 from Kyep/fix_pirate_sentience
Fixes being able to sentience potion pirates & other sentient simple_animals
2017-07-24 10:23:16 -04:00
Fox McCloud
3d5add49c6 Merge pull request #7865 from Crazylemon64/decorative_machinery
Adds decorative telecomms machinery for map making
2017-07-24 10:22:20 -04:00
Crazylemon64
9c86d07252 Adds decorative telecomms machinery for map making 2017-07-23 21:08:10 -07:00
Kyep
912c5d3500 Removes text proc 2017-07-23 16:56:46 -07:00
Kyep
028d885ee0 Fixes Ian being able to spam eat 2017-07-23 16:48:41 -07:00
Crazy Lemon
dc9af549b5 Merge pull request #7859 from Fox-McCloud/fixes-organs-cloning
Fixes Infections in Organs from Cloning
2017-07-23 16:35:32 -07:00
Fox-McCloud
211038b6c7 Fixes Infections in Organs from Cloning 2017-07-23 18:19:23 -04:00
Fox-McCloud
89ff21c755 Fixes Health Implants 2017-07-23 17:26:37 -04:00
Fox-McCloud
f924ea15a4 Reduces Stat Calls 2017-07-23 04:56:05 -04:00
Fox-McCloud
46b8b05b10 Can Point While Lying Down 2017-07-23 04:25:46 -04:00
FlattestGuitar
97c2c10b13 o7 2017-07-22 23:53:46 +02:00
tigercat2000
3818d57f3d Merge pull request #7755 from Allfd/sqlcontrol
SQL version control
2017-07-22 10:49:16 -07:00
Fox-McCloud
4419683890 Reagents Cleanup 2017-07-22 05:18:13 -04:00
Fox-McCloud
027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
Crazy Lemon
6a4e69f741 Merge pull request #7845 from Fox-McCloud/organsss
Fixes IPC and Diona Knockdown Immunity
2017-07-21 23:05:00 -07:00
Fox McCloud
7cda52c713 Merge pull request #7818 from Crazylemon64/item_stumbling
Item stumbling refactor
2017-07-22 01:55:19 -04:00
Crazylemon64
88edf50be3 Agh why did it stick spaces in there 2017-07-21 22:45:20 -07:00
Fox McCloud
5b90688c14 Merge pull request #7651 from Kyep/ts_map_tweaks
TS Awaymission Map Updates
2017-07-22 01:45:10 -04:00
Crazylemon64
e0178ff8fd Final changes 2017-07-21 22:27:50 -07:00
Fox McCloud
33ca450283 Merge pull request #7828 from Kyep/char_change
Fixes #4721 - char name not updating on new player screen when different character loaded
2017-07-22 00:39:29 -04:00
Fox McCloud
b37c1cf4e7 Merge pull request #7814 from Crazylemon64/many_fixes
Runtime killer v2
2017-07-22 00:39:10 -04:00
Fox McCloud
c1087a6250 Merge pull request #7829 from Kyep/ts_blood_fix
Fixes #7826 & #7809 - blood decals being unanchored
2017-07-22 00:29:59 -04:00
Crazylemon64
50d5e18ef6 Moves soap into a single file 2017-07-21 15:20:23 -07:00
Crazylemon64
807084e304 Most of fox's changes 2017-07-21 15:20:12 -07:00
tigercat2000
b227e109f9 Merge pull request #7435 from SamHPurp/MetaStation-Revamp
Metastation 2.0
2017-07-21 13:32:22 -07:00
Fox-McCloud
1ecd7f13fc instant updates 2017-07-21 02:19:12 -04:00
Fox-McCloud
02f74932e2 Fixes IPC and Diona Knockdown Immunity 2017-07-20 21:01:55 -04:00
Crazylemon64
2fac378bf6 Adds spaces to recognized characters for paranoid sanitize 2017-07-20 12:01:43 -07:00
Crazylemon64
37270ec7c4 Paranoid sanitization 2017-07-20 01:15:13 -07:00