Commit Graph

11894 Commits

Author SHA1 Message Date
Crazylemon64
de13a4e4d3 Various Ragin' Mages fixes
* Additionally, increases the number of memes in the codebase
2016-01-13 21:56:56 -08:00
TheDZD
e0b854ce32 Merge pull request #3179 from Kyep/blob_vs_virus
Blob vs virus
2016-01-13 16:09:22 -05:00
TheDZD
c2ad89b0ec Merge pull request #3200 from Fox-McCloud/clone-damage
Clone Damage Fix
2016-01-13 16:05:10 -05:00
TheDZD
25920c8b70 Merge pull request #3213 from Fox-McCloud/revolver-fix
Fixes Revolver Spin Runtime
2016-01-13 16:00:17 -05:00
Kyep
d6237b83ca Reclassified events based on github feedback
Blob is now "level 5 biohazard", spacevine is now "level 7 biohazard",
viral infection is now "level 7 viral biohazard" and viral outbreak is
now "level 7 major viral biohazard". This is very close to how it was
originally, the only changes being (A) viral infection moving from 5 to
7, which the other viral event was already at anyway, and (B) viral
outbreak being called 'major viral' instead of just 'viral' so outbreaks
and infections are subtly different. This makes it a little easier to
distinguish blob (now the only 5) from the others, and still preserves
the numbered levels, making the handling of virus events slightly more
consistent in the process. If you want to stick with numbered levels,
I'd like to split them up a bit more (as tigercat suggested), but I
cannot make new sound/AI/outbreak*.ogg files, so this is a compromise
which makes blob a little easier to distinguish, makes viruses more
consistent, and does so without requiring new sound files.
2016-01-13 01:39:17 -08:00
Fox McCloud
517692d485 Merge pull request #3203 from Tastyfish/multipens
Added multicolor pens for NT Rep, Magistrate, and IAA
2016-01-13 02:35:03 -05:00
Fox McCloud
f137005432 Merge pull request #3212 from Crazylemon64/fun-is-the-best
Makes everything wonderful
2016-01-13 00:06:27 -05:00
Fox-McCloud
db90f5118b Fixes Revolver Spin Runtime 2016-01-13 00:04:09 -05:00
Tastyfish
adb2edc85a Adds multicolor pens and makes gold & fountain pen subtypes 2016-01-12 00:02:26 -05:00
Fox McCloud
82b84421cf Merge pull request #3198 from CrAzYPiLoT-SS13/master
Footsteps fix
2016-01-11 22:24:20 -05:00
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
Fox-McCloud
a746786ee0 Clone Damage Fix 2016-01-11 20:56:00 -05:00
CrAzYPiLoT
626c8b4c26 Footsteps fix
Fixes half of #2786, other half has already been fixed
2016-01-11 23:56:33 +01:00
Crazylemon
499b967aaf Fun is the best, have it always
This reverts commit e6842e216a.
2016-01-11 13:12:34 -08: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
Kyep
a48ee3af05 Making virus v blob v vine clearer 2016-01-09 23:44:18 -08:00
Kyep
d00039f971 Made virus v blob v spacevine clearer 2016-01-09 23:43:36 -08:00
Kyep
3e39a352a5 clarifying Blob vs Virus vs Spacevine 2016-01-09 23:41:53 -08:00
Kyep
21171a35f5 clarifying Blob vs Virus 2016-01-09 23:41:10 -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