Cael_Aislinn 2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

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

2012-10-21 00:25:05 +10:00

..

crates_lockers

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

2012-10-15 23:17:18 +10:00

stool_bed_chair_nest

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

2012-10-15 23:17:18 +10:00

bedsheet_bin.dm

Moved the tank dispenser define out of defines.

2012-10-17 22:43:58 +00:00

displaycase.dm

File restructuring!

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

door_assembly.dm

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

2012-08-24 21:55:58 +10:00

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

Committing for Aranclanos:

2012-10-15 16:45:18 +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

Another small chunk of reorganizing objects.

2012-08-22 21:55:46 +00:00

lamarr_cage.dm

Moving stuff around part 2!

2012-08-22 16:32:45 +00:00

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

Moving stuff around part 2!

2012-08-22 16:32:45 +00:00

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

safe.dm

Fixed issue 1008. (Putting stuff into the seed extractor doesn't update sprites)

2012-10-15 16:17:55 +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

tank_dispenser.dm

Moved the tank dispenser define out of defines.

2012-10-17 22:43:58 +00:00

target_stake.dm

Another small chunk of reorganizing objects.

2012-08-22 21:55:46 +00:00

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

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

2012-08-24 21:55:58 +10:00

window.dm

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

2012-10-21 00:25:05 +10:00