Cheridan 5ec24c8613 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk ...

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/modules/reagents/Chemistry-Reagents.dm

resolved with Theirs, must manually reapply fixes

2014-02-25 19:39:26 -06:00

..

crates_lockers

Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk

2014-02-25 19:39:26 -06:00

stool_bed_chair_nest

Merge pull request #2558 from MrPerson/rollerbeds

2014-01-31 14:13:51 -08:00

bedsheet_bin.dm

fixed disastrous and shameful failure

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

displaycase.dm

code/game/object/items/weapons/* lowercase pass

2013-11-24 08:49:34 +01:00

door_assembly.dm

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

dresser.dm

…

electricchair.dm

Fixes #633. Problem was a null.loc runtime from the chair being disassembled.

2013-10-27 19:37:38 -05:00

extinguisher.dm

Quick fix for tables, lockers and general drop_item

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

false_walls.dm

…

flora.dm

Adds a christmas tree to the bar

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

girders.dm

Adds fingerprints to a bunch of stuff. De-texts computer build paths.

2013-12-22 18:57:33 +01:00

grille.dm

Grill bugfix

2014-02-04 11:49:22 +02:00

janicart.dm

Update icons after item is placed in cart.

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

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

…

mineral_doors.dm

fixes resin doors

2014-02-05 22:44:31 -06: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

Cleans up the for() and list handling in update.

2014-01-08 18:12:17 -05: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

…

safe.dm

…

signs.dm

…

tables_racks.dm

Quick fix for tables, lockers and general drop_item

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

tank_dispenser.dm

…

target_stake.dm

Quick fix for tables, lockers and general drop_item

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

transit_tubes.dm

MiniStation Update

2014-02-05 22:04:58 +00:00

watercloset.dm

Replaces atom/HasEntered() with the builtin atom/movable/Crossed()

2013-10-23 16:20:20 -04:00

windoor_assembly.dm

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

window.dm

Slime Mob Refactor

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