Mieszko Jędrzejczak
62637145c5
*insert coherent commit description here*
2016-05-07 17:18:46 +02:00
Mieszko Jędrzejczak
91d3757944
Rebalanced, unsnowflaked
2016-05-07 17:02:03 +02:00
Mieszko Jędrzejczak
48888c891c
Tape gags for all
2016-05-07 15:02:38 +02: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
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
Fox-McCloud
52bc145c17
botany and more reagents
2016-05-06 03:43:31 -04:00
FalseIncarnate
a68ddb1116
Global Intercom list, minor code cleanup round 2
2016-05-06 03:20:00 -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
Fox-McCloud
38278e2f58
random drugs
2016-05-05 22:50:46 -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
Fox McCloud
c8e94bb7af
Merge pull request #4301 from IK3I/master
...
Adds Pod Locks
2016-05-05 21:39:19 -04:00
Fox McCloud
09d686611b
Merge pull request #4348 from pinatacolada/nad
...
prevents implanting fukken disks in boxes inside of people
2016-05-05 21:36:51 -04:00
TheDZD
b4e923fa5c
Merge pull request #4353 from Fox-McCloud/food-tweak
...
Mushrooms No Longer Taste Nasty
2016-05-05 21:22:14 -04:00
TheDZD
9a4c1125e0
Merge pull request #4343 from Fox-McCloud/accelerator-cannon
...
Ports Accelerator Laser Cannon
2016-05-05 21:22:08 -04:00
Tastyfish
71a7f10b7f
Unbroke the pda manifest
2016-05-05 20:36:32 -04:00
Fox-McCloud
1facb7a397
love and hugs
2016-05-05 19:50:29 -04:00
FalseIncarnate
e5b6ad0256
Minor code cleanup
2016-05-05 14:42:57 -04:00
Fox-McCloud
d8375f09f2
initro, why not
2016-05-05 07:13:25 -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
Fox-McCloud
77d291bd3f
cap
2016-05-04 21:08:35 -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
Fox-McCloud
08ec1db17e
food poisoning
2016-05-04 19:58:44 -04:00
TheDZD
443b4ae6ea
Merge pull request #4352 from Fox-McCloud/tesla-shock-gun
...
Tesla Gun Implementation and Small R&D Change
2016-05-04 18:55:04 -04:00
Fox-McCloud
d2388f98e2
Mushrooms No Longer Taste Nasty
2016-05-04 18:20:06 -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
311141225a
tweak
2016-05-04 18:08:33 -04:00
Fox-McCloud
2328ff2be5
Tesla Gun Implementation and Small R&D Change
2016-05-04 17:13:28 -04:00
pinatacolada
bc1eeb432b
betterlocatorinos
2016-05-04 21:49:35 +01:00
pinatacolada
0f3f961ce0
locatorinos
2016-05-04 20:56:27 +01:00
pinatacolada
7e0b1302ec
prevents implanting fukken disks in boxes inside of people
...
fixes #4347
2016-05-04 14:31:43 +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
Aurorablade
37d9cc49dc
removes from uplink until fixed
...
renames old sniper icons to esniper and new sniper to just sniper
2016-05-04 00:34:28 -04:00
Fox-McCloud
2bcda77cf7
oops
2016-05-03 20:31:37 -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
c3c3ad2602
Ports Accelerator Laser Cannon
2016-05-02 23:50:38 -04:00
Aurorablade
5f0dde2f65
Apprently this ammo isn't a thing on TG anymore
2016-05-02 23:25:46 -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
TheDZD
5435084dc7
Merge pull request #4328 from Fox-McCloud/tesla-update
...
Tesla Update/Rebalance
2016-05-01 12:52:40 -04:00
Fox McCloud
1e31f99002
Merge pull request #4335 from Tastyfish/hostilewerdsf
...
Fixes hostiles runtiming on targetting
2016-05-01 04:07:07 -04:00
Tastyfish
f2cae8f530
Fixes hostiles runtiming
2016-05-01 01:40:47 -04:00
Fox McCloud
d78bcda241
Merge pull request #4332 from Tastyfish/json510
...
Replaces byondscript json encoder/decoder with the native 510 procs
2016-04-30 21:17:03 -04:00
Fox McCloud
0f1100de7f
Merge pull request #4333 from Tastyfish/cans
...
Adds missing crushed cans sprites
2016-04-30 20:39:28 -04:00
Tastyfish
8cd8ebffe3
Adds missing crushed cans, make cans that are technically bottles smash.
2016-04-30 20:12:48 -04:00
