iamgoofball 221385f884 Merge branch 'master' of https://github.com/tgstation/-tg-station into byond ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

2015-01-01 11:51:43 -08:00

..

crates_lockers

Merge pull request #6678 from paprka/nitrile

2015-01-01 00:29:04 -03:00

stool_bed_chair_nest

Fixes a lot of "the the" in messages.

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

transit_tubes

Fixes a lot of "the the" in messages.

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

bedsheet_bin.dm

…

displaycase.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

door_assembly.dm

Merge pull request #6027 from fleure/airlockfix

2014-11-26 10:57:54 -08:00

dresser.dm

…

electricchair.dm

…

extinguisher.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

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 ausbushes icon_state for the subclasses

2014-12-03 21:34:02 -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

…

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

lattice.dm

clicking on the lattice will now construct a catwalk as well

2014-12-29 05:24:48 -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

Can now click switch with any object

2014-12-14 12:22:15 +01:00

musician.dm

…

noticeboard.dm

…

OpTable.dm

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

safe.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

signs.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

spirit_board.dm

…

statues.dm

…

table_frames.dm

Fixes a lot of "the the" in messages.

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

tables_racks.dm

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

2014-12-28 11:20:15 +03:00

tank_dispenser.dm

…

target_stake.dm

…

watercloset.dm

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

2015-01-01 11:51:43 -08:00

windoor_assembly.dm

Fix windoor construction exploit.

2014-11-24 13:12:00 +01:00

window.dm

Conflicts resolution

2014-12-29 11:49:30 +03:00