8842 Commits

Author	SHA1	Message	Date
ZomgPonies	43783ca583	Merge pull request #452 from Fox-McCloud/RND-Fixes-Balance ... RnD Fixes and Tweaks	2015-02-28 22:16:37 -05:00
Artorp	dbca446d6d	Allow paperbins to be picked up from backpacks ... Prevents it from being stuck in inventories	2015-02-28 23:09:29 +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	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
ZomgPonies	2a18787c50	Merge pull request #447 from Fox-McCloud/Shields ... Telescopic Riot Shield	2015-02-28 09:07:07 -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
Fox-McCloud	923ba5932f	RnD Fixes and Tweaks	2015-02-27 17:36:20 -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
Markolie	20ac07de8d	Bug fixes	2015-02-27 17:51:57 +01:00
Fox-McCloud	30465b03d6	Telescopic Riot Shield	2015-02-27 07:31:03 -05:00
ZomgPonies	eb311e3e86	Escape shuttle loses ability to cancel launches.	2015-02-27 01:39:05 -05:00
ZomgPonies	d14c4e4f58	Merge pull request #431 from Fox-McCloud/Lasers-Tasers ... Laser Additions and Taser Nerf	2015-02-26 22:49:46 -05:00
Fox-McCloud	008dcbe0a9	Merge pull request #443 from ZomgPonies/master ... Fix mentors seeing MSAY	2015-02-26 22:09:15 -05:00
ZomgPonies	9d5e259eb8	Merge pull request #440 from Fox-McCloud/Gamebreaking-Bug ... Fixes a Gamebreaking Bug	2015-02-26 22:00:36 -05:00
ZomgPonies	64bd0abd71	Fix mentors seeing MSAY	2015-02-26 21:41:59 -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
ZomgPonies	7aa0f8f500	Move event manager panel to event tab	2015-02-26 19:18:28 -05:00
ZomgPonies	4c6337108a	Remove news events	2015-02-26 18:59:01 -05:00
ZomgPonies	ff05a93a08	DERPEDYDERP	2015-02-26 18:04:57 -05:00
ZomgPonies	54f4dda1b7	Made plasmamen suits EVA	2015-02-26 17:42:17 -05:00
ZomgPonies	bdb54c4378	Adds leather chaps for both regular and fat people	2015-02-26 16:56:28 -05:00
DZD	b359bc663b	Swaps Xeno sentinel and hunter health values	2015-02-26 15:04:25 -05:00
ZomgPonies	2f9b435a0f	Merge pull request #426 from Markolie/master ... Bug fixes, add atmos watertank	2015-02-26 13:50:37 -05:00
ZomgPonies	eaeb045afe	Unique suits for plasmamen jobs	2015-02-26 13:32:42 -05:00
ZomgPonies	ccfb89199e	New sea admiral suit and hat	2015-02-26 12:58:20 -05:00
ZomgPonies	130b051a7e	Switch jukebox from WMP to VLC (CROSS PLATFORM, OGG SUPPORT)	2015-02-26 12:46:56 -05:00
ZomgPonies	c8d9598098	Fixed up the give verb	2015-02-26 10:03:24 -05:00
ZomgPonies	ba1f04e0a0	Bantime fixins	2015-02-26 09:12:32 -05:00
Fox-McCloud	164608a9ab	Fixes Being On Fire	2015-02-26 04:56:46 -05:00
Fox-McCloud	9850e6deb2	Laser Additions and Taser Nerf	2015-02-25 23:34:42 -05:00
ZomgPonies	5421754760	Merge pull request #418 from Fox-McCloud/Fixes-Genetics ... Fixes, Genetics, and Balance	2015-02-25 21:56:33 -05:00
Mark van Alphen	eea58c6951	Merge pull request #415 from ZomgPonies/superhero ... Superhero Part 2: Owlman vs. The Griffin!	2015-02-26 00:59:37 +01:00
Markolie	a63ce564fd	Reduce Diona healing	2015-02-25 22:45:06 +01:00
Markolie	e9e4437e91	Re-add nymph code	2015-02-25 22:26:38 +01:00
Markolie	d9f083c39c	Fix nanites	2015-02-25 22:25:22 +01:00
Markolie	5d529c8086	Plant-B-Gone now affects Diona nymphs. Dionas now heal toxin/fire damage.	2015-02-25 22:07:23 +01:00
Markolie	91878efbdc	Fix position of robotic talk follow	2015-02-25 20:47:03 +01:00
Markolie	bfe8a12f1e	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ... Conflicts: code/game/objects/items/weapons/kitchen.dm	2015-02-25 20:44:32 +01:00
Markolie	6efa3bcdaa	Fix trays (now bags)	2015-02-25 20:42:43 +01:00
Markolie	89650e8590	Extinguisher wheelchair update, deathsquad robot fix	2015-02-25 19:56:24 +01:00
Markolie	e1f0d0fec7	Bug fixes, add atmos watertank	2015-02-25 19:47:04 +01:00
Mark van Alphen	367fd7abea	Merge pull request #425 from ZomgPonies/master ... Custom Item - Telvayne	2015-02-25 18:51:36 +01:00