2202 Commits

Author	SHA1	Message	Date
ZomgPonies	00b2ad3fbd	Merge pull request #770 from TheDZD/muh_valids ... Anti-Meta Paraphernalia	2015-04-09 16:21:17 -04:00
ZomgPonies	9995539d4e	Merge pull request #769 from tigercat2000/trackinpods ... Spacepod tracking devices	2015-04-09 16:21:05 -04:00
DZD	d4616a8436	Goddamit git	2015-04-08 18:25:37 -04:00
Tigercat2000	32687467bb	Merge remote-tracking branch 'upstream/master' into tgdice	2015-04-08 14:51:55 -07:00
Tigercat2000	b40a82aecd	Pod-Locator (probably temporary) sprites!	2015-04-08 13:55:40 -07:00
Tigercat2000	3eb1339a65	-tg- Dice overhaul	2015-04-08 03:42:44 +02:00
setheri	705790298a	Implemented Wellington's D&D miniatures.	2015-04-08 01:52:22 +02:00
Fox-McCloud	ddc3604442	Merge remote-tracking branch 'upstream/master' into more-reagents	2015-04-07 01:15:06 -04:00
Fox-McCloud	68a8340b23	[Goonchem] More Reagents	2015-04-07 01:03:15 -04:00
Fox-McCloud	9ca8def744	[Goonchem] Fixups	2015-04-05 21:56:59 -04:00
Fox-McCloud	7c739e4745	Merge pull request #710 from ZomgPonies/limb ... Port of the BS12 limb overhaul	2015-04-05 19:06:39 -04:00
SamCroswell	8485ae4bab	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into PosterUpdate	2015-04-04 23:05:18 -04:00
ZomgPonies	91e8b909c0	Squish Squash	2015-04-04 14:27:53 -04:00
AnturK	2dea395f32	- Adds Picket Signs	2015-04-04 00:07:20 +02:00
SamCroswell	c6f5f1f8cd	Poster Update	2015-04-03 16:45:44 -04:00
ZomgPonies	6ad9603d1b	Merge pull request #713 from FalseIncarnate/master ... Custom Items - Diemos Vezzati	2015-04-01 23:09:12 -04:00
FalseIncarnate	c7d7df0700	Custom Items - Diemos Vezzati ... Adds in their custom jumpsuit, armor vest, and sec mask.	2015-04-01 03:44:26 -04:00
ZomgPonies	8890d6cbea	Merge pull request #706 from Fox-McCloud/Dropper ... [Goonchem] Pipettes, Fixes, and Tweaks (again)	2015-03-31 22:24:01 -04:00
Fox-McCloud	595fb2a34c	[Goonchem] Pipettes, Fixes, and Tweaks (again)	2015-03-31 00:16:58 -04:00
ZomgPonies	f7fb4f0376	Merge pull request #703 from Svej/ntrephat ... Nanotrasen Representative hat	2015-03-30 13:54:26 -04:00
Svej	a0e1cd5683	Nanotrasen Representative hat ... Adds a fancy hat to the NT Reps locker	2015-03-30 14:10:28 +02:00
ZomgPonies	7e1f7a0b22	Merge pull request #680 from tigercat2000/spiritboard ... Spirit Boards! (from -tg-)	2015-03-29 01:02:59 -04:00
ZomgPonies	7dc292f472	Merge pull request #696 from Fox-McCloud/Goon-tweaks ... [Goonchem] Tweaks, Fixes, etc.	2015-03-28 23:23:47 -04:00
Fox-McCloud	7dc856c86c	Merge pull request #686 from tigercat2000/CryoSpritey ... Cryo will now show occupant inside on sprite. (Bayport)	2015-03-28 22:57:08 -04:00
Fox-McCloud	796dbf233a	[Goonchem] Tweaks, Fixes, etc.	2015-03-28 21:16:13 -04:00
ZomgPonies	e2a4ccc8a6	Merge pull request #681 from Fox-McCloud/End-Era ... [Goonchem] Transition to Goonchem	2015-03-28 12:25:35 -04:00
Tigercat2000	4259e589a2	Sprite stuff for cryo	2015-03-28 11:36:09 +01:00
Tigercat2000	5253f58700	betterer sprites, bob animation	2015-03-28 03:50:23 +01:00
Chinsky	e364c3b560	Cryo will now show occupant inside on sprite.	2015-03-28 01:48:18 +01:00
Fox-McCloud	d1932c0f64	[Goonchem] Transition to Goonchem	2015-03-27 05:41:45 -04:00
Cheridan	d012d77a7d	Spirit Boards! ... Conflicts: icons/obj/objects.dmi tgstation.dme	2015-03-26 20:00:44 +01:00
Tigercat2000	62f72163c7	Compileerrorfix, update items.dmi	2015-03-26 19:00:25 +01:00
ZomgPonies	1753406811	Fix missing gauze sprite	2015-03-25 10:25:28 -04:00
ZomgPonies	d604a50dd8	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into court ... Conflicts: icons/obj/items.dmi	2015-03-25 10:23:14 -04:00
ZomgPonies	7fdfa9c6a7	Adding gavel and block	2015-03-25 10:22:04 -04:00
Fox-McCloud	4d2a77dbf7	Merge pull request #653 from ZomgPonies/headspear ... Sticking heads on spears	2015-03-25 09:37:36 -04:00
Fox-McCloud	33293763f4	gauze is gauze. Shocker	2015-03-25 09:03:20 -04:00
Fox-McCloud	3e1fac8c94	[Goonchem] FirstAid Transitions	2015-03-25 08:45:36 -04: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
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	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	225a448ea7	Sticking heads on spears	2015-03-24 13:42:33 -04:00
ZomgPonies	3db10c7c37	Merge pull request #635 from Fox-McCloud/Taperecorder ... Taperecorder Rework	2015-03-24 08:01:16 -04:00
Fox-McCloud	1d30096eab	tweak	2015-03-24 00:03:33 -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
Fox-McCloud	aa5cdae070	Taperecorder Rework	2015-03-23 05:45:15 -04:00