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
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
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
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
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
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
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
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
2098fd5ea5
Fixes #7497
2015-02-04 18:53:33 -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
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
4f618c9ca3
fixed slime drag exploits
2015-02-03 22:09:05 -07:00
6e329a6cf4
fixes hardsuit runtime
2015-02-03 21:07:38 -08:00
d0b51e86ed
fixes #7154
2015-02-03 19:09:18 -08:00
0645d46168
iv drip hotfixes
2015-02-03 18:34:32 -08:00
a480ffbc98
whole lotta bugfixes
2015-02-03 17:57:57 -08:00
5f884b6017
Merge pull request #7496 from dannno/killyoselfmyman
...
Adds proper suicide messages to like a lot of stuff
2015-02-03 16:43:09 -06:00
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
784766e8cc
Merge pull request #7509 from paprka/gunstuff
...
Improves pulse guns, ERT, and centcomm areas
2015-02-03 16:14:48 -06:00
500a236b51
Merge pull request #7507 from paprka/hardsuitfixes
...
Fixes mining helmet not having nodrop or thickmaterial flags
2015-02-03 16:03:15 +01:00
6de33d4063
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
...
Conflicts:
_maps/map_files/generic/z2.dmm
2015-02-02 19:13:49 -08:00
48413b4a89
makes roundstart pills append their reagent number to their name, only roundstart ones do this
2015-02-02 18:35:51 -08:00
6068fb4162
Merge pull request #7455 from Iamgoofball/patch-25
...
Fixes #7258
2015-02-02 18:32:02 -08:00
d8823a8038
Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman
2015-02-02 19:30:24 -05:00
9bddcb3df4
Merge pull request #7492 from xxalpha/spacesuit_storage
...
Repath all non jetpack tank types to tank/internals
2015-02-02 18:52:51 +01:00
e4262d21a5
nanite injector for med ert
2015-02-02 06:24:16 -08:00
106fbf6347
Merge pull request #7487 from paprka/voxtest
...
Removes voxtest 2, removes /tg/ culture
2015-02-02 15:02:27 +03:00
d232086ff5
small bandaid fix
2015-02-02 03:54:24 -08:00
18a90495b2
updates to ERT stuff
2015-02-02 03:33:37 -08:00
8173cd2460
fixes pulse rifles not being emp proof apparently
2015-02-01 23:27:56 -08:00
TheVekter