Commit Graph

6813 Commits

Author SHA1 Message Date
KasparoVy
e5fae9c078 Small Fix
Fixes rare occasions where markings (IPC optics) and head accessories
wouldn't reset if you switched species via C.M.A.
2016-05-10 02:23:41 -04:00
KasparoVy
13003fe351 Merge branch 'temp2' into temp 2016-05-10 00:10:15 -04:00
VampyrBytes
0633176893 fixes derps in merge 2016-05-10 04:33:21 +01:00
VampyrBytes
9e0d053143 fixes conflicts 2016-05-10 04:12:55 +01:00
TheDZD
6560ec9bc6 Merge pull request #4380 from Fox-McCloud/simple-animal-damage
Simple Animal Damage Fix+Change
2016-05-09 21:23:50 -04:00
TheDZD
be16c5612c Merge pull request #4386 from Fox-McCloud/emote-fixup
Emotes work when not in lowercase
2016-05-09 19:13:11 -04:00
TheDZD
596485e304 Merge pull request #4385 from FlattestGuitar/tapegag
Tape gags for all
2016-05-09 19:12:53 -04:00
TheDZD
3e4c7a77bd Merge pull request #4381 from Tastyfish/macros-macros-everywhere
Some math, mob helper, etc one-liner optimizations
2016-05-09 19:07:13 -04:00
Matt
10780aa200 Adds pAIzing 2016-05-10 00:02:55 +02:00
Fox-McCloud
4f8c42484e Refactors Species Gun Handling 2016-05-09 16:31:51 -04:00
Fox-McCloud
67bee9ad5f missing ones 2016-05-09 03:10:40 -04:00
Fox-McCloud
f73ec5a20e Removes Players Ready From Lobby 2016-05-09 02:11:53 -04:00
Mieszko Jędrzejczak
0dc4a3118a Fixes resisting, "Mphmmmph!" 2016-05-08 14:15:29 +02:00
IK3I
f63328262f Completes Stage One of Occupant Refactor
Occupants are now members of a list with a maximum size and a special
associative tag for pilots. Gating the verbs and testing is still
needed.
2016-05-08 04:24:48 -05:00
VampyrBytes
e61d774a7c Makes emotes case insensitive (#4386)
Also prevents unconscious emoting
2016-05-08 05:34:31 +01:00
Fox McCloud
2474b73376 Merge pull request #4377 from QuinnAggeler/drask-fluff
Drask fluff additions
2016-05-07 22:55:40 -04:00
Mieszko Jędrzejczak
b43116ca87 Mumbles 2016-05-07 19:18:18 +02:00
Fox-McCloud
45596f7381 refactor 2016-05-07 11:48:51 -04:00
Fox-McCloud
73ae1cdce3 simple animal health fixes 2016-05-07 11:10:40 -04:00
Mieszko Jędrzejczak
91d3757944 Rebalanced, unsnowflaked 2016-05-07 17:02:03 +02:00
Fox-McCloud
83b522e289 Emotes work when not in lowercase 2016-05-07 10:29:32 -04:00
Mieszko Jędrzejczak
48888c891c Tape gags for all 2016-05-07 15:02:38 +02:00
Fox-McCloud
b6ef174c07 Simple Animal Damage Fix 2016-05-07 01:28:11 -04:00
Fox McCloud
cd3381d0a0 Merge pull request #4356 from FalseIncarnate/botany
Briefcase Full of BEES!
2016-05-06 23:28:11 -04:00
Fox-McCloud
6f240e7ea4 Abductor Spelling Correction Fix 2016-05-06 21:03:24 -04:00
HugoLuman
4b835f6c1e Adds an emote for Drask talk sounds, gives them the ability to eat soap 2016-05-06 16:42:50 -07:00
TheDZD
f5c35a6486 Merge pull request #4357 from Fox-McCloud/chem-stuff-disease
A Few More Disease and Reagents
2016-05-06 18:12:18 -04:00
Fox-McCloud
7838d1b147 living slowed 2016-05-06 18:02:09 -04:00
Tastyfish
82a9612653 Some math, mob helper/ one-liner optimizations 2016-05-06 04:38:59 -04:00
Fox McCloud
75b1af6a39 Merge pull request #4369 from Tastyfish/magic-gloves
Fixes floating gloves on UI
2016-05-05 22:57:21 -04:00
Tastyfish
444aea335b Fixes floating gloves 2016-05-05 21:55:30 -04:00
Fox McCloud
7bdd5300f7 Merge pull request #4339 from FlattestGuitar/roboslur
Robutts slur and stammer robotically
2016-05-05 21:39:30 -04:00
Tastyfish
71a7f10b7f Unbroke the pda manifest 2016-05-05 20:36:32 -04:00
FalseIncarnate
e5b6ad0256 Minor code cleanup 2016-05-05 14:42:57 -04:00
Matt
c2ce4d1a95 Adds unread changes notification 2016-05-05 19:29:01 +02:00
VampyrBytes
974d09da59 Params
Adds support for params.
A few other little tweaks too
2016-05-05 17:40:08 +01:00
Fox-McCloud
45fc535203 A Few More Disease and Reagents 2016-05-05 00:46:04 -04:00
FalseIncarnate
9a39567189 Briefcase Full of BEES!
The situation has only been made worse by the addition of yet more bees!

Adds the brand new botanist traitor item: BRIEFCASE FULL OF BEES!
- Just your average briefcase by looks, but don't be fooled, this
briefcase contains Syndicate-bred bees intent on ruining days.
- Botanist-only traitor item, 10 TC
- On use, it actually ANNOUNCES ITSELF to the station with a
station-wide intercomm broadcast of DR. BEES!
- The sound clip has a cooldown. Releasing the bees does not.
- Comes loaded with 10 bees, releasing up to 5 bees per use
- Inject blood into the briefcase to train the bees still inside (not
ones already released) to NOT attack the donor(s)
- There is no way to put bees back into the case, but rumors abound of a
reagent that can replicate syndi-bees. How strange...

Refactors bee code a bit, and makes normal bees less murder-y
- Fixes #4306

Adds new bee type: Syndi-bee
- Never returns home
- Never pollinates
- More health and slightly more damage
- Normal bees: 10 hp, 1 damage. Syndi-bees: 25 hp, 5 damage
- Always injects Flurosulphiric acid into its victims... EVEN THOSE IN
HARDSUITS
2016-05-05 00:12:44 -04:00
TheDZD
7d6986a650 Merge pull request #4346 from Fox-McCloud/overdose-rework
Overdose Rework and Food Poisoning
2016-05-04 20:52:37 -04:00
TheDZD
d5d26a39a7 Merge pull request #4340 from Fox-McCloud/minor-rev-tweaks
Minor Rev Balance Tweaks
2016-05-04 18:08:42 -04:00
VampyrBytes
f852d98235 Datum Emotes MK II 2016-05-04 15:52:34 +01:00
Fox-McCloud
9dca286988 tweaks and additions 2016-05-04 03:12:58 -04:00
Fox McCloud
c70c8d9c39 Merge pull request #4304 from Aurorablade/JustTraitorThings
Crazy Fethas Traitor Emporium of Horrors
2016-05-04 01:22:13 -04:00
Fox-McCloud
b295e7809e Overdose Rework 2016-05-03 19:55:11 -04:00
Mieszko Jędrzejczak
ebed562e42 Makes it more compact, beep boop. 2016-05-03 10:55:19 +02:00
KasparoVy
9015f11f41 Fixes Morph Being Borked + Additional Features for Morph and C.M.A.
Before it wouldn't update skin colour or eye colour, and ended up breaking the sprite such that C.M.A wouldn't have an effect on it after.

Now it works perfectly fine, C.M.A works just fine too before and after

STAGE 2: Refactors Morph

So you change gender first and thus can actually access male beard styles, then you choose hair style and hair colour, then beard style and beard colour, then skin tone or body colour at the very end.

STAGE 3
Adds Head Accessory, Head Accessory colour, marking style and body accessory to Morph and C.M.A.
2016-05-03 01:50:16 -04:00
Fox-McCloud
1044c5fc88 Minor Rev Tweaks 2016-05-02 20:12:17 -04:00
Mieszko Jędrzejczak
3973771545 Robutts slur and stammer robotically 2016-05-03 01:59:31 +02:00
KasparoVy
8cca627918 Fixes Bug where Facial Hair Wouldn't Update on Death. 2016-05-01 18:40:50 -04:00
Tastyfish
f2cae8f530 Fixes hostiles runtiming 2016-05-01 01:40:47 -04:00