6 Commits

Author	SHA1	Message	Date
Desolate	f7627d2fcb	Resolves conflicts.	2018-10-11 05:36:22 -05:00
Purpose	ea74920535	no no no no cyberiaaaaad	2018-10-05 20:57:41 +01:00
Desolate	c974e29a3c	global lists global defined	2018-10-02 15:52:46 -05:00
Fox McCloud	8c7b543415	The Great Conflictening 2.0: Removes /obj/item/device	2018-04-25 23:07:35 -04:00
Fox McCloud	5c4aa9b3fd	Removes All Weapons	2018-04-15 16:25:56 -04:00
monster860	42639bcab5	Traders Event (#4016) ... * Traders Event * lien notes * Fixes indent * Gets rid of things Fox doesn't like. * how did that get deleted * Get rid of things maintainers don't like * Adds some crates to the shuttle, and a recall console to the base. * EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation) * line nutes	2016-06-11 12:47:20 -04:00