MrPerson 3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel ...

Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm

2014-03-02 21:39:27 -08:00

..

crates_lockers

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

2014-03-02 21:39:27 -08:00

stool_bed_chair_nest

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

2014-03-02 21:39:27 -08:00

bedsheet_bin.dm

fixed disastrous and shameful failure

2014-02-13 19:16:53 -08:00

displaycase.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

door_assembly.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

dresser.dm

Adds telekinesis to click code. Fixes issue #1202, #1129, #247.

2013-09-17 18:19:09 -04:00

electricchair.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

extinguisher.dm

Quick fix for tables, lockers and general drop_item

2014-02-21 05:15:40 +04:00

false_walls.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

flora.dm

Adds a christmas tree to the bar

2013-12-08 13:23:55 -05:00

girders.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

grille.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

janicart.dm

Update icons after item is placed in cart.

2013-12-21 09:50:15 +02:00

kitchen_spike.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

ladders.dm

…

lamarr_cage.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

lattice.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

mineral_doors.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

mirror.dm

Slime Mob Refactor

2014-01-13 19:38:37 -05:00

mop_bucket.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

morgue.dm

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

2014-03-02 21:39:27 -08:00

musician.dm

* Fixes certain objects not using 3D sounds.

2013-11-21 23:50:53 +00:00

noticeboard.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

OpTable.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

safe.dm

Fix for the safe being very occasionally uncrackable (thanks, Sabbat).

2013-02-26 01:14:26 +00:00

signs.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

tables_racks.dm

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

2014-03-02 21:39:27 -08:00

tank_dispenser.dm

Adds telekinesis to click code. Fixes issue #1202, #1129, #247.

2013-09-17 18:19:09 -04:00

target_stake.dm

Quick fix for tables, lockers and general drop_item

2014-02-21 05:15:40 +04:00

transit_tubes.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

watercloset.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

windoor_assembly.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

window.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00