Commit Graph

6499 Commits

Author SHA1 Message Date
TheDZD
06eafc8a25 Merge pull request #4407 from Fox-McCloud/no-guns
Refactors Species Gun Handling
2016-05-10 22:46:52 -04: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
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
Mieszko Jędrzejczak
0dc4a3118a Fixes resisting, "Mphmmmph!" 2016-05-08 14:15:29 +02: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
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
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
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
Tastyfish
f2cae8f530 Fixes hostiles runtiming 2016-05-01 01:40:47 -04:00
Aurorablade
dbc65dc7ec tweaks on feedback 2016-04-30 16:04:56 -04:00
IK3I
8d18ce19df Incorporates Suggestions for code format
Redoes get_damaged_organs() to use defines and flags instead of strings.
2016-04-29 21:43:19 -05:00
Fox-McCloud
f1acc84b8c Merge remote-tracking branch 'upstream/master' into hair 2016-04-29 19:48:49 -04:00
Fox McCloud
e34fa95fae Merge pull request #4187 from QuinnAggeler/Paradise-drask
New race, the Drask
2016-04-29 19:40:45 -04:00
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00
HugoLuman
4b52de7791 Sets the right alarm levels, removes ptless else 2016-04-28 18:45:21 -07:00
Fox McCloud
ad16e065af Merge pull request #4314 from Crazylemon64/autosay_fix
Fixes autosay to no longer create AIs for their messages
2016-04-28 20:23:37 -04:00
HugoLuman
e255434a8f Adds the new alerts to Drask breath code 2016-04-28 16:36:44 -07:00
HugoLuman
97e07ba05f Fixes copy error, outdated alert code
Removes outdated alert code for breath temperatures, fixes copy error in regen tier 1
2016-04-28 16:15:39 -07:00
Fox McCloud
8892def83c Merge pull request #4289 from pinatacolada/pman
Plasma security now spawn with their gun in the bag
2016-04-28 18:39:41 -04:00
Fox-McCloud
d29ceda262 Merge remote-tracking branch 'upstream/master' into hair 2016-04-28 18:37:56 -04:00
Crazylemon64
501fa17958 Fixes autosay to no longer create AIs for their messages 2016-04-28 14:53:52 -07:00