Iamgoofball e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs ...

Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi

2015-02-20 22:00:53 -08:00

..

crates_lockers

Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs

2015-02-20 22:00:53 -08:00

stool_bed_chair_nest

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

transit_tubes

SubSystem rewrite

2014-12-31 13:25:41 +00:00

barsigns.dm

add singulo description

2015-02-20 12:56:11 -05:00

bedsheet_bin.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit

2015-01-21 15:19:32 -08:00

displaycase.dm

…

door_assembly.dm

Fixes being unable to build doors over firelocks, blast doors and shutters.

2014-12-31 20:47:17 -07:00

dresser.dm

Fixes some grammar for the dresser.

2014-12-22 20:00:31 -06:00

electricchair.dm

…

extinguisher.dm

…

false_walls.dm

Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.

2014-12-09 19:38:49 -08:00

flora.dm

Fixes ppgrass ausbush having wrong icon_state

2015-01-18 17:25:14 -03:00

girders.dm

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

grille.dm

Merge pull request #6584 from phil235/HoloSwordFix

2015-01-01 16:39:16 -03:00

janicart.dm

fixes janicart

2015-02-01 03:09:09 -08:00

kitchen_spike.dm

Making all meat subtypes of snacks/meat

2015-02-08 21:36:54 +01:00

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

catwalk fixes

2015-01-28 19:30:21 -08:00

mineral_doors.dm

…

mirror.dm

Fixes being able to smash grille/newscaster/mirror/lights with holo esword.

2014-12-24 23:50:20 +01:00

mop_bucket.dm

…

morgue.dm

Replaces a bunch of input() with stripped_input()

2015-01-11 19:02:53 -03:00

musician.dm

usr -> user in monkey dexterity.

2015-01-21 19:57:48 +02:00

noticeboard.dm

…

OpTable.dm

…

safe.dm

…

signs.dm

adds directional signs from bay

2015-02-01 06:13:21 -08:00

spirit_board.dm

…

statues.dm

Fixing a few things in statue's attackby

2015-01-06 16:26:16 +01:00

table_frames.dm

Indentation fix. How did that single space instead of the tab worl anyway...

2015-01-16 15:38:31 +02:00

tables_racks.dm

Updates to table/table frame deconstruction

2015-01-15 17:55:51 +02:00

tank_dispenser.dm

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

target_stake.dm

…

watercloset.dm

Goon Chemistry Commit 3: Pyrotechnics and other changes

2015-01-11 08:49:09 -08:00

windoor_assembly.dm

…

window.dm

Simply adds a delay to knocking in windows with TK.

2015-01-15 11:49:38 +02:00