Commit Graph

21432 Commits

Author SHA1 Message Date
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
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
TheDZD
709709bfbe Merge pull request #4337 from Fox-McCloud/game-mode-adjustments
Game Mode Population Adjustments
2016-05-04 18:08:46 -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
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
HugoLuman
4bb70da62b Update turrets.dm
Changes gun turret code to be more customizable
It is now possible to specify new sprites and firing sounds, in addition to projectiles, stats, and faction
2016-05-02 20:47:07 -07: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
Fox McCloud
3ad1aa22d5 Merge pull request #4334 from LittleBigKid2000/shutup
Makes slot machines less spammy
2016-05-02 16:30:58 -04:00
Fox-McCloud
4f5b4f4677 cleanup 2016-05-02 00:43:24 -04:00
Fox-McCloud
ba154028c8 Game Mode Population Adjustments 2016-05-01 21:29:19 -04: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
Isaac Erwin
00e6e73f32 Re-adds the 10 and 50 credits won messages 2016-05-01 01:39:27 -04:00
Isaac Erwin
c339893502 Makes slot machines only show a message to nearby people when someone wins at least 100 credits
The person playing the slots is still notified, and the sound still
plays. Now slot machines won't clog up the chat with "No luck!".
2016-05-01 00:35:29 -04:00
Fox McCloud
ad43910cbf Merge pull request #4324 from Crazylemon64/autosay_fix
Adds a noisy deletion timer to autosay mobs
2016-04-30 21:35:57 -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
Tastyfish
7c85fc71eb Fixes timer runtimes 2016-04-30 07:00:56 -04:00
Fox-McCloud
8322aa9338 Tesla Update/Rebalance 2016-04-30 06:44:01 -04:00
Crazylemon64
f8ce4e5fb2 Traitor panel now properly removes special role from deculted cultists 2016-04-30 03:10:37 -07:00
Fox-McCloud
2d90585ecc Makes Explosion and Singulo Defer Based on CPU 2016-04-30 05:17:45 -04:00
Crazylemon64
e6258c31cf Adds name and message 2016-04-30 01:42:36 -07: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
Crazylemon64
71c6dfb4b6 I did something dumb 2016-04-29 18:15:23 -07:00
Crazylemon64
df583c0196 No runtimes allowed ever 2016-04-29 18:14:10 -07:00
Crazylemon64
95123e5360 Makes the message better 2016-04-29 18:11:43 -07:00
Crazylemon64
55bdf1c3ce Adds a noisy deletion timer to autosay mobs
so we don't have silent failure
2016-04-29 18:08:57 -07:00
TheDZD
76650a79ce Merge pull request #4293 from Fox-McCloud/hair
Hair Request
2016-04-29 19:53:19 -04:00
Fox-McCloud
f1acc84b8c Merge remote-tracking branch 'upstream/master' into hair 2016-04-29 19:48:49 -04:00
TheDZD
66c5b2cd9a Merge pull request #4321 from Fox-McCloud/cig-fix
Cig Icon FIx
2016-04-29 19:48:26 -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