11827 Commits

Author	SHA1	Message	Date
MDReckless	152d83d47c	Update drinkingglass.dm	2013-10-28 15:02:14 -04:00
MDReckless	39d312e69d	Removed grape juice from unneeded area	2013-10-28 15:00:21 -04:00
MDReckless	811a4b1aa9	Adds Grape Soda as a reagent ... Allows grape soda in a beaker and gives it color	2013-10-28 14:57:08 -04:00
MDReckless	809a7faf58	Adding Grapes to the Juicer allow list ... Grapes grown from hydroponics can now be juiced	2013-10-28 14:45:36 -04:00
MDReckless	67fcd2e6e4	Grape Soda ... Adds grape soda as a recipe	2013-10-28 11:24:45 -04:00
DJSnapshot	524e3b3d2b	Merge pull request #3835 from Kilakk/dev ... Added a new destination tagger sprite	2013-10-28 07:38:00 -07:00
Nanai	504e49ffb2	Added a new surgery- Head reattachment, for the decapitationally challenged. Performed via retractor, fix-o-vein, hemostat, cautery, head. Fixed logs and messages for decapitated brain removal - No longer shows as the head cutting the head open, and no longer shows the debrainee as the debrainer to admins.	2013-10-28 07:57:24 -04:00
DJSnapshot	751aaa21f4	Merge pull request #3836 from Nanai/dev ... Miscellanities!	2013-10-27 22:56:48 -07:00
Nanai	b4ea0491c8	Miscellanities: Fixing more broken fluff clothing articles, secondary stamp DMI updated, hemostats added to autolathe to frolick with it's fellows.	2013-10-28 01:46:31 -04:00
Kilakk	15f3e063ab	Added a new destination tagger sprite	2013-10-27 22:57:40 -04:00
DJSnapshot	f020959710	Merge pull request #3833 from Nanai/dev ... Cyborg Alt Titles	2013-10-27 17:34:35 -07:00
Nanai	87ac3c28f0	Added "Android" and "Robot" alt titles to cyborgs- They spawn with posibrains. Robot alt title waiting on an alt MMI/brain type from Ravensdale, but functions with posibrain right now.	2013-10-27 20:23:01 -04:00
DJSnapshot	6eedc4eb3f	Merge pull request #3832 from Nanai/dev ... Custom item fixes, Supermatter Crates.	2013-10-27 16:21:10 -07:00
Nanai	e4e1c66d4a	Added a supermatter crate and supermatter shard crate, with appropriate CE-only open access for cargo.	2013-10-27 19:17:45 -04:00
DJSnapshot	a2ed948ae4	Merge pull request #3831 from Nanai/dev ... Guide/Manual addition, sprite fix!	2013-10-27 15:35:33 -07:00
Mloc	979cf24ed7	Merge pull request #3823 from Iamgoofball/boozetaketwo ... Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker.	2013-10-27 15:29:52 -07:00
Mloc	6bc10820d8	Merge pull request #3830 from DJSnapshot/master ... Seekrit update	2013-10-27 15:29:42 -07:00
Nanai	ba15537f6b	Added two new manuals by MagmaRam to the default engineering manual bookcase.	2013-10-27 18:25:25 -04:00
DJSnapshot	22cbb0fe17	Seekrit halloween update	2013-10-27 15:25:12 -07:00
Nanai	adc563db05	Added in two new manuals by Magmaram for atmospherics and EVA.	2013-10-27 18:24:30 -04:00
Nanai	88ef9a3be2	Fixed the absent/removed sprite on experimental welding tools.	2013-10-27 18:24:04 -04:00
Iamgoofball	3fa88bb7ff	Fixed beakers not going into DNA scannners.	2013-10-27 13:13:26 -07:00
Iamgoofball	e58438cae8	Fixed the Glass.dm can_be_placed_into list.	2013-10-27 13:09:12 -07:00
Segrain	7ffafb657e	Fix for acid pouring.	2013-10-27 21:56:08 +03:00
Segrain	93cfba21a7	Fix for #3826.	2013-10-27 21:55:08 +03:00
Segrain	9df65d4294	Merge remote-tracking branch 'upstream/master' into dev-freeze	2013-10-27 21:44:13 +03:00
Mloc	2a52e94d18	Hopefully. Hopefully was the key word. ... Signed-off-by: Mloc <colmohici@gmail.com>	2013-10-27 15:50:07 +00:00
Mloc	f99633e934	Merge pull request #3824 from DJSnapshot/dev-freeze ... small fix to autotransfer voting	2013-10-27 05:10:23 -07:00
Mloc	a1fd865b1a	(hopefully) Final fix for ZAS for 0.1.4. ... Signed-off-by: Mloc <colmohici@gmail.com>	2013-10-27 12:08:40 +00:00
Kilakk	8b4e5d07e6	Added vending machine stocking ... * Now with more del() than ever before * Only works if you have the maintenance panel open	2013-10-27 01:49:19 -04:00
DJSnapshot	aeff49f742	Small fix so voting isn't always shouting at you for not being an admin or mod.	2013-10-26 22:49:16 -07:00
Iamgoofball	7b1dd38d06	Removed a useless variable, and changed the lists modifications to use += and -=	2013-10-26 22:39:41 -07:00
Iamgoofball	f7ad7cbddb	Actually added the new beakers. Yay for git.	2013-10-26 21:57:26 -07:00
Iamgoofball	cfbe1c6ad1	Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker.	2013-10-26 21:52:13 -07:00
Kilakk	aee7286e6f	Merge remote-tracking branch 'upstream/master' into dev	2013-10-27 00:43:57 -04:00
Kilakk	91e440e26c	Fixes #3801, C4 will no longer destroy the analyzer it's inside of ... Committed to dev-freeze because the fix doesn't work with the click code on master	2013-10-27 00:42:11 -04:00
jack-fractal	d370c6f81e	* fixing the visibility update loop through the dictionary ... * moving the standard turf and object update triggers to the visibility_network update_triggers.dm file	2013-10-26 17:33:53 -04:00
jack-fractal	6764c54989	making a generic version of the AI's visibility code so that it can be reused by the Cult Spirits	2013-10-26 16:52:14 -04:00
Kilakk	1ed2ea6ec2	Fiddling with cooldown times	2013-10-26 13:35:31 -04:00
Kilakk	2aae632786	Added the ability to send faxes between departments	2013-10-26 13:21:56 -04:00
Nanai	c9d8fa15ab	Del rework, as requested.	2013-10-24 18:25:36 -04:00
Nanai	c9dea9b89d	New working supermatter engine! Virgil and Skymarshal's work. Functional! Uguu!	2013-10-24 15:47:26 -04:00
Segrain	858df5ca64	Fix for #3804.	2013-10-24 19:16:54 +03:00
Segrain	7af8066052	Balance fix.	2013-10-24 19:14:39 +03:00
Segrain	6cf485deae	Quickfix.	2013-10-24 19:13:05 +03:00
Segrain	c8fcabc181	Smallfix.	2013-10-24 19:11:04 +03:00
Segrain	bc9f57e66d	Sprite fix.	2013-10-24 19:09:45 +03:00
Segrain	d8f0c43be1	Merge remote-tracking branch 'upstream/master' into dev-freeze	2013-10-24 19:02:56 +03:00
Segrain	5698addc75	Code cleanup.	2013-10-24 09:54:15 +03:00
Chinsky	0dc3b3c31e	Merge pull request #3808 from Mloc/sleepyzas ... Moves around some ZAS stuff and fixes some things in FEA gas mixtures.	2013-10-23 22:04:22 -07:00