Commit Graph

13118 Commits

Author SHA1 Message Date
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
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
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
Tastyfish
646fb39f2d Replaces in-script json encoder/decoder with the native 510 procs 2016-04-30 19:15:07 -04:00
Aurorablade
dbc65dc7ec tweaks on feedback 2016-04-30 16:04:56 -04:00
TheDZD
42a5810de3 Merge pull request #4326 from Fox-McCloud/even-less-lag
Makes Explosion and Singulo Defer Based on CPU
2016-04-30 09:57:01 -04:00
TheDZD
5ca5cff788 Merge pull request #4320 from IK3I/Tox-Comp-Fix
Adds check for synthetic parts in tox-comp
2016-04-30 09:34:55 -04:00
Fox-McCloud
8322aa9338 Tesla Update/Rebalance 2016-04-30 06:44:01 -04:00
Fox-McCloud
2d90585ecc Makes Explosion and Singulo Defer Based on CPU 2016-04-30 05:17:45 -04:00
Tastyfish
3b59d2cd15 Defers pipenet and powernet rebuilds upon destruction of pipes and cables so explosions are faster 2016-04-29 23:42:47 -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
TheDZD
411dbdcf40 Merge pull request #4246 from FlattestGuitar/lightbulbs
Lightbulbs no longer burn you, lighters do a bit less.
2016-04-29 19:44:01 -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
HugoLuman
c7d2359a1f Moves Drask to the end of the species list
Puts them in proper numerical order in client procs.dm
2016-04-29 14:08:11 -07:00
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00
Fox McCloud
7adaa11a46 Merge pull request #4317 from Tastyfish/check-antags
Fixes Check Antagonists Panel
2016-04-28 22:34:55 -04:00