PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02:00

..

crates_lockers

Merge pull request #9862 from Zuhayr/dev

2015-06-20 17:27:26 +01:00

stool_bed_chair_nest

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-22 16:59:19 +02:00

barsign.dm

Adds 9 new bar signs.

2015-04-24 17:35:07 +03:00

bedsheet_bin.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

coathanger.dm

Debugging!

2015-05-12 21:30:06 +09:30

curtains.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-05-11 09:28:59 +02:00

displaycase.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

door_assembly.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

electricchair.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

extinguisher.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

flora.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

girders.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

grille.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-24 18:15:28 +02:00

inflatable.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

janicart.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

kitchen_spike.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

ladders.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

lamarr_cage.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

lattice.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-26 20:28:47 +02:00

mirror.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

mop_bucket.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

morgue.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

musician.dm

objects/effects, objects/structures

2015-05-30 14:37:40 +01:00

noticeboard.dm

Fixes #9076

2015-05-30 05:24:44 +09:30

safe.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

signs.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

simple_doors.dm

Fixes #9581

2015-05-31 03:34:29 +09:30

tank_dispenser.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

target_stake.dm

Removes unnecessary and cruft procs from mob/inventory.dm

2015-03-30 05:28:09 -04:00

transit_tubes.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

under_wardrobe.dm

Attempts to fix persistent station alarms. Makes wardrobes solid.

2015-03-09 20:55:05 +01:00

watercloset.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-19 10:19:08 +02:00

windoor_assembly.dm

objects/effects, objects/structures

2015-05-30 14:37:40 +01:00

window.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00