2870 Commits

Author	SHA1	Message	Date
TheDZD	13eb0f6723	Merge pull request #2655 from Fox-McCloud/poultices ... Adds in Aloe Vera and Comfrey and Random Seeds	2015-11-26 12:11:26 -05:00
ZomgPonies	3cb7ec5e08	Bunch of robutt stuff	2015-11-25 22:41:09 -05:00
TheDZD	d79c278fce	Merge pull request #2625 from Aurorablade/FixyFixy ... [Fix] Ghost in the Swarming Shell	2015-11-25 20:06:39 -05:00
TheDZD	1b5b56f1ac	Merge pull request #2656 from RudiPardieck/master ... Fix for harm intent not working on white ui	2015-11-25 19:55:14 -05:00
Fox-McCloud	a5b9f5f78e	Adds in Aloe Vera and Comfrey	2015-11-25 01:37:58 -05:00
Fox-McCloud	6e4817fdce	Merge remote-tracking branch 'upstream/master' into plushies	2015-11-24 21:34:29 -05:00
Aurorablade	1e83404b80	Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into FixyFixy	2015-11-24 21:17:35 -05:00
TheDZD	0f48177082	Merge pull request #2637 from Tastyfish/path_cleanups ... Cleaned up /datum/effect/system paths & some bad path defines	2015-11-24 19:59:46 -05:00
Tastyfish	317760a7de	Merge remote-tracking branch 'upstream/master' into path_cleanups ... Conflicts: code/modules/examine/descriptions/atmospherics.dm	2015-11-24 18:05:01 -05:00
TheDZD	8ee8eb0234	Merge pull request #2636 from ZomgPonies/action ... Adds action figure toys	2015-11-24 17:13:38 -05:00
TheDZD	3d8ebd680a	Merge pull request #2633 from ZomgPonies/hulk ... HULK fixes and balance	2015-11-24 16:47:35 -05:00
Aurorablade	8f3727b35d	silly ghosts, you do not step on glass...	2015-11-24 15:42:09 -05:00
Certh	80f64e73df	Fixed text error when using blueprints	2015-11-24 16:19:11 +01:00
Tigercat2000	b37d04d567	Fix tank UI bugs.	2015-11-24 07:08:02 -08:00
Certh	1ce08fee64	Tiny grammar fix	2015-11-24 16:03:16 +01:00
ZomgPonies	0a318a445f	Makes them spawn randomly in the arcade machines	2015-11-23 21:55:20 -05:00
Fox-McCloud	d38e48f74c	oops	2015-11-23 21:23:14 -05:00
Fox-McCloud	f21b29f260	Adds Plushise--Arcade Changes	2015-11-23 20:54:41 -05:00
ZomgPonies	01b8abb030	Forgot to call parent	2015-11-23 16:03:56 -05:00
ZomgPonies	a462fb21e0	Minor fixes.	2015-11-23 12:18:35 -05:00
ZomgPonies	8093818847	Adds action figures	2015-11-22 19:48:38 -05:00
Tastyfish	85d651b781	refactored datum/effect/system because it was a complete mess	2015-11-22 19:43:01 -05:00
ZomgPonies	ac38463ce6	changed update_icons to update_mutations	2015-11-22 18:52:57 -05:00
ZomgPonies	3d7004af3d	HULK fixes	2015-11-22 14:35:37 -05:00
Fox-McCloud	3662431862	Fixes Wood Amounts	2015-11-21 22:57:23 -05:00
TheDZD	740e5304fd	Merge pull request #2613 from ZomgPonies/nations2 ... Nations 2.1	2015-11-21 22:20:39 -05:00
Fox McCloud	be192d6037	Merge pull request #2624 from Tastyfish/atmos_radios ... Gave LSS's engineering channel on SB radios, fixed turbine exhaust pump	2015-11-21 21:27:24 -05:00
TheDZD	13efd8eeae	Merge pull request #2611 from Fox-McCloud/porta-seeder ... Re-Adds Portaseeder	2015-11-21 21:27:12 -05:00
Tastyfish	83f8ba9b72	Gave atmos techs access to :e on station bounced radios	2015-11-21 16:04:19 -05:00
ZomgPonies	66202ff4b6	Bugfixes	2015-11-21 10:46:16 -05:00
Tigercat2000	d2ea2ae2e1	Fix pAI interface (somewhat)	2015-11-20 21:23:31 -08:00
TheDZD	0e33b7b65e	Merge pull request #2610 from Fox-McCloud/bags-and-qol ... Chemistry and Bio-Bags and Xenobio QoL	2015-11-20 20:45:15 -05:00
TheDZD	c338c094fa	Merge pull request #2602 from Fox-McCloud/sofas-and-barber-chairs ... Adds in Ability to Makes Sofas and Barber Chairs	2015-11-20 19:46:53 -05:00
ZomgPonies	bd0dd2ab4b	Added Peacekeeper borgs, removing thermals, giving them blue eyes, etc	2015-11-20 19:21:39 -05:00
ZomgPonies	589239f3cd	Make combat borg shield only need inv to be active	2015-11-20 19:04:49 -05:00
ZomgPonies	b8b7075780	Typo	2015-11-20 18:38:06 -05:00
ZomgPonies	d3db1a7fe9	Combat borg shields block flashes when active	2015-11-20 18:36:04 -05:00
Fox-McCloud	3e4059728f	Re-Adds Portaseeder	2015-11-20 00:26:51 -05:00
Fox-McCloud	edf2bfc4fc	Chemistry and Bio-Bags and Xenobio QoL	2015-11-19 20:38:07 -05:00
Fox McCloud	f52cc886b8	Merge pull request #2565 from ZomgPonies/nations ... Nations 2.0	2015-11-19 19:33:21 -05:00
ZomgPonies	6c907de639	Cleaning up following DZD's recommendations	2015-11-19 15:24:06 -05:00
Fox-McCloud	c2fc9da61b	Adds in Ability to Makes Sofas and Barber Chairs	2015-11-19 01:29:32 -05:00
Fox McCloud	8c1f11fb0b	Merge pull request #2566 from Robertha89/master ... Fixes invisible wrapping paper, sonic jackhammer not breaking walls and field surgery kit not fitting its own content	2015-11-18 21:26:23 -05:00
Fox McCloud	d07bce4a66	Merge pull request #2515 from Spacemanspark/master ... Adds in toy chainsaws.	2015-11-18 14:04:17 -05:00
Spacemanspark	eb28de5e42	Removes useless return statement from toy chainsaws ... If this breaks something I'm going to remove Tigercat's soul.	2015-11-17 19:31:48 -06:00
Robertha89	5c50d20d67	Fixes field surgical kits	2015-11-16 08:51:43 +01:00
Aurorablade	bc7a0864d5	Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy	2015-11-16 01:15:41 -05:00
TheDZD	64533c3c56	Merge pull request #2535 from Fox-McCloud/snacks ... Snacks	2015-11-14 18:25:05 -05:00
Fox-McCloud	c08959423c	Snacks	2015-11-13 17:16:47 -05:00
Tigercat2000	1023727689	Fix UI issues, fix weird modkit list	2015-11-11 17:55:36 -08:00