430 Commits

Author	SHA1	Message	Date
nichlas0010	09378a795e	Merge pull request #3693 from yogstation13/upstream-merge-41664 ... [MIRROR] Makes pipe layers better, also some cleanups	2018-12-01 00:24:13 +01:00
nichlas0010	e544cd88da	Update yogstation.dme	2018-11-30 23:10:31 +01:00
nichlas0010	c24ab11bf8	Merge pull request #3660 from yogstation13/upstream-merge-40995 ... [MIRROR] [READY][VERYREADY][HOLYSHITITSSOREADY]Adds a new race: Ethereal (also adds wrappers for nutrition adjustment)	2018-11-30 22:52:21 +01:00
nichlas0010	2df37456e4	Update yogstation.dme	2018-11-30 18:08:57 +01:00
nichlas0010	2480ac9086	Update yogstation.dme	2018-11-29 19:11:03 +01:00
nichlas0010	c5a957d103	Merge pull request #3640 from fluffe9911/adam-is-going-to-be-so-mad ... Adds a goat plushie and fixes the surgery drape crafting	2018-11-29 02:56:28 +01:00
nichlas0010	d1e8d7c832	Merge pull request #3564 from alexkar598/chocobo ... Chocobo	2018-11-29 02:50:09 +01:00
nichlas0010	9efce2d96b	Merge pull request #3651 from monster860/fix_disposals ... Disposals Wires	2018-11-29 02:31:00 +01:00
nichlas0010	5fab1d5b93	Merge pull request #3645 from yogstation13/upstream-merge-41668 ... [MIRROR] Bandaid for the TGS4 Linux trusted mode bug	2018-11-27 12:50:12 +01:00
nichlas0010	8ddfaa2dff	Update yogstation.dme	2018-11-27 12:23:30 +01:00
nichlas0010	c1fe5e650f	Update yogstation.dme	2018-11-27 12:22:30 +01:00
monster860	d3acdd9eec	Disposals Wires	2018-11-27 00:01:03 -05:00
fluffe9911	3c352b1c02	goat plushie my dudes	2018-11-25 18:36:30 -05:00
Nich	f06213ce26	adds o2 tanks to the space suits in the armoury	2018-11-20 22:11:32 +01:00
nichlas0010	1d121accb4	Update yogstation.dme	2018-11-20 17:37:06 +01:00
Nich	78f7840e13	also fixes phazons	2018-11-19 17:01:06 +01:00
Ling	dc4f873a8c	Merge pull request #3529 from Ktlwjec/idontdeletesoap ... Fixes cyborg soap being used up	2018-11-18 15:06:38 +01:00
nichlas0010	09c76b1963	Update yogstation.dme	2018-11-18 10:32:49 +01:00
Ktlwjec	469733e817	boring not infinite soap	2018-11-17 21:50:32 +00:00
alexkar598	913a3ec022	starts adding chocobos	2018-11-17 07:48:30 -05:00
nichlas0010	3d30771eb5	Update yogstation.dme	2018-11-17 10:16:34 +01:00
Ling	913b4755c0	Merge pull request #3493 from monster860/bluespace_locker ... Updates bluespace lockers	2018-11-15 14:32:08 +01:00
Nich	75836f325f	rebalances collars for catpeople	2018-11-14 18:27:00 +01:00
monster860	a2825b3cd2	I may have gotten a bit carried away with this	2018-11-13 20:42:58 -05:00
Ling	e66a5aa11b	Merge pull request #3394 from monster860/bluespace_locker ... Bluespace locker	2018-11-12 21:38:56 +01:00
monster860	6298a948ac	Bluespace Lockers - WTF ARE YOU DOING GIT STAAAAAHP	2018-11-12 15:09:30 -05:00
Nich	cbcdc9144f	fixes arcade	2018-11-12 21:00:24 +01:00
Nich	186e4e42f2	mapmove3	2018-11-12 19:45:10 +01:00
nichlas0010	36a7788046	Update yogstation.dme	2018-11-12 19:34:40 +01:00
nichlas0010	7fbcc5464a	Merge pull request #3452 from yogstation13/upstream-merge-41206 ... [MIRROR] Sentient Disease has nearly ALL symptoms and can now hear!	2018-11-12 19:04:00 +01:00
nichlas0010	50c571df1a	Update yogstation.dme	2018-11-12 19:03:36 +01:00
Nich	d277bcaa21	forgot the dme	2018-11-11 12:58:51 +01:00
Nich	3c4b8d20a7	moves maps	2018-11-11 12:14:11 +01:00
monster860	90b444a400	Atmospherics Simulator	2018-11-10 16:38:52 -05:00
Ling	8ec822e9c9	Merge pull request #3385 from nichlas0010/fuckadam ... Fuck adam and ling	2018-11-09 19:47:59 +01:00
nichlas0010	458f3c72d3	Merge pull request #3384 from monster860/signaler-convenience ... Signaller color-coding	2018-11-09 19:08:59 +01:00
Ling	935a2b0e11	Modular	2018-11-08 18:43:38 +01:00
Nich	8068c4b069	fixes things	2018-11-07 19:50:35 +01:00
Nich	a7ea50c161	fuck adam	2018-11-07 12:44:27 +01:00
Ling	b4ed5baa02	Merge pull request #3295 from Firewolf34/surgical-plastic-wrap ... Adds Surgical Drapes to the Protolathe	2018-11-06 11:07:14 +01:00
nichlas0010	d17fb6b974	Merge pull request #3317 from yogstation13/upstream-merge-41029 ... [MIRROR] [SUPER DUPER EXTRA READY] Hilbert's Hotel	2018-11-03 09:01:31 +01:00
nichlas0010	2014f40b8d	Update yogstation.dme	2018-11-02 21:42:05 +01:00
Nich	3271465d79	and yogs.dme	2018-11-02 14:53:51 +01:00
Firewolf34	de1b69adf3	Merge branch 'master' into surgical-plastic-wrap	2018-10-31 19:36:51 -05:00
nichlas0010	692f12d29b	Revert "Revert "Makes lobby music use youtube-dl and goonchat""	2018-10-31 23:51:33 +01:00
nichlas0010	e41abb8749	Revert "Makes lobby music use youtube-dl and goonchat"	2018-10-31 23:51:07 +01:00
nichlas0010	103a4e36f6	Merge pull request #3267 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/unfucked-lobby-music ... Makes lobby music use youtube-dl and goonchat	2018-10-31 23:49:24 +01:00
nichlas0010	27eaa6750f	Merge pull request #3259 from yogstation13/upstream-merge-41181 ... bunch of upstream PRs and stuffs	2018-10-31 23:39:26 +01:00
nichlas0010	49d5479a9e	Update yogstation.dme	2018-10-31 23:23:08 +01:00
Nich	1524a6905e	mane	2018-10-31 14:40:29 +01:00