phil235 1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm

2015-04-06 19:38:51 +02:00

..

crates_lockers

Merge pull request #8625 from xxalpha/cyberplus

2015-04-04 20:57:48 +11:00

stool_bed_chair_nest

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

2015-04-06 19:38:51 +02:00

transit_tubes

…

barsigns.dm

adds more barsigns

2015-03-05 14:06:44 -05:00

bedsheet_bin.dm

ASS BLAST USA USA USA USA

2015-03-09 17:50:37 -04:00

displaycase.dm

…

door_assembly.dm

…

dresser.dm

…

electricchair.dm

…

extinguisher.dm

…

false_walls.dm

plasma/ripley update

2015-03-25 18:06:26 -05:00

flora.dm

…

girders.dm

plasma/ripley update

2015-03-25 18:06:26 -05:00

grille.dm

slime from carbon to simple animal

2015-03-14 23:40:57 +01:00

guncase.dm

Update guncase.dm

2015-04-03 13:19:45 -04:00

janicart.dm

slight fix

2015-03-09 19:19:17 +01:00

kitchen_spike.dm

bop

2015-03-12 20:00:10 -04:00

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

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

2015-03-20 17:02:00 +00:00

mineral_doors.dm

…

mirror.dm

Adds a cheap looking pulse animation for magic mirrors so wizards notice they are actually more than normal mirrors

2015-03-09 12:42:41 -04:00

mop_bucket.dm

…

morgue.dm

Fixes no blood dna on Mulebot and its blood tracks.

2015-02-26 19:31:55 +01:00

musician.dm

Added a preference toggle for hearing musical instruments

2015-03-22 01:54:30 -07:00

noticeboard.dm

…

OpTable.dm

…

safe.dm

…

signs.dm

…

spirit_board.dm

…

statues.dm

plasma/ripley update

2015-03-25 18:06:26 -05:00

table_frames.dm

…

tables_racks.dm

Fixes tableclimber knocking themself off the table when clicking it mid-climb.

2015-03-29 23:57:47 +02:00

tank_dispenser.dm

…

target_stake.dm

…

watercloset.dm

Fixes trash disappearing when washed in a sink.

2015-03-03 00:07:08 +01:00

windoor_assembly.dm

…

window.dm

slime from carbon to simple animal

2015-03-14 23:40:57 +01:00