Commit Graph

20878 Commits

Author SHA1 Message Date
Fox McCloud
6711f92099 Merge pull request #12326 from Couls/missing-keyword-args
fixes some missing arguments and runtimes
2019-09-17 21:03:11 -04:00
Fox McCloud
5810d28571 Refactors Simple Mob Creation: Adjusts Which Mobs are Available (#12325) 2019-09-17 16:06:43 -07:00
Fox McCloud
979c9df051 Merge pull request #12332 from Dave-TH/light_attack_cooldown
Fixes Light Attack Cooldowns
2019-09-17 18:53:18 -04:00
Dave
1d30fa59a5 Limits the speed of light 2019-09-17 18:38:58 -04:00
Couls
fd3e6f5729 thrown objects now phase through the thrower instead of hitting them (#12323) 2019-09-17 13:52:02 -07:00
Fox McCloud
ce1b8c76e5 Updates Space Carp (#12322) 2019-09-17 13:44:24 -04:00
Eman
d1afce5f5c Updated the netherworld creatures' sprites (#12183)
Updated the netherworld creatures' sprites (#12183)
2019-09-17 10:15:07 -04:00
Fox McCloud
1b1bd00c06 Updates Status Effects: Fixes Blood Drunk Status Effect, Buffs Regenerative Core (#12320) 2019-09-17 07:56:50 -04:00
Kyep
dfd83d822a Depot Fixes & Tweaks (#11677)
* Depot Fixes & Tweaks
2019-09-16 22:55:54 -04:00
variableundefined
6b90d7fcbc Merge pull request #12318 from Dave-TH/rooty_tooty_magic_shooty
Makes Wizards Twice As Cool
2019-09-16 22:45:35 -04:00
variableundefined
845acf13ca Merge pull request #12298 from Ty-Omaha/adminHELP
Adminhelp update
2019-09-16 20:16:26 -04:00
variableundefined
c289ee4511 Merge pull request #12311 from Ty-Omaha/lobbymusic
Small global midi improvements
2019-09-16 20:16:13 -04:00
Fox McCloud
4a5a9a5c92 Merge pull request #12328 from Couls/monkey-limit-fix
fix recycled monkeys not being removed from the cubemonkey list
2019-09-16 20:15:34 -04:00
Coul
bc007467bb fix recycled monkeys not being removed from the cubemonkey list 2019-09-16 19:41:54 -04:00
variableundefined
79867e0ce9 Merge pull request #12302 from TDSSS/less-attack-spam
Lowers logging level of harmless chems/food
2019-09-16 18:45:14 -04:00
variableundefined
5942d41e5b Merge pull request #12303 from TheMadTrickster/Small-custom-sprite-changes
Dan's small sprite edits
2019-09-16 18:44:29 -04:00
Coul
27e65d9215 remove KA fix 2019-09-16 16:24:13 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Pineapple Salad
fd48aaf7d2 requested changes from Fox 2019-09-16 13:16:39 -04:00
Dave
92ab30b165 There's a new sheriff of magic town 2019-09-16 03:03:01 -04:00
Fox McCloud
ae903a638c Merge pull request #12313 from Ionward/minor_sprite_issue_fix
Librarian Plasmaman helmet and Atmos hardsuit icon fixes
2019-09-16 01:39:31 -04:00
variableundefined
525c70732f Merge pull request #12296 from Couls/too-many-monkeys-jumping-on-the-bed
limit the amount of monkeys spawned from monkey cubes
2019-09-15 22:19:20 -04:00
Ionward
51e0afaaf0 fixes atmos_hardsuit item state typo, and adds plasmaman librarian helmet 2019-09-15 17:37:00 -07:00
Ty-Omaha
3572de0fda minor fix 2019-09-15 16:06:18 -04:00
Ty-Omaha
eba6940b55 sound improvement 2019-09-15 14:10:14 -04:00
variableundefined
959774ae99 Merge pull request #12307 from Fox-McCloud/light-replacer-fix
Fixes Double-Bonking Light Replacer
2019-09-15 11:26:13 -04:00
Fox McCloud
d9186a0c7b Fixes Double-Bonking Light Replacer 2019-09-15 11:11:07 -04:00
Coul
1cd674b2b8 Merge remote-tracking branch 'upstream/master' into too-many-monkeys-jumping-on-the-bed 2019-09-15 10:46:27 -04:00
Coul
84a6a10b9b review comments 2019-09-15 10:45:21 -04:00
Fox McCloud
d83387a488 Fixes Tendrils Inside Ruins 2019-09-15 09:28:14 -04:00
TDSSS
533f525c11 logging changes 2019-09-15 08:43:47 +02:00
Ty-Omaha
f7eabb357c resolve 2019-09-14 23:40:34 -04:00
Ty-Omaha
16b65120ba adminhelp update 2019-09-14 22:41:21 -04:00
variableundefined
f6fe4a1520 Merge pull request #12291 from Fox-McCloud/hierophant-update
Hierophant Update
2019-09-14 22:31:38 -04:00
Coul
e09913ae39 move removal to human/death 2019-09-14 21:51:06 -04:00
Coul
00c3b6ad41 limit the amount of monkeys spawned from monkey cubes 2019-09-14 21:18:45 -04:00
Fox McCloud
bdcdfc04f0 Hierophant Update 2019-09-13 19:35:41 -04:00
AzuleUtama
30547d2bae Fixes 'Name' design in R&D console 2019-09-13 20:12:39 +01:00
variableundefined
5a9ede4ee1 Merge pull request #12281 from Dave-TH/health_insurance_cutbacks
Nerfs Miners
2019-09-13 09:34:57 -04:00
variableundefined
894ffab1ae Merge pull request #12277 from Fox-McCloud/removes-roman-armor
Removes Real Armor from Autodrobe
2019-09-13 08:15:46 -04:00
Dave
454ea46587 Let's be honest, the miners are going to die either way 2019-09-13 01:08:55 -04:00
variableundefined
e571d30f74 Merge pull request #12266 from Fox-McCloud/hydro-update
Hydroponics Update: Growable Ash Flora
2019-09-12 22:40:01 -04:00
variableundefined
9c88e72cc3 Merge pull request #12271 from AzuleUtama/nukeOpsItemTweaks
Nuclear Operative Item Tweaks
2019-09-12 19:49:34 -04:00
Fox McCloud
94a2861039 Removes Real Armor from Autodrobe 2019-09-12 01:07:58 -04:00
Fox McCloud
6f516d0303 Merge remote-tracking branch 'upstream/master' into ash-drake-rework 2019-09-12 00:42:34 -04:00
Fox McCloud
60c04285cf Bubblegum rework 2019-09-11 23:06:34 -04:00
variableundefined
db211cfc54 Deconflict 2019-09-11 23:00:13 -04:00
Kyep
7778c91c45 semi-mirror TG PR 46425 2019-09-11 16:13:35 -07:00
AzuleUtama
c6d846b6b6 Nuclear Operative Item Tweaks 2019-09-11 21:25:44 +01:00
Fox McCloud
59082ff21a space dragonnnn 2019-09-11 13:52:33 -04:00