9044 Commits

Author	SHA1	Message	Date
ZomgPonies	17dfe4e481	Merge pull request #668 from Fox-McCloud/Goonchem-Stuffs ... [Goonchem] FirstAid Transitions and Chem Adjustsments+Fixes	2015-03-25 09:33:21 -04:00
Fox-McCloud	279ea75e62	Touch Ups	2015-03-25 09:12:10 -04:00
Fox-McCloud	3e1fac8c94	[Goonchem] FirstAid Transitions	2015-03-25 08:45:36 -04:00
Fox-McCloud	dbb04f4dbb	[Goonchem] Few Additional Chemicals	2015-03-25 03:50:54 -04:00
Fox-McCloud	84a659605d	Merge pull request #663 from Iamgoofball/muh_doctors_delight ... MUH FIXES	2015-03-25 00:18:05 -04:00
Iamgoofball	4f3cc168a4	fixes facid and makes it work, renames bad food	2015-03-24 21:11:18 -07:00
Iamgoofball	f165cb7079	muh fixes 2.0	2015-03-24 21:01:02 -07:00
Iamgoofball	cea9957062	MUH FIXES	2015-03-24 20:54:59 -07:00
Fox-McCloud	d005152fe6	Merge pull request #652 from ZomgPonies/prisonbreak ... Fixed prison break event	2015-03-24 23:18:30 -04:00
Fox-McCloud	b30d3f795f	Goonchem Map Changes	2015-03-24 22:48:25 -04:00
Iamgoofball	19fa3848fb	i forgot to remove old cyanide in favor of new cyanide, rippers	2015-03-24 19:19:03 -07:00
Iamgoofball	015c9d4a11	muh spans	2015-03-24 18:20:50 -07:00
Iamgoofball	d091031ca6	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into muh_doctors_delight ... Conflicts: code/modules/reagents/Chemistry-Machinery.dm	2015-03-24 18:03:11 -07:00
Iamgoofball	f5f172652e	snowflake code makes me *scream	2015-03-24 17:58:10 -07:00
ZomgPonies	1a09f728ed	Merge pull request #644 from Fox-McCloud/Chemistry-Tweaks ... Chemistry Balance: Plasma	2015-03-24 20:50:33 -04:00
ZomgPonies	8012022f5d	Merge pull request #642 from SamCroswell/HolyWaterBalance ... Vampire Holy Water Balancing	2015-03-24 20:50:23 -04:00
Iamgoofball	1278f31661	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into muh_doctors_delight ... Conflicts: code/modules/reagents/Chemistry-Reagents.dm	2015-03-24 16:35:06 -07:00
Iamgoofball	ae2240f513	fuck shit goddamn salglu	2015-03-24 14:03:40 -07:00
Iamgoofball	20afecd650	help this guy died of styptic pills worst coder 2015	2015-03-24 13:02:09 -07:00
Fox-McCloud	6b543f37ff	Merge remote-tracking branch 'upstream/master' into Health-Analyzer	2015-03-24 15:53:37 -04:00
ZomgPonies	928a9a7c88	Fixed prison break event	2015-03-24 11:54:55 -04:00
ZomgPonies	3db10c7c37	Merge pull request #635 from Fox-McCloud/Taperecorder ... Taperecorder Rework	2015-03-24 08:01:16 -04:00
Iamgoofball	e5264815ee	GOONCHEM	2015-03-24 02:04:47 -07:00
Fox-McCloud	b095f866df	Chemistry Balance	2015-03-24 00:33:24 -04:00
SamCroswell	a6f251574a	Adds an observer message for vampires combusting	2015-03-23 22:20:22 -04:00
SamCroswell	b1ae7d37c3	Vampire Holy Water Balancing	2015-03-23 22:14:48 -04:00
Mark van Alphen	bd1e58aa0e	Merge pull request #632 from SamCroswell/master ... Adds Admin Boozes	2015-03-24 02:45:44 +01:00
Fox-McCloud	69bc15604d	Health Analyzer Upgrading	2015-03-23 19:44:06 -04:00
ZomgPonies	56de2ab011	Merge pull request #631 from tigercat2000/SpessPodUpdates ... Massive spacepod construction overhaul by /VG/	2015-03-23 16:53:13 -04:00
ZomgPonies	a45c9b987d	Merge pull request #633 from Fox-McCloud/Best-Emag-Use ... Fixes There Not Being a Best Emag Use	2015-03-23 11:13:44 -04:00
Mark van Alphen	69fb729dc1	Merge pull request #626 from Fox-McCloud/Guns-Fixes ... Teleporter Gun, Fixes, and Tweaks	2015-03-23 15:38:44 +01:00
Mark van Alphen	f8605bd406	Merge pull request #608 from Fox-McCloud/Temporary-Fires ... New Feature: Temporary Fires, Napalm Rework, and Dragon's Breath Round Fix	2015-03-23 15:38:28 +01:00
Tigercat2000	2f0c9950ef	Increase weapons costs	2015-03-23 11:43:55 +01:00
Tigercat2000	8519d592b4	Update to Fox's specifications	2015-03-23 11:39:39 +01:00
Fox-McCloud	aa5cdae070	Taperecorder Rework	2015-03-23 05:45:15 -04:00
Fox-McCloud	c576402ea9	Fixes There Not Being a Best Emag Use	2015-03-23 01:06:19 -04:00
SamCroswell	02638d1a60	Adds admin boozes	2015-03-22 21:54:49 -04:00
Tigercat2000	76ffbbfd59	Massive spacepod construction overhaul by /VG/	2015-03-23 02:36:49 +01:00
Fox-McCloud	cedb71e8af	Clarity	2015-03-22 20:18:01 -04:00
Fox-McCloud	9f59b20303	Merge pull request #624 from Artorp/meat ... Fixes meat harvesting of some simple_animals	2015-03-22 17:59:48 -04:00
Fox-McCloud	2d4f754edb	Merge pull request #628 from tigercat2000/FixStatueClick ... Add clickdelay to attacking statues & lights	2015-03-22 17:59:00 -04:00
Tigercat2000	7b84658a33	Fix giving things to non-carbons	2015-03-22 19:50:55 +01:00
Tigercat2000	86f8ed5111	Fixes related issue with spamclicking lights	2015-03-22 18:36:54 +01:00
Fox-McCloud	d9a257c890	Teleporter Gun, Fixes, and Tweaks	2015-03-22 02:45:02 -04:00
Artorp	e7434672bc	Fixes meat harvesting of some simple_animals	2015-03-22 05:08:32 +01:00
Artorp	fc45243f8a	Bugfixes ... - Disables random events by default, requires config.txt to enable random events - Makes portable turrets respect its preset anchored value - Gives flamethrower a real category	2015-03-21 13:39:00 +01:00
Fox-McCloud	9749c04d15	Merge pull request #605 from FalseIncarnate/master ... Grape Juice	2015-03-21 01:58:02 -04:00
Fox-McCloud	ba28d8e5b3	Incendiary Grenade	2015-03-20 17:02:22 -04:00
Mark van Alphen	a50db87e12	Merge pull request #609 from Fox-McCloud/Xeno-Temp ... Xeno Space Fix	2015-03-20 21:30:30 +01:00
Fox-McCloud	3d89f8707c	Xeno Space Fix	2015-03-20 16:10:11 -04:00