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
Fox-McCloud
f4b82fed69
Fixes Mutadone Causing Massive Performance Issues
2016-01-10 09:52:52 -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
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
Crazylemon64
0a91b351c0
SSD people fall asleep more reliably
2016-01-07 09:05:52 -08:00
Fox-McCloud
3b73425d31
Adds in Overloading of APCs
2016-01-07 03:59:05 -05:00
Crazylemon64
e6842e216a
Fun is the worst, don't have it ever
2016-01-07 00:28:40 -08:00
Fox McCloud
840c519321
Merge pull request #3131 from FalseIncarnate/master
...
Plant Age, Weeds, and Pest Tweaks
2016-01-07 00:17:15 -05:00
SamCroswell
68cfea1e7c
Reduces Detective's Revolver Damage
2016-01-06 21:43:09 -05:00
Fox-McCloud
c09fcb6e14
Pshhhooooommmmm
2016-01-06 15:40:04 -05:00
Tigercat2000
75659a2654
Merge remote-tracking branch 'upstream/master' into I_KEEP_MAKING_FEATURES_HELP
...
Conflicts:
nano/assets/nanoui.css
nano/styles/_lists.less
2016-01-06 07:44:24 -08:00
Fox-McCloud
f641cc2710
balance
2016-01-06 03:40:36 -05:00
Fox-McCloud
ebdd9d3897
Timestop Spell Port and Sepia Slimes
2016-01-06 03:30:08 -05:00
KasparoVy
99adf343e8
Adds New Vox Masks and up-State Sprites, Adjusts Existing up-State Sprites, Removes Duplicate Sprite
...
**Adds:**
* Vox Security gasmask.
* Vox Sexy Mime mask.
* All Bandanas for Vox.
* Balaclava + up state.
* Welding gas mask + up state.
* All Wrestling masks for Vox.
* Up state sprites for Vox Breath, Medical and Surgical masks.
**Removes:**
* Duplicate of the up state for the balaclava in the human masks.dmi
**Tweaks:**
* Vox plague-doctor mask, now fits Vox anatomy.
* Vox fake moustache, now appears in the correct location.
* Vox Sterile/Surgical mask sprite, now fits Vox anatomy.
* Vox Medical mask sprite, now fits Vox anatomy.
2016-01-06 00:50:10 -05:00
Fox McCloud
14982126db
Merge pull request #3132 from Tastyfish/blueshield-is-not-sec
...
Fixed blueshield mission briefing
2016-01-06 00:04:41 -05:00
