Cael_Aislinn cccff0881f Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport ...

Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-10-09 23:07:41 +10:00

..

crates_lockers

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-10-05 22:21:26 +10:00

stool_bed_chair_nest

Fixes issue 865.

2012-09-15 23:37:20 +00:00

bedsheet_bin.dm

File restructuring!

2012-08-29 18:00:30 +00:00

displaycase.dm

File restructuring!

2012-08-29 18:00:30 +00:00

door_assembly.dm

…

electricchair.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00

extinguisher.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

false_walls.dm

- Fixes issue 985. false walls are now called 'wall' instead of 'falsewall', which made them obvious.

2012-10-02 21:40:36 +00:00

girders.dm

Fixes issue 974. When using metal on a girder as a cyborg, the girder will no longer disappear randomly.

2012-10-02 22:16:15 +00:00

grille.dm

- Committing the updated recursive explosion code. It now takes into account objects too.

2012-08-30 05:38:10 +00:00

kitchen_spike.dm

File restructuring!

2012-08-29 18:00:30 +00:00

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

File restructuring!

2012-08-29 18:00:30 +00:00

mineral_doors.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

mirror.dm

…

mop_bucket.dm

File restructuring!

2012-08-29 18:00:30 +00:00

morgue.dm

File restructuring!

2012-08-29 18:00:30 +00:00

musician.dm

uruereruguu

2012-09-29 23:14:57 +00:00

noticeboard.dm

Noticeboard updates. Mostly just tidying up, but noticeboards now grab paper on the same tile as them on round start. This is mainly so away missions can have things pinned to noticeboards.

2012-09-09 12:01:41 +00:00

shuttle_engines.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

tables_racks.dm

File restructuring!

2012-08-29 18:00:30 +00:00

target_stake.dm

…

watercloset.dm

Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport

2012-10-09 23:07:41 +10:00

windoor_assembly.dm

…

window.dm

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00