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

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

conflicts resolution

2014-12-16 02:52:08 +03:00

..

crates_lockers

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

2014-12-16 02:52:08 +03:00

stool_bed_chair_nest

Ok now explosions shall work properly

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

transit_tubes

Ok now explosions shall work properly

2014-12-05 23:21:48 +03: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

Merge remote-tracking branch 'upstream/master' into wallz

2014-11-12 20:11:20 -03:00

flora.dm

Fixes ausbushes icon_state for the subclasses

2014-12-03 21:34:02 -03:00

girders.dm

Ok now explosions shall work properly

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

grille.dm

Added datum mutations

2014-12-12 04:48:11 +03:00

janicart.dm

Merge pull request #5427 from paprka/littlejanitorthings

2014-11-03 17:19:37 -08:00

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

Ok now explosions shall work properly

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

lattice.dm

Ok now explosions shall work properly

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

mineral_doors.dm

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00

mirror.dm

adding diagonal attack animation.

2014-11-07 15:42:07 +01:00

mop_bucket.dm

…

morgue.dm

…

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

Even the damned statue !!!

2014-11-01 22:06:59 +01:00

table_frames.dm

added deconstructing

2014-11-06 18:01:19 -08:00

tables_racks.dm

Added datum mutations

2014-12-12 04:48:11 +03:00

tank_dispenser.dm

…

target_stake.dm

…

watercloset.dm

…

windoor_assembly.dm

Fix windoor construction exploit.

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

window.dm

Added datum mutations

2014-12-12 04:48:11 +03:00