Ccomp5950
9e4e46cf44
Removed soda items from Booze dispenser
2013-11-23 04:49:02 -06:00
Ccomp5950
df7c877da7
Space Soda should now show up in the Soda Dispenser
2013-11-23 02:02:14 -06:00
Ccomp5950
3a177a95c4
And fix so Space Cola shows up too.
2013-11-23 01:50:17 -06:00
Ccomp5950
ec79e75c0f
Fixed nanoUI issues with Watermelon Juice in the Soda Dispenser
...
Added some if statements so that NanoUI for the booze/soda dispensers isn't /exactly/ like the chemdispenser, mentions glass instead of beaker, and "drinks" instead of chemical.
Also removed my debug messages
2013-11-23 01:43:34 -06:00
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
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
Iamgoofball
9ce90a0f41
Note to self: Remember to push your nerfs next time.
2013-11-06 19:10:35 -08: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
Iamgoofball
60e73bc9ac
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into boozetaketwo
2013-11-05 11:44:37 -08: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
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-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
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
8c69e3d8b7
derp
2013-11-04 05:53:10 +04:00
Chinsky
6a235716f8
Merge branch 'master' into dev
2013-11-04 05:38:46 +04:00
Mloc
7fdcf3deee
Merge pull request #3866 from comma/master
...
Itty bitty antilag bits.
2013-11-03 17:21:20 -08:00
Chinsky
6402581595
Itty bitty antilag bits.
...
-If wound disappears, do not process it.
-Moved reagents checks so they are only done when wound is internal. They have no effects on non-internal wounds anyway.
-Calling update_body only when losing limbs, other times UpdateDamageIcon(] is right proc
2013-11-04 05:16:04 +04:00
DJSnapshot
231131c1f5
Merge pull request #3814 from Baystation12/dev-freeze
...
0.1.5 merge.
2013-11-03 14:02:16 -08:00
DJSnapshot
11f0b1ef92
Fixed delay so anyone with R_SERVER can use it.
2013-11-03 13:31:54 -08:00
DJSnapshot
2f4812c183
Merge pull request #3861 from Iamgoofball/boozetaketwo
...
Three booze dispenser bug tangos down. You couldn't put drinking glasses in, and Whiskey wasn't in the reagents list.
2013-11-02 16:05:10 -07:00
Iamgoofball
2c30455b10
Grammar tango, spotted and eliminated.
2013-11-02 15:33:22 -07:00
Iamgoofball
ca741fbdd7
Two booze dispenser bug tangos down. You couldn't put drinking glasses in, and Whiskey wasn't in the reagents list.
2013-11-02 15:09:04 -07:00
Mloc
73e6311612
Merge pull request #3859 from comma/dev
...
Made robolimbs into overlays instead of grayscaling limb icon.
2013-11-02 12:54:57 -07:00
Chinsky
d779253ba1
Made robolimbs into overlays instead of grayscaling limb icon.
2013-11-02 23:53:23 +04:00
DJSnapshot
63fb3f29ea
mecha fixes
2013-11-02 12:26:34 -07:00
Iamgoofball
74b5a003cc
Fixed Copypasta!
...
Fixed Copypasta!
2013-11-02 11:17:17 -07:00
Iamgoofball
a75492d26b
Startoad's plasma windows commit, I'm doing the github stuff for it.
...
3677121b51
2013-11-01 18:53:45 -07:00
