Commit Graph

11877 Commits

Author SHA1 Message Date
Fox McCloud
bfd3eb2a9d Merge pull request #3188 from Crazylemon64/poor-communication-kills
Bomb guardians notify their master when they ready a bomb
2016-01-11 21:06:51 -05:00
FalseIncarnate
7b581a8150 Revolver Fixes
Fixes the revolver being named "revolver" instead of ".38 Mars Special"
(was an issue even before #2722, but no one besides Fox seemed to
realize that due to the way the code was)

Fixes revolvers not actually getting the Spin verb to spin the chambers
as advertised in #2722
- verb and proc are similar, yet different.
2016-01-11 01:47:18 -05:00
Fox McCloud
a2f944cfd9 Merge pull request #2722 from ZomgPonies/russian
Revolver Stuff
2016-01-11 00:18:21 -05:00
TheDZD
1a87817add Merge pull request #3189 from Fox-McCloud/more-optimizations
More Mutadone Optimizations
2016-01-10 23:29:03 -05:00
TheDZD
72f124d1b6 Merge pull request #3177 from Fox-McCloud/armory-tweak
Armory Tweak
2016-01-10 23:26:38 -05:00
Fox-McCloud
81da5906c8 even more optimization 2016-01-10 21:02:00 -05:00
Fox-McCloud
34fbc33c38 More Mutadone Optimizations 2016-01-10 19:35:54 -05:00
TheDZD
4941d804fa Merge pull request #3184 from ParadiseSS13/revert-3166-Tail-Fix
Revert "Fixes Tails Overlaying Arms"
2016-01-10 18:17:12 -05:00
Fox McCloud
f42db0f8b8 Merge pull request #3180 from Kyep/obsannoyance
Clarified confirmation prompts for ghosting
2016-01-10 18:04:49 -05:00
Fox McCloud
47dd494651 Merge pull request #3173 from tigercat2000/nano_javashript
NanoUI Shit (Part 3) - JavaShit
2016-01-10 18:04:22 -05:00
Crazylemon64
1fb0a336a7 Bomb guardians notify their master when they ready a bomb
Summmoners can't trip their own guardian bombs, for good measure

Bomb guardian summoners can now safely defuse their guardian's bombs
2016-01-10 13:51:44 -08:00
Fox-McCloud
f4b82fed69 Fixes Mutadone Causing Massive Performance Issues 2016-01-10 09:52:52 -05:00
Fox McCloud
274b9df69f Revert "Fixes Tails Overlaying Arms" 2016-01-10 08:04:07 -05:00
Kyep
41d84eb2f8 Clarified confirmation prompt for chars ghosting while alive 2016-01-10 00:00:42 -08:00
Kyep
e73b84abd4 Clarified new_player observation button message
Previous message stated 30 minutes. This was wrong.
2016-01-09 23:59:45 -08:00
TheDZD
f36e636d4b Merge pull request #3166 from KasparoVy/Tail-Fix
Fixes Tails Overlaying Arms
2016-01-09 23:52:26 -05:00
TheDZD
73225f6d5b Merge pull request #3158 from Crazylemon64/RAEGIN'-MAEGES!!!
Fixes RAGIN' MAGES
2016-01-09 23:52:12 -05:00
Fox-McCloud
576eb179e1 Armory Tweak 2016-01-09 23:29:35 -05:00
TheDZD
576a726431 Merge pull request #3159 from Fox-McCloud/posibrain-nerf
Positronic Brain Balance
2016-01-09 23:12:19 -05:00
Fox-McCloud
3b16c556f4 Supermatter Fix 2016-01-09 21:46:02 -05:00
Tigercat2000
a615fec97f Update client topic debugging 2016-01-09 09:34:44 -08:00
Crazylemon64
421c5688ab Basic operation complete! 2016-01-09 02:46:49 -08:00
Crazylemon64
c6b5df6cfe Gets things functional
My human-from-client-prefs runtimes like crazy, though
2016-01-09 02:25:07 -08:00
TheDZD
33f76d9f3b Merge pull request #3153 from Fox-McCloud/hulk-balance
Hulk Balance
2016-01-08 19:26:07 -05:00
KasparoVy
8c2acbfc8c Sorts out Commenting 2016-01-08 18:13:01 -05:00
TheDZD
da141868a3 Merge pull request #3152 from Fox-McCloud/tesla-tweak
Balances the Tesla
2016-01-08 17:28:54 -05:00
TheDZD
82b12d1a34 Merge pull request #3164 from Fox-McCloud/uplink-fixes
Uplink and Syndicate Cyborg Fix
2016-01-08 17:28:40 -05:00
KasparoVy
16c5af933c Fix Pass 2
Corrects the issue in Fix Pass 1

The tail's north sprite will only be rendered to the tail layer, so it
won't overlap arms and gloves.
2016-01-08 17:16:28 -05:00
Fox-McCloud
a21d1b5221 Uplink and Syndicate Cyborg Fix 2016-01-08 17:07:33 -05:00
KasparoVy
0c0f505d82 Fix Pass 1
Issue: Facing north means the tail is overlayed by just about everything
but the body.
2016-01-08 16:33:57 -05:00
TheDZD
6ad459e52c Merge pull request #3144 from Fox-McCloud/electrifying
Adds in Overloading of APCs
2016-01-08 15:16:37 -05:00
Fox McCloud
efbe361853 Merge pull request #3149 from DaveTheHeadcrab/friendlyfire
Adds Fun
2016-01-08 15:13:24 -05:00
Fox McCloud
aa6e5d8e8a Merge pull request #3161 from Tastyfish/observervation
Interrogation Observervation & some emote pronoun fixes
2016-01-08 15:06:35 -05:00
Fox-McCloud
a940a4ece1 tweaks 2016-01-08 15:01:40 -05:00
Fox McCloud
05c68fa9ef Merge pull request #3143 from Crazylemon64/i_hate_fun
Makes everything terrible
2016-01-08 14:03:32 -05:00
Tastyfish
0a9389e51a Fixed some emotes to handle pronouns correctly 2016-01-08 09:17:19 -05:00
Fox-McCloud
5cbaa5e8fd beep-boop 2016-01-08 03:06:51 -05:00
Fox-McCloud
3000fd495f Positronic Brain Balance 2016-01-08 02:50:20 -05:00
Fox McCloud
6f70f7790f Merge pull request #3139 from DaveTheHeadcrab/idedplsnerf
Tweaks .38 Rubber Bullet Damage
2016-01-08 00:44:39 -05:00
SamCroswell
0b69e3dfd7 I submit to overlord Fox! 2016-01-08 00:40:51 -05:00
TheDZD
bbcac90906 Merge pull request #3135 from Fox-McCloud/timestop
Timestop Spell Port and Sepia Slimes
2016-01-07 19:56:45 -05:00
TheDZD
f5f90c720b Merge pull request #3154 from Fox-McCloud/damage-fix
Fixes Take Overall Damage
2016-01-07 19:56:27 -05:00
TheDZD
8c438d84d4 Merge pull request #3150 from Fox-McCloud/strange-reagent-fix
Strange Reagent Fix
2016-01-07 19:56:22 -05:00
Fox McCloud
fd2e2c3649 Merge pull request #3133 from KasparoVy/Vox-Masks
Vox Mask Additions+Adjustments, Removes Duplicate Human Balaclava
2016-01-07 19:53:05 -05:00
Fox-McCloud
b5af35f7d0 Fixes Take Overall Damage 2016-01-07 19:27:54 -05:00
Fox-McCloud
39e9a420c3 Hulk Balance 2016-01-07 19:11:01 -05:00
Fox-McCloud
4ed2f89872 Balances the Tesla 2016-01-07 16:43:38 -05:00
Fox-McCloud
d6caea6aa0 Strange Reagent Fix 2016-01-07 16:16:45 -05:00
SamCroswell
96f7f48f32 Properly spells magazine 2016-01-07 15:17:44 -05:00
SamCroswell
eb8b2cc09f Adds Fun 2016-01-07 15:08:12 -05:00