19366 Commits

Author	SHA1	Message	Date
Woodrat	62ddc29194	Fixed transfer and Escape Shuttle. ... - Added more lights and cameras - Fixed the outposts - Started work on medical	2015-07-13 16:26:29 -07:00
Woodrat	c5b30257f7	Neerti is Satan, updates map. Updates files.	2015-07-07 20:31:00 -07:00
Neerti	8f7f145b6c	Merge pull request #30 from Neerti/7/3/2015_more_cryo ... Adds three new cryo types to be used, some faster then others.	2015-07-07 19:00:06 -04:00
Neerti	91da4afcac	Removes machinedir on in machine_processing.dm and machine_stacking.dm	2015-07-07 18:43:59 -04:00
SledgeLP	aad66360d9	Adding New Outpost Areas ... Adds the additional areas needed for the outpost z level map	2015-07-06 23:36:25 -05:00
SledgeLP	6be647c9e4	Fixing namings for Shuttle targets ... Changing of the offsite location names for the mining and research outpost docks to match the outpost Z level names.	2015-07-06 23:33:06 -05:00
Neerti	4e678c65a8	Adds three new cryo types to be used, some faster then others.	2015-07-03 06:12:59 -04:00
Neerti	a0fdf03760	Adds Woodrat's centcom z-level and some other stuff on the first one.	2015-07-02 23:27:48 -04:00
Neerti	ceb1832505	Tries to please Travis.	2015-06-25 20:22:52 -04:00
Neerti	fcde61acdd	Fixes the sloppy merge conflict resolution.	2015-06-25 19:14:15 -04:00
Neerti	462eaa834b	Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync ... Conflicts: .travis.yml code/modules/clothing/spacesuits/rig/modules/combat.dm code/modules/clothing/spacesuits/rig/modules/utility.dm code/modules/mob/living/silicon/ai/ai.dm icons/mob/rig_back.dmi polaris.dme	2015-06-25 18:50:18 -04:00
Zuhayr	27a7768ffc	Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev	2015-06-25 17:58:37 +09:30
GinjaNinja32	d722dfa420	Merge pull request #9911 from mwerezak/disposal ... Disposals fixes	2015-06-25 06:14:00 +01:00
mwerezak	51eecd54f0	Fixes disposal bins filling instantly ... Fixes disposal bins filling instantly, side effect of fixing air_contents having the wrong volume	2015-06-24 22:09:47 -04:00
PsiOmega	8843aa2402	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/game/machinery/alarm.dm html/changelogs/.all_changelog.yml	2015-06-24 18:15:28 +02:00
PsiOmega	8a9f5b9365	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-06-24 17:30:18 +02:00
Zuhayr	c688678444	Merge pull request #9912 from mwerezak/grillehit ... Fixes #9910	2015-06-24 17:28:04 +09:30
mwerezak	aa0b23e205	Fixes #9910	2015-06-24 00:20:11 -04:00
mwerezak	cb0b3a30da	Fixes runtime ... Fixes the other runtime in #9310	2015-06-24 00:13:41 -04:00
mwerezak	a147a4e15e	Removes fat mutation checks	2015-06-23 23:36:19 -04:00
mwerezak	285ce84044	Fixes disposals not transferring gas to holder, creating air_contents with the wrong volume, runtime due to terrible management of shared gas_mix ... Fixes one of the runtimes in #9310	2015-06-23 23:32:27 -04:00
PsiOmega	3b935ce854	Fixes #9813. ... Cutting fire alarm wiring now produces cables.	2015-06-23 18:15:30 +02:00
Zuhayr	130ff67414	Merge pull request #9902 from Baystation12/dev-freeze ... Dev freeze	2015-06-23 20:53:38 +09:30
Chinsky	8bb0f7496e	Merge pull request #9900 from mwerezak/extinguisher ... Changelog, fire patting	2015-06-23 06:46:34 +03:00
mwerezak	4961efec0f	Adjusts patting to account for shorter timeout	2015-06-22 22:17:30 -04:00
Neerti	0a7f5b42cb	Converts woodrat's map to this codebase after 12 hours nonstop of fixing it. ... Cryo is a huge asshole and I had to make a quick hack because twelve hours etc.	2015-06-22 11:05:35 -04:00
PsiOmegaDelta	9698def0e7	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/modules/nano/modules/human_appearance.dm	2015-06-22 16:59:19 +02:00
PsiOmegaDelta	cc4f22ad43	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-06-22 16:41:50 +02:00
GinjaNinja32	9c32851ba5	Merge pull request #9871 from mwerezak/extinguisher ... Fire Extinguishers	2015-06-22 15:36:55 +01:00
Zuhayr	27b56676de	Minor formatting error.	2015-06-22 22:36:00 +09:30
Zuhayr	e18966cbf6	Fixes #9887	2015-06-22 22:03:40 +09:30
Zuhayr	aa2e25928d	Fixes a runtime with organ Destroy() called with nonhuman owner.	2015-06-22 22:03:24 +09:30
Zuhayr	15c123dc54	Fixes #9892	2015-06-22 21:57:07 +09:30
Vivalas	06ce7e8973	Update smartfridge.dm	2015-06-21 18:33:07 -05:00
Vivalas	0035a3a5b8	Fixes tracking implants	2015-06-21 14:17:49 -05:00
PsiOmega	60f6a2ea10	Fixes antags being able to see the appearance changer. ... Sets invisibility level to MAXIMUM.	2015-06-21 21:12:28 +02:00
GinjaNinja32	4b5899fa30	Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct ... Corrects two ex_acts.	2015-06-21 13:16:23 +01:00
GinjaNinja32	e3cf4692b5	Merge pull request #9879 from PsiOmegaDelta/150621-BoldChanges ... Fixes the Changelog menu button.	2015-06-21 13:16:18 +01:00
PsiOmegaDelta	1a6ea56194	Fixes the Changelog menu button. ... It had lost the ability to go bold upon detected unread changelog entries.	2015-06-21 13:39:26 +02:00
PsiOmegaDelta	8100f286a6	Corrects two ex_acts. ... Decreases immovable rod severity to match other ex_acts in file. Increases meteor gun ex_act severity.	2015-06-21 13:26:48 +02:00
Zuhayr	48cf00ca54	Merge with dev-freeze.	2015-06-21 20:45:47 +09:30
GinjaNinja32	7f319f528a	Merge pull request #9875 from Zuhayr/dev-freeze ... Antag system fixes	2015-06-21 12:07:50 +01:00
Zuhayr	7476160008	Fixes #9876	2015-06-21 20:08:13 +09:30
Zuhayr	41cb433517	Fixes #9393	2015-06-21 20:05:23 +09:30
Zuhayr	d3bd63eec9	Refactor/tidies up latejoin antags/in-round antag spawning.	2015-06-21 19:33:49 +09:30
Zuhayr	ec5e05b9f1	Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.	2015-06-21 18:08:26 +09:30
PsiOmegaDelta	3d572ccc27	Merge pull request #9874 from mwerezak/fixes ... Dev-freeze Fixes	2015-06-21 09:04:08 +02:00
PsiOmegaDelta	9426d0844c	Merge pull request #9872 from mwerezak/earslot ... Fixes #9514	2015-06-21 09:03:00 +02:00
mwerezak	80c80abe3a	Fixes #9511	2015-06-21 03:00:37 -04:00
mwerezak	1678cc5b96	Removes CRASH()	2015-06-21 03:00:36 -04:00