MrPerson 645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor ...

Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm

2014-06-09 01:50:44 -07:00

..

crates_lockers

Resolved Conflicts:

2014-05-25 10:59:08 -06:00

stool_bed_chair_nest

Merge pull request #3391 from Donkie/sofa

2014-05-14 10:37:06 +01:00

transit_tubes

Fixes a typo.

2014-04-21 21:00:23 +01:00

bedsheet_bin.dm

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

2014-06-09 01:50:44 -07:00

displaycase.dm

Resolved Conflicts:

2014-05-25 10:59:08 -06:00

door_assembly.dm

More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.

2014-05-01 23:07:35 +02:00

dresser.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00: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

Hopefully merge conflict fixes

2014-04-07 21:46:06 +10:00

flora.dm

More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.

2014-05-01 23:07:35 +02:00

girders.dm

Fixed the feedback messages for when you try to make a false wall with insufficient sheets.

2014-04-05 15:03:27 -03:00

grille.dm

meteorhit() is kill

2014-04-22 12:16:02 -05:00

janicart.dm

Change examine() from an atom verb to a mob verb

2014-05-01 09:56:39 -07:00

kitchen_spike.dm

More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.

2014-05-01 23:07:35 +02:00

ladders.dm

…

lamarr_cage.dm

Resolved Conflicts:

2014-05-25 10:59:08 -06:00

lattice.dm

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

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

mineral_doors.dm

Reisin walls and doors will now block superconductivity (heat)

2014-04-30 07:40:41 -03:00

mirror.dm

Fixes bullet_act not checking for damagetype on many, many objects.

2014-03-01 16:39:22 -08:00

mop_bucket.dm

Change examine() from an atom verb to a mob verb

2014-05-01 09:56:39 -07:00

morgue.dm

More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.

2014-05-01 23:07:35 +02:00

musician.dm

Creates canUseTopic(), a mob proc contained for the moment in the machinery.dm

2014-04-30 05:25:01 -03: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

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

2014-05-13 14:03:42 -05:00

signs.dm

More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.

2014-05-01 23:07:35 +02:00

tables_racks.dm

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

2014-05-18 20:50:38 -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

watercloset.dm

Merge pull request #3580 from argoneuscze/fixshowerfire

2014-05-06 19:46:57 -05:00

windoor_assembly.dm

More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.

2014-05-01 23:07:35 +02:00

window.dm

Fixes unwrenching noise

2014-05-24 19:34:06 +02:00