DJSnapshot
39387fa3bb
Merge pull request #3840 from MDReckless/dev
...
Grape Soda addition
2013-10-29 17:06:16 -07:00
DJSnapshot
8bb22f7e18
Merge pull request #3846 from Iamgoofball/boozetaketwo
...
Fixed a CATASTROPHIC GAME-CHANGING BUG with the Soda Dispenser that resulted in much immersuhan breaking: Grape Soda wasn't in the Soda Dispenser dispensable reagents list.
2013-10-29 17:03:54 -07:00
Iamgoofball
a4737f3b22
Added GRAPE DRANK to the Soda Dispenser.
2013-10-29 16:56:50 -07:00
Cael Aislinn
d19b9bc3b7
fixes the issue with coolant being ineffective
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 22:27:23 +10:00
DJSnapshot
730c406015
Merge pull request #3839 from caelaislinn/xenoarchaeology
...
Xenoarchaeology updates
2013-10-28 22:36:08 -07:00
DJSnapshot
fe6fda9e46
Merge pull request #3837 from Nanai/dev
...
Decapitation Fixes, Head Reattachment Surgery
2013-10-28 14:01:04 -07:00
MDReckless
5a8a629df7
Update drinkingglass.dm
2013-10-28 15:55:54 -04:00
Cael Aislinn
c419717255
tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details)
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:33:23 +10:00
Cael Aislinn
a4e5bad409
fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:10:17 +10:00
MDReckless
e6d42432ff
Changed grape soda description
2013-10-28 15:03:30 -04:00
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
Nanai
ba15537f6b
Added two new manuals by MagmaRam to the default engineering manual bookcase.
2013-10-27 18:25:25 -04: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
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
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
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
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
Chinsky
74f898a1a2
Merge pull request #3809 from DJSnapshot/antag
...
Fix for sunglasses and Night Vision Goggles
2013-10-23 21:58:44 -07:00
DJSnapshot
5f7ee54430
Fix for sunglasses and night vision goggles
2013-10-23 19:51:01 -07:00
Mloc
5234b1394b
Moves around some ZAS stuff and fixes some things in FEA gas mixtures.
...
ShareSpace now can take a gas mixture as an argument, alongside the usual list of tiles.
Three new procs on gas mixtures, add() multiply() and divide(). Self explanatory.
Zones with unsimulated tiles that sleep will now reset themselves to the average air.
assume_air will only add air to sleeping zones with unsimulated tiles if it can wake the zone up.
Signed-off-by: Mloc <colmohici@gmail.com >
2013-10-23 22:04:31 +01:00
Chinsky
1488850ad1
Merge pull request #3803 from Nanai/dev
...
Drinks Pack/Spritefixes and Vending Machine Loadout
2013-10-21 04:30:15 -07:00
Nanai
101459ed49
Replaces Jailbreaker Verte with Warlock's Velvet in the contraband crate. Guarenteed !!!fun!!!
2013-10-21 07:13:04 -04:00
Nanai
50f2f0ae46
Removes pin necessity on vending machines.
2013-10-21 07:12:23 -04:00
Nanai
4c01ecaee4
Fixed iced tea, adds canned ice tea and grape juice, adds grape juice, melon liquor, blue curacao, grenadine, poisonous wine. rebalances absinthe, and places it within the vendor.
2013-10-21 07:11:40 -04:00
Nanai
219fac680d
Changes the vending machine to account for new drinks, adds grape juice to the juicer.
2013-10-21 07:09:46 -04:00
