Ccomp5950
91c56c6e77
Fixed Booze dispensers and soda dispensers to be able to use glasses instead of beakers.
...
Typo fix: Added taquilla back in, it's ID wasn't correct in the reagent list for booze dispenser.
added watermellon juice to the soda machine.
Todo: Fix NanoUI for these to now mention beakers, and have enough space to list watermellon juice
2013-11-22 21:46:11 -06:00
Ccomp5950
39ed2b7042
Fixed the bug with supply not sending supermatter if only one crate (it was deleting it instead of deleting the process...odd)
...
Also fixed a bug where if the supermatter is ordered off the supply shuttle it wouldn't produce power (process was deleted while in crate)
supplypacks.dm is just a spelling fix.
2013-11-19 00:49:55 -06:00
Ccomp5950
fc4107e6ec
TAB2SPACE of file.
...
No changes in this commit besides standardizing indentions.
2013-11-19 00:46:27 -06:00
Nanai
c977a40b3f
Adjusted areas for medbay(Surgery, Patient rooms, genetics cloning, breakroom, psych office) so their APCs work.
...
Adjusted areas for engineering storage to actually function.
2013-11-17 16:19:13 -05:00
Nanai
808653ed12
Map Fixes IV: Areas Rising
...
Removed the odd locker room area.
Properly edited dorm areas to individual areas UNDER the sleep area so as to properly reap the benefits of being a dorm.
Added a camera to security dorms.
SMES wiring adjustment.
2013-11-17 15:50:55 -05:00
Nanai
40695f291e
Additional SM bugs(hopefully) quashed
...
Fixed(?) disposal issues.
Hopeful fix of supply packs, commented out the shard until it's fully functional.
Please report any continuing wonkiness I can't reproduce!
2013-11-16 13:58:30 -05:00
Michael Johnson
bcd140a691
Made the telesci console a proper NanoUI
2013-11-13 08:01:00 -05:00
Iamgoofball
3e02b55386
reduced fizzle chance to 50, it was very common and overrode everything
2013-11-09 22:51:20 -08:00
Iamgoofball
d83c07ca0e
Made telescience WORK!
2013-11-09 22:42:54 -08:00
DJSnapshot
7665a1a00e
Merge pull request #3895 from Baystation12/master
...
Merge Dev with Master
2013-11-07 16:31:43 -08:00
Chinsky
04237f47cb
Merge pull request #3894 from DJSnapshot/master
...
Fix for fire alarms in Mining and Research Outpost
2013-11-07 16:27:38 -08:00
DJSnapshot
7c59c41b13
Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station.
2013-11-07 16:02:57 -08:00
Kilakk
ee34d281f9
Fixes #3890 , gave Aloe a more reasonable boozepwr
2013-11-07 18:54:42 -05:00
Mloc
d2fa118fc7
Merge pull request #3888 from comma/dev
...
Nerfing icons
2013-11-07 12:30:16 -08:00
Mloc
96ebb4edc8
Merge pull request #3889 from zekesulastin/genetics-beaker
...
Fixes duplicate beaker on Eject Occupant
2013-11-07 02:48:49 -08:00
Iamgoofball
9ce90a0f41
Note to self: Remember to push your nerfs next time.
2013-11-06 19:10:35 -08:00
ZekeSulastin
4dae789cb5
Fixes duplicate beaker on Eject Occupant
2013-11-06 19:37:56 -05:00
Chinsky
e513b6943e
Forgot to remove lying icons / need for them for monkeys. Ook.
2013-11-06 23:54:13 +04:00
Chinsky
ba63c5a1bc
Removed overlays_lying.
...
Now all that shit is done by fancy transformations, client-side.
2013-11-06 22:45:32 +04:00
Chinsky
e3d19eceab
Updated paths for smoke generator
2013-11-06 22:44:56 +04:00
Chinsky
1f110d5a74
Merge pull request #3885 from DJSnapshot/master
...
Cleanbot now cleans mucus
2013-11-05 23:34:44 -08:00
DJSnapshot
3aa8d088bd
cleanbot now cleans mucus
2013-11-05 22:24:02 -08:00
Iamgoofball
60e73bc9ac
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into boozetaketwo
2013-11-05 11:44:37 -08:00
Mloc
d228089601
Merge pull request #3880 from comma/master
...
Where can I get my idiot certificate.
2013-11-04 16:05:07 -08:00
Chinsky
b7edb181ed
Where can I get my idiot certificate.
2013-11-05 03:59:39 +04:00
Mloc
2eb98fd86e
Merge pull request #3879 from comma/master
...
derp
2013-11-04 15:18:50 -08:00
Chinsky
5df1b3c0d4
derp
2013-11-05 03:17:44 +04:00
Chinsky
65c248cda0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma
2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f
Cleaned the fuck out of smoke.
2013-11-05 02:57:23 +04:00
Chinsky
35f262c137
Merge pull request #3871 from Mloc/fun
...
SDQL and SQDL 2 from Lunacode.
2013-11-04 13:30:24 -08:00
Mloc-Argent
8005d8bf2b
More power to devs. (this is a bad idea)
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-11-04 21:31:29 +00:00
Iamgoofball
ec90e5b3c4
Fixed worldloop issues.
2013-11-04 13:19:26 -08:00
Iamgoofball
ee50a26a6b
Removed Fart event, fixed copypasta x999, added the telepads to the machines list.
2013-11-04 13:16:00 -08:00
Mloc
68f796b572
Merge pull request #3874 from comma/master
...
Some virus fixes
2013-11-04 13:15:40 -08:00
Chinsky
40e862fe00
GC's virus dummies #whoa #derp
2013-11-05 01:13:49 +04:00
DJSnapshot
c20c84b328
Dun goofed
2013-11-04 13:10:33 -08:00
Chinsky
3a425c6095
Another uncommented log debug line.
2013-11-05 01:08:31 +04:00
DJSnapshot
15a2bcc54f
Fix so bans can work again.
2013-11-04 13:07:03 -08:00
Iamgoofball
d4fc17c77a
Fixes an issue where the teleporter can malfunction while calibrated.
2013-11-04 12:32:10 -08:00
Mloc
86ebf818f1
Merge pull request #3872 from comma/master
...
Goasts & Spam
2013-11-04 10:49:07 -08:00
Chinsky
9c6a51b3fb
Commens out debuglog spam in side effects
2013-11-04 22:38:55 +04:00
Chinsky
98ba7e4699
Fixes zombie goast tableflips
2013-11-04 22:36:22 +04:00
Mloc-Argent
4ef079aba3
SDQL and SQDL 2 from Lunacode.
...
SQL syntax things for datums. 'UPDATE /obj IN world SET color = "pink"'
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-11-04 16:16:53 +00:00
Mloc-Argent
37fbf3848a
Uses fancy new 501 blendmodes to make fire alarms look fancier.
...
See: http://i.imgur.com/GLzdBfv.gif
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-11-04 14:01:28 +00:00
Mloc-Argent
f1b230edc4
Merge branch 'master' into dev
2013-11-04 10:46:13 +00:00
Iamgoofball
cfdb0a65a7
made some stuff sooper dooper hard to get
2013-11-03 22:09:31 -08:00
Iamgoofball
4b6ea531a4
text issue regarding \red.
2013-11-03 22:06:02 -08:00
Iamgoofball
e4a2936e2b
Added Telescience! Moves Misc. Research to the spot between the Solars and Xenobio.
2013-11-03 21:49:09 -08:00
Chinsky
6152644155
Merge pull request #3868 from DJSnapshot/master
...
Devs are speshul snoflakes too.
2013-11-03 19:19:36 -08:00
DJSnapshot
6ef89ef868
Devs are speshul snoflakes too.
2013-11-03 19:18:33 -08:00
