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
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
Chinsky
88f7a48434
Merge pull request #3800 from Segrain/dev
...
Dev update.
2013-10-21 03:04:27 -07:00
Segrain
4d79764478
Vox wallets.
2013-10-21 05:13:09 +03:00
Segrain
6655ae9b11
Wallets and cards.
2013-10-21 05:10:33 +03:00
Segrain
188e68feb8
Money spawning.
2013-10-21 05:06:46 +03:00
Segrain
9a662594f2
Cash money.
2013-10-21 05:04:45 +03:00
Segrain
8bd055357a
Same fix again.
2013-10-21 04:48:07 +03:00
Segrain
121b10b16c
Conflict fix.
2013-10-21 04:37:28 +03:00
Nanai
137cbba8e4
Cloning pod altered to hold 3 clones worth of biomass at roundstart.
2013-10-20 17:38:26 -04:00
Nanai
461794c662
Cloning pod altered to hold 3 clones worth of biomass at roundstart.
2013-10-20 17:07:02 -04:00
ZekeSulastin
28d546f2b1
Added dialysis volume. Also numbness message for entering.
2013-10-19 17:03:13 -04:00
ZekeSulastin
3455bf7cc1
Add/remove beaker from sleeper for dialysis
...
Redoes the sleeper attackby() prompt to match cryo's style. Also
removes the millionbeaker in favor of a standard large.
2013-10-19 17:03:13 -04:00
ZekeSulastin
0df64f898c
Added dialysis to sleepers
...
Rapidly removes reagents from patient at the cost of blood.
Ported from Jamini's NEV Unity codebase.
2013-10-19 17:03:13 -04:00
Nanai
752f9f80eb
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into uguu
2013-10-19 13:13:02 -04:00
Mloc
98caca85f0
Merge pull request #3785 from comma/dev
...
Some fixes
2013-10-19 03:56:29 -07:00
Segrain
ace205b323
Code cleanup.
2013-10-18 08:40:45 +03:00
Segrain
183c44c4c8
Smallfix.
2013-10-18 08:38:14 +03:00
jack-fractal
3732a9c3b9
Adding the dispensers to the cargo lists.
...
Making a sub-type of the dispensers so that they spawn disconnected from the ground.
2013-10-17 19:48:57 -04:00
