13099 Commits

Author	SHA1	Message	Date
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	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
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
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
Tastyfish	5268804db0	Fixes Check Antagonists Panel	2016-04-28 22:23:42 -04:00
HugoLuman	5dfb7b9851	Fixes the karma buy order in karma.dm ... Hopefully this won't mess up what species people have unlocked now	2016-04-28 19:00:43 -07:00
HugoLuman	6285d42236	Fixes the karma buy order in client procs.dm ... Hopefully this won't rearrange what species people have unlocked now	2016-04-28 18:59:53 -07:00
HugoLuman	4b52de7791	Sets the right alarm levels, removes ptless else	2016-04-28 18:45:21 -07:00
Fox McCloud	a883a7a6f6	Merge pull request #4305 from LittleBigKid2000/whydoesitneedtobecanned ... Booze dispensers can now dispense synthanol	2016-04-28 20:23:56 -04: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
Fox McCloud	b743ae0ac2	Merge pull request #4315 from IK3I/No-Drop-Holster-Fix ... Prevents Holstering of No-Drop items	2016-04-28 20:23:24 -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
IK3I	ec4ba9f5f6	Prevents Holstering of No-Drop items	2016-04-28 18:00:44 -05: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
Isaac Erwin	42c48eec77	Fixes the spacing on the dispensable reagents for the chem, booze, and soda dispensers ... Now's a better time than ever	2016-04-28 09:08:02 -04:00
Isaac Erwin	013d334de0	Booze dispensers can now dispense synthanol	2016-04-27 19:40:53 -04:00
Aurorablade	68a4a0a417	Stealth canes	2016-04-27 19:33:10 -04:00
Aurorablade	7a99d8fe74	Crazy Fethas Traitor Emporium of Horrors	2016-04-27 19:09:21 -04:00