f49abb5117
Adds multiple drinks to the shotglass list so they can be mixed within.
...
Re-adds bottle of booze that got removed in a merge conflict a while back.
2015-02-09 18:25:03 -06:00
ba18c0e925
Adds sprites and iconstates for shot glass.
2015-02-09 17:38:23 -06:00
e728185a49
Fixes shot glass sprite changing when something's poured in (TEMP FIX)
2015-02-09 16:55:11 -06:00
78c5c66afb
Note: Compile before you commit ffs
2015-02-07 00:31:12 -06:00
4fb8b34ee0
Merge remote-tracking branch 'remotes/upstream/master' into changesafecontents
...
Conflicts:
code/modules/food&drinks/drinks/drinks/bottle.dm
2015-02-07 00:18:39 -06:00
c5d4dc7ff4
Merge pull request #7568 from TheVekter/typofix
...
Fixes a few typos
2015-02-06 21:55:09 -08:00
113de4d97b
Merge pull request #7571 from TZK13/Revitiligo-Fix
...
Fixes revitiligo
2015-02-07 05:01:06 +01:00
87f9bf4688
Merge pull request #7569 from vista-/that-fucking-typo
...
Fixes a typo in the shuttle recall message.
2015-02-07 04:59:30 +01:00
ff65ec2018
Fixed "Chilli" -> "Chili" and "Coco" -> "Cocoa". Pray it passes Travis.
2015-02-06 05:22:53 -06:00
4e2b2fe20c
Adds new top-shelf vodka to the safe (also there's a bottle hidden on the station see if you can find it~)
2015-02-06 02:29:23 -06:00
98465ea1dd
Adds the new rare Vodka to the game and to the Safe.
2015-02-06 00:21:02 -06:00
d7e47901ef
Adds new stuff to the vault, also adds the shot glasses to the booze-o-mat.
2015-02-05 21:44:32 -06:00
4074037954
Adds shot glasses to the game.
2015-02-05 20:48:34 -06:00
ec79511215
Merge pull request #7382 from Iamgoofball/patch-21
...
buffs styptic, silver sulf, and synthflesh
2015-02-05 16:16:58 -08:00
1ff9f89062
Fixes revitiligo.
2015-02-05 17:00:54 -06:00
fdb9c92736
Merge pull request #7494 from paprka/dirsigns
...
Adds directional signs from bay
2015-02-05 16:28:26 -06:00
9bc2137815
man fuck typos
...
Whoops, might wanna update on my end before changing a path.
Fixed typo 'Tequilla'.
2015-02-05 15:43:09 -06:00
3f3a8bf84c
Fixes that fucking typo.
2015-02-05 21:48:15 +01:00
7accea7f6b
Merge pull request #7554 from paprka/ablightonrobotics
...
Research and different mat requirements for borg upgrades
2015-02-05 11:57:22 -08:00
bb188da5bf
Merge pull request #7490 from Miauw62/sayfix
...
Fixes saycode breaking when the ckey of a ghost was set to null.
2015-02-05 11:54:23 -08:00
b9363249b3
Merge pull request #7471 from Menshin/properly_propelled_sanitization
...
HTML sanitization tweaking
2015-02-05 22:27:35 +03:00
f5359aba3b
Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo
...
Adds photos and some other stuff to security and medical records
2015-02-05 18:45:53 +01:00
6fab02e7cd
Merge pull request #7546 from TZK13/Purple-Shorts
...
Adds purple shorts
2015-02-05 18:16:14 +01:00
574fc61c83
Merge pull request #7543 from TZK13/Work-Boots
...
Adds work boots for engineers
2015-02-05 18:15:28 +01:00
0c071c54f0
Merge pull request #7445 from Deantwo/ChemMasterGetsGloomy
...
ChemMaster Update
2015-02-05 18:14:08 +01:00
137f9171c6
Merge pull request #7440 from AlexanderUlanH/bleb
...
Blob Update
2015-02-05 18:12:12 +01:00
99b2a0834e
Merge pull request #7186 from paprka/releaseseq
...
Readds the release sequence for cryogenics and buffs it
2015-02-05 18:10:40 +01:00
5cb2392f1e
Merge pull request #7197 from TZK13/New-Disease-Symptoms
...
Adds three new disease symptoms
2015-02-05 18:09:53 +01:00
65a3674969
Merge pull request #7489 from paprka/ghostsa
...
Makes ghosts float up and down ala zero-g
2015-02-05 18:08:38 +01:00
f5653fa923
Merge pull request #7500 from Iamgoofball/patch-27
...
Fixes #7493
2015-02-05 18:07:52 +01:00
15b01a2254
Merge pull request #7547 from Menshin/pinpointer_fix
...
Fixes pinpointer runtimes on qdel
2015-02-05 18:05:26 +01:00
aa3f6d8635
Merge pull request #7540 from Delimusca/slimefixins
...
slime feeding hotfix
2015-02-05 18:05:15 +01:00
ac60a828f9
Merge pull request #7536 from Iamgoofball/chemblob
...
fixes my shit
2015-02-05 18:04:54 +01:00
e8dd56a656
Late Fixes
...
- Removed spaces. (such a huge nerf!)
- Fixes https://github.com/tgstation/-tg-station/issues/7091
- Fixes two little errors I made on the CondiMaster's UI.
- Removes "No pill bottle inserted." from CondiMaster.
- Changes the window's default size a little to better suit the changes.
2015-02-05 12:05:12 +01:00
468b00a16f
bandaids diseases and bleeding
2015-02-05 01:36:16 -08:00
2978d1e10a
Merge pull request #7552 from paprka/monkeyinject
...
Fixes syringes with monkeys, virus transfers, and iv drip feedback
2015-02-04 23:19:24 -06:00
2393380711
grenades now add up the temperature of contained beakers when mixing
2015-02-04 18:59:18 -08:00
ce7c2e13ff
Changes Spellbook can't open text
2015-02-04 18:55:34 -08:00
2098fd5ea5
Fixes #7497
2015-02-04 18:53:33 -08:00
6299c546ab
fixes a runtime related to stacks
2015-02-04 18:05:45 -08:00
26873cd973
changes combat requirement to materials
2015-02-04 13:12:43 -08:00
b7994d7c2d
research and different mat requirements for borg upgrades
2015-02-04 13:01:05 -08:00
f6bf89656b
fixes syringes with monkeys, virus transfers, and iv drip feedback
2015-02-04 12:21:05 -08:00
50cc057504
Lots of fixes and improvements
2015-02-04 17:35:42 +04:00
d8e2171f1b
Fixes pinpointer runtimes on qdel.
2015-02-04 14:26:19 +01:00
2b195c1f2d
Merge pull request #7512 from paprka/rodslel
...
Rods now change sprite depending on how much in the stack
2015-02-04 13:03:16 +01:00
2edcbc5a08
Merge pull request #7526 from TheVekter/redbutton
...
Adds red button toy to arcade machines
2015-02-04 12:17:24 +03:00
01bf5b343f
Adds purple shorts.
2015-02-04 01:23:58 -06:00
8400ec9800
Adds work boots and fixes character setup previews.
2015-02-04 00:32:15 -06:00
7622968e56
Merge pull request #7538 from paprka/ohmygah
...
Fixes hardsuit runtime
2015-02-04 00:24:42 -06:00
TheVekter