13404 Commits

Author	SHA1	Message	Date
DamianX	066ab4f17f	Revert "Merge pull request #15552 from jknpj/beeez" (#15559) ... This reverts commit b2accb91d0, reversing changes made to 8e7a65a184.	2017-07-29 05:24:56 -05:00
Rob Nelson	5585a47222	Merge pull request #15439 from Furbeh/WiztendedNoMore ... Wizard Mode can now have groups of Wizards	2017-07-28 16:21:50 -07:00
Rob Nelson	deb9c26cb2	Merge pull request #15473 from DeityLink/20170717-BeeDatums ... Beekeeping 3.0	2017-07-28 16:07:38 -07:00
Rob Nelson	90986f108f	Merge pull request #15488 from unid15/organ9 ... Organ item update	2017-07-28 16:05:39 -07:00
Rob Nelson	8cc78a5c9f	Merge pull request #15491 from DeityLink/20170723-MarauderBurst ... Marauders Rocket Dash	2017-07-28 16:04:51 -07:00
Rob Nelson	a00bbe8470	Merge pull request #15548 from unid15/dity_fix ... Fixes light floors not removing overlays when crowbared	2017-07-28 16:02:38 -07:00
unid15	90b09f56bf	Fixes light floors being weird	2017-07-28 23:19:34 +02:00
Rob Nelson	5a5a4bf481	Merge pull request #15533 from unid15/print ... Allows editing blueprint areas	2017-07-28 12:07:57 -07:00
jknpj	9c8fc2ca49	Changes overlays = 0 to overlays.Cut()	2017-07-28 14:53:22 -03:00
John	8a96fa5472	Fixes the damn dimensional rift ... About time	2017-07-28 14:39:26 -03:00
Rob Nelson	79e201b578	Merge pull request #15496 from Kurfursten/dispenserrefactor ... Tank Dispenser Refactor	2017-07-27 20:53:35 -07:00
Rob Nelson	617066f8e7	Merge pull request #15506 from unid15/DDRRR ... Fixes ring of fire not granting complete fire immunity	2017-07-27 20:51:16 -07:00
Rob Nelson	16720e858e	Merge pull request #15539 from unid15/fuaie ... Fixes #15537	2017-07-27 20:49:10 -07:00
Rob Nelson	1bde0f74f6	Merge pull request #15542 from unid15/patch-12 ... Fixes nuke off-station calculation	2017-07-27 20:48:37 -07:00
jknpj	fd7ae5bd28	Fixes storage items not calling dropped() (#15507) ... This is why action buttons are fucky.	2017-07-27 13:44:54 -07:00
unid15	b8e7bae19f	Fixes numbers	2017-07-27 22:37:23 +02:00
unid15	1bde939926	Fixes nuke off-station calculation	2017-07-27 22:24:51 +02:00
unid15	9233e6b2cd	Add admin blueprints	2017-07-27 15:44:14 +02:00
unid15	6c3fc4846e	Fixes grenade containers disappearing	2017-07-27 14:29:21 +02:00
unid15	027d097940	Remove more bloat	2017-07-27 13:18:41 +02:00
unid15	01f0f1d23a	Ready	2017-07-27 12:31:42 +02:00
unid15	6d10de4b7f	Removes bloat	2017-07-27 12:25:22 +02:00
unid15	73f166414f	Cleans up some code, blueprints done	2017-07-27 12:08:24 +02:00
Shadowmech88	94abd5bd6d	Combustion Cannon (#15088) ... * Adds combustion cannon. * Gives the combustion cannon a sound signifying it has recharged. * Makes the combustion cannon droppable. * Fixes conflicts.	2017-07-26 21:08:01 -04:00
unid15	7cda2c8553	Better blueprints	2017-07-26 23:18:16 +02:00
unid15	670762329f	Fixes ring of fire	2017-07-25 19:28:16 +02:00
Rob Nelson	cc1aa7c0ce	Merge pull request #15156 from PromethTK11/Smolstation ... Adds Packedstation, station for lowpop based on mini	2017-07-25 09:51:08 -07:00
unid15	6c2bc32682	Merge branch 'Bleeding-Edge' into organ9	2017-07-24 19:35:14 +02:00
d3athrow	06e9a3a063	Merge pull request #15474 from unid15/organ3 ... Organ code improvements	2017-07-24 12:15:24 -05:00
PromethTK11	2ce5d98eaf	Merge remote-tracking branch 'upstream/Bleeding-Edge' into Smolstation	2017-07-24 11:32:34 -04:00
unid15	0ff954ba51	Organs keep their damage	2017-07-24 16:38:03 +02:00
Kurfursten	87eac14383	one and done	2017-07-24 01:39:04 -05:00
Rob Nelson	9f76149172	Merge pull request #14743 from Kurfursten/industrialvaporizer ... Adds industrial vaporizer	2017-07-23 20:00:10 -07:00
DeityLink	341af9b57d	rocketdash	2017-07-24 01:01:09 +02:00
d3athrow	08ad479976	Merge pull request #15250 from DamianX/RequestConsoleLog ... Requests console logging	2017-07-23 12:25:46 -05:00
Kurfursten	c8b77d6856	done	2017-07-22 23:28:45 -05:00
Kurfursten	3c35189fbb	Added industrial vaporizer	2017-07-22 23:27:42 -05:00
DeityLink	c884851630	bees 10	2017-07-22 16:55:57 +02:00
Rob Nelson	faba476405	Merge pull request #15390 from SonixApache/toolboxes ... Adds blank toolboxes	2017-07-21 21:48:46 -07:00
DeityLink	89f31455c6	bees 9	2017-07-21 23:42:47 +02:00
unid15	df885739e0	Some more	2017-07-21 17:14:43 +02:00
unid15	299665201a	Organ refactor start	2017-07-21 15:19:12 +02:00
DeityLink	11786b828f	bees 8	2017-07-21 15:05:48 +02:00
DeityLink	9967ec5a66	bees 7	2017-07-21 06:02:27 +02:00
DeityLink	b2e8ea70fe	bees 6	2017-07-21 04:13:27 +02:00
DeityLink	24428f6a0d	bees 5	2017-07-21 04:13:26 +02:00
DeityLink	36b82bc2b6	bees 4	2017-07-21 04:13:26 +02:00
Deity Link	c3536af48d	bees 3	2017-07-21 04:13:26 +02:00
DeityLink	4a4f26ee17	bees 2	2017-07-21 04:13:26 +02:00
DeityLink	652c517222	bees	2017-07-21 04:13:26 +02:00