4545 Commits

Author	SHA1	Message	Date
ZomgPonies	bc900d678a	Merge pull request #512 from Markolie/master ... Fix player panel, other fixes	2015-03-04 10:23:36 -05:00
Markolie	6352d2abd9	Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix	2015-03-04 15:09:12 +01:00
Markolie	691fef1ff0	Fix player panel	2015-03-04 14:47:45 +01:00
Fox-McCloud	5cad8fe41e	Merge pull request #500 from ZomgPonies/blood ... Proper colored blood	2015-03-04 00:24:53 -05:00
ZomgPonies	3fec57ed8f	Merge pull request #494 from Fox-McCloud/Cyborg-Balance ... Cyborg Rebalance	2015-03-04 00:15:15 -05:00
ZomgPonies	463204c913	Merge pull request #493 from Markolie/master ... NanoUI synth airlock control, ERT equipment rework, fixes	2015-03-03 21:28:22 -05:00
ZomgPonies	10ee512d22	Merge pull request #492 from SamCroswell/dave-NinjaDev ... Removes Space Ninjas	2015-03-03 21:26:16 -05:00
Markolie	3497d4ba9e	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ... Conflicts: maps/cyberiad.dmm	2015-03-03 22:58:41 +01:00
Fox-McCloud	253563e211	Energy Tweaks	2015-03-03 16:00:07 -05:00
ZomgPonies	8a575700b9	Finally got colored blood working properly	2015-03-03 13:45:46 -05:00
Fox-McCloud	c1a1f851cf	Cyborg Rebalance	2015-03-02 22:54:09 -05:00
Markolie	1deef3104e	NanoUI synth airlock controller	2015-03-03 04:51:32 +01:00
SamCroswell	b8a9c902a1	Removes Space Ninjas	2015-03-02 19:05:44 -05:00
Artorp	95538029a1	Harvesting animals will always gib	2015-03-02 20:14:02 +01:00
Artorp	c35711c394	Makes harvest() give meat equal to meat_amount	2015-03-02 19:50:50 +01:00
ZomgPonies	efcbfebf99	Emergency corgi runtime Fix	2015-03-02 11:22:21 -05:00
Fox-McCloud	63352fcfc2	Merge pull request #479 from ZomgPonies/darkness ... The Ghostsight the server deserves	2015-03-02 00:57:12 -05:00
ZomgPonies	6979cf6089	Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup ... Chemistry Cleanup and Fixes	2015-03-01 23:08:16 -05:00
DZD	69eb5509ec	Fixes exchange document objective	2015-03-01 20:35:09 -05:00
ZomgPonies	bc7088a6d7	Added AIeye to new system	2015-03-01 19:40:02 -05:00
ZomgPonies	86e300bc67	Fixes Ghostsight for realsies	2015-03-01 19:10:25 -05:00
Fox-McCloud	3bed31e08c	Chemistry Cleanup and Fixes	2015-03-01 16:34:23 -05:00
ZomgPonies	2b917b17cd	Merge pull request #475 from Markolie/master ... Bug fixes galore	2015-03-01 14:41:42 -05:00
Markolie	d7a2559065	Bug fixes galore	2015-03-01 20:35:07 +01:00
Mark van Alphen	5b4c156989	Merge pull request #459 from ZomgPonies/corgi ... Ports CorgiUI	2015-03-01 18:30:21 +01:00
ZomgPonies	7799470ca5	Merge pull request #460 from Markolie/master ... Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes	2015-03-01 12:30:15 -05:00
ZomgPonies	5a94b87331	Merge pull request #457 from Fox-McCloud/Cameras ... Camera Update+Camera Bugs	2015-03-01 12:28:58 -05:00
Fox-McCloud	a7f631f364	Health and Stack Fixes	2015-03-01 01:07:14 -05:00
Markolie	6b70bfec74	NanoUI update	2015-03-01 04:22:12 +01:00
Markolie	b28f791f8f	(Porta) turret update, map area update	2015-03-01 02:10:32 +01:00
Markolie	be47c7007a	Fixes alien spacewalking	2015-02-28 23:12:18 +01:00
Fox-McCloud	a9285627ac	Merge remote-tracking branch 'upstream/master' into Cameras	2015-02-28 16:24:03 -05:00
Markolie	5e4539157c	Add minimum age for drones/ERT	2015-02-28 19:40:56 +01:00
Markolie	99dd8bf811	Fix handcuff mob sprite not updating	2015-02-28 17:54:37 +01:00
Mark van Alphen	18692eedfe	Merge pull request #450 from ZomgPonies/fixuns ... More fixins and various features	2015-02-28 17:33:28 +01:00
ZomgPonies	ba2b5589e9	Ported CorgiUI	2015-02-28 10:59:14 -05:00
ZomgPonies	89ce02b426	Merge pull request #451 from Markolie/master ... Temperature fixes	2015-02-28 09:48:01 -05:00
Markolie	a735e6855c	Reduce malf ticker time, update fire damage, fix breathing	2015-02-28 15:44:43 +01:00
Fox-McCloud	62462c876f	Camera Update+Camera Bugs	2015-02-28 04:01:14 -05:00
Fox-McCloud	0aa45feffb	Merge pull request #439 from TheDZD/minor-fixes ... Swaps Xeno Sentinel and Hunter Health Values	2015-02-27 20:07:56 -05:00
Fox-McCloud	87c15c4e3f	Merge pull request #441 from SamCroswell/master ... Quick-Equip Hotkey Fix, Pulse Rifle Icon Fix	2015-02-27 20:07:34 -05:00
SamCroswell	75b2220e3e	Merge Conflic Fix ... Conflicts: icons/obj/gun.dmi	2015-02-27 15:52:26 -05:00
Markolie	42935580da	Adjust cold temperature message	2015-02-27 21:32:31 +01:00
Markolie	7c2224b880	Temperature fixes	2015-02-27 21:11:36 +01:00
ZomgPonies	b1395e0b35	Disabling drone sprite picking as per community vote	2015-02-27 12:56:43 -05:00
Mark van Alphen	d89c885a14	Merge pull request #435 from ZomgPonies/fixuns ... Various fixings and additions	2015-02-27 18:22:35 +01:00
ZomgPonies	9d5e259eb8	Merge pull request #440 from Fox-McCloud/Gamebreaking-Bug ... Fixes a Gamebreaking Bug	2015-02-26 22:00:36 -05:00
SamCroswell	fa882c7516	Quick-Equip Hotkey Fix ... The quick equip hotkey now checks to see if the RIG helmet you're trying to equip actually requires to be attached to the suit or not.	2015-02-26 21:26:23 -05:00
Fox-McCloud	9bae042444	Fixes a Gamebreaking Bug	2015-02-26 21:07:50 -05:00
ZomgPonies	4fdd31f0da	5 new Vox quill styles, thanks to FullofSkittles	2015-02-26 20:08:20 -05:00