9900 Commits

Author	SHA1	Message	Date
Fox-McCloud	dea1d5a78d	Merge pull request #2136 from Markolie/pet ... Fixes	2015-09-22 21:19:11 -04:00
Markolie	bf2cabeca3	Tab	2015-09-23 03:08:38 +02:00
Markolie	ecb597594e	Death ripley fix	2015-09-23 02:51:52 +02:00
Markolie	b770e8f2a0	Implant fixes/updates	2015-09-23 02:51:33 +02:00
Markolie	e020a8716b	Holodeck rack exploit fix	2015-09-23 02:50:54 +02:00
Fox-McCloud	8a75113335	Merge pull request #2134 from Crazylemon64/monkeyrecyclerfix ... Monkey Recycler Micro Manipulator Fix	2015-09-22 19:51:44 -04:00
Crazylemon	2dab5fb9fe	Made the monkey recycler consume the proper amount of monkeys, instead of 5 always.	2015-09-22 12:25:12 -07:00
Markolie	df8209afe6	Atmos fixes	2015-09-22 05:15:05 +02:00
Markolie	91e1d7a516	Fix door crush bug	2015-09-22 04:07:09 +02:00
Markolie	3c7413dc65	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet ... Conflicts: _maps/map_files/cyberiad/cyberiad.dmm	2015-09-22 00:17:30 +02:00
Mark van Alphen	78ad7adafa	Merge pull request #2111 from Fox-McCloud/russian-revolver ... Adds in Russian Revolvers	2015-09-21 23:01:58 +02:00
Markolie	ea305d3ffa	Saber SMG update, add armour piercing variable	2015-09-21 22:50:07 +02:00
Markolie	adeac4f9da	Logs fix	2015-09-21 22:22:33 +02:00
Markolie	bcbabdf8a1	Fix aliens/animals attacking turrets	2015-09-21 22:21:16 +02:00
Fox-McCloud	bd3696523b	GC a few Datums	2015-09-20 22:40:13 -04:00
Fox-McCloud	e371c9662a	Merge pull request #2106 from Markolie/pipenet ... Pipenet revamp	2015-09-20 20:47:02 -04:00
Markolie	c5c64413a1	Pipenet overhaul	2015-09-21 02:11:54 +02:00
Fox-McCloud	941e833290	suicide act for the suicide game	2015-09-20 09:13:51 -04:00
Fox-McCloud	17d38f81c6	Adds in Russian Revolvers	2015-09-20 08:56:11 -04:00
Fox-McCloud	3777639425	Fixes Utensil Feeding	2015-09-19 05:14:25 -04:00
TheDZD	268992a32f	Merge pull request #2081 from Fox-McCloud/borg-update ... Borg Update: MMI and Suits	2015-09-18 22:31:21 -04:00
TheDZD	7e9b2f99b1	Merge pull request #2091 from Fox-McCloud/destroy-them-all ... Fixes up a few Destroys	2015-09-18 22:30:49 -04:00
TheDZD	b27753e163	Merge pull request #2088 from Fox-McCloud/point-rework ... Point Rework	2015-09-18 22:30:22 -04:00
Fox-McCloud	56ed8c1a7e	Pass III	2015-09-18 21:15:08 -04:00
TheDZD	942c1abc76	Merge pull request #2082 from Fox-McCloud/syndi-ship-update ... Syndicate Ship Update	2015-09-18 18:54:59 -04:00
Fox-McCloud	e00775f44e	Merge pull request #2084 from Markolie/looc2 ... LOOC overhaul, stealthmin fixes	2015-09-18 18:05:05 -04:00
Fox-McCloud	d3dd7d73b6	Merge pull request #2083 from Markolie/loco ... Event tweaks	2015-09-18 17:50:39 -04:00
Fox-McCloud	1d91e31d17	pass II, taperecorder exploit fix	2015-09-18 05:46:00 -04:00
Fox-McCloud	74565c101b	Fixes up a few Destroys	2015-09-18 04:20:02 -04:00
Fox-McCloud	6a79ff83a1	Merge pull request #2090 from Markolie/fixesss ... Radio examine/matter eater fix, GC testing move	2015-09-18 01:20:27 -04:00
Mark van Alphen	739e820faa	Merge pull request #2078 from Fox-McCloud/experimentor ... EXPERI-Mentor Addition--Telesci Removal	2015-09-18 07:18:55 +02:00
Markolie	5ee3320e1a	Stop matter eaters from eating their own limbs and constructs and other important mobs whole	2015-09-18 07:14:07 +02:00
Markolie	d8ad34ee17	Item examine fix, GC testing move	2015-09-18 06:42:46 +02:00
Fox-McCloud	7c7838445f	Merge pull request #2089 from Markolie/fixesss ... Fixesss	2015-09-17 23:25:01 -04:00
Markolie	22fb76980b	Didn't mean to remove that	2015-09-18 05:07:29 +02:00
Markolie	2e064a1050	Fix Wizard infinite spell exploit	2015-09-18 05:03:17 +02:00
Markolie	becb3e729d	Fix broken tile stacks	2015-09-18 05:02:29 +02:00
Markolie	d921f473f1	Air alarm fixes	2015-09-18 05:01:33 +02:00
Fox-McCloud	480613208d	Point Rework	2015-09-17 22:26:03 -04:00
Fox-McCloud	73087a89bb	runtime fixes, pick name re-addition	2015-09-17 19:23:49 -04:00
Markolie	ed9a63763e	More event tweaks	2015-09-17 22:25:35 +02:00
Markolie	34552f259c	Event updates	2015-09-17 21:34:51 +02:00
Markolie	279c998ae8	OOC/LOOC update, stealthmin fixes	2015-09-17 21:27:24 +02:00
Markolie	f4f42ab17b	Make meteors not collide with eachother	2015-09-17 18:32:39 +02:00
Fox-McCloud	2d52bd90e1	Syndicate Ship Update	2015-09-17 08:22:50 -04:00
Fox-McCloud	b01d49d72c	Borg Update: MMI and Suits	2015-09-17 06:50:24 -04:00
Fox-McCloud	d41b09c0a6	Experimentor Addition--Telesci Removal	2015-09-17 00:59:38 -04:00
Markolie	67d1cafc29	Language fixes	2015-09-17 03:42:14 +02:00
Fox-McCloud	96030a706a	Merge pull request #2069 from Markolie/computor ... Reduce computer lights, air alarm fix	2015-09-16 20:05:48 -04:00
Fox-McCloud	bef21a964d	Merge pull request #2068 from Markolie/lawstate ... Welding tool refactor, in-hand updates	2015-09-16 19:07:29 -04:00