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
DJSnapshot
524e3b3d2b
Merge pull request #3835 from Kilakk/dev
...
Added a new destination tagger sprite
2013-10-28 07:38:00 -07:00
Kilakk
dcba4078ec
Using the one on the left
2013-10-28 10:34:04 -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
577b1f2da7
Added in sprites for two new manuals by MagmaRam.
2013-10-27 18:27:15 -04:00
Nanai
a8ca33540f
Updated sprites for the Captain and Centcomm stamps to look a bit more distinctive and official.
2013-10-27 18:26:44 -04: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
DJSnapshot
57a5e70968
Merge pull request #3825 from Kilakk/dev
...
Added vending machine stocking
2013-10-26 23:36:21 -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
Mloc
080c72d276
Merge pull request #3819 from Kilakk/dev
...
Added the ability to send faxes between departments
2013-10-26 13:59:06 -07:00
Kilakk
97ddfc1007
Removed a silly duplicate entry in the changelog
2013-10-26 13:36:34 -04:00
Kilakk
1ed2ea6ec2
Fiddling with cooldown times
2013-10-26 13:35:31 -04:00
Kilakk
133a06ddc4
Gave fax machines on the map their "department" variables
2013-10-26 13:29:07 -04:00
Kilakk
2aae632786
Added the ability to send faxes between departments
2013-10-26 13:21:56 -04:00
Mloc
e0f95c79a9
Merge pull request #3816 from Nanai/dev
...
Supermatter Engine Code Replacement
2013-10-24 15:30:23 -07: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
Mloc
6fbc43d576
Merge pull request #3810 from Segrain/master
...
Smallfix.
2013-10-24 00:44:40 -07: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
02e7cec3e6
Merge pull request #3807 from fauxki/dev
...
Dev - Map and Icon Fixes
2013-10-22 21:46:54 -07:00
fauxki
5f6181f665
Fixes to icons of snorkel and inflatable to make them appear correctly on sprite.
2013-10-22 17:59:55 -07:00
fauxki
66757d0650
* Should fix bar shutters not working.
...
* Switches floor tiles in beach holodeck because the water effect wasn't working correctly.
2013-10-22 17:58:54 -07: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
9c2306014f
Replaces/touches up sprites for Milkshake, Iced Tea, Canned Iced Tea and Lemonade with superior quality. Added sprites of rose grenadine(bottled/glass), melon liquor, blue curacao, sui dream, absinthe(glass), and poisonous ichor(glass/bottle)
2013-10-21 07:15:48 -04: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
Chinsky
88f7a48434
Merge pull request #3800 from Segrain/dev
...
Dev update.
2013-10-21 03:04:27 -07:00
Chinsky
70899a0375
Merge pull request #3799 from Nanai/dev
...
Cloning Pod Rebalance
2013-10-21 03:02:36 -07:00
