Ikarrus 6cc17a6243 Resolved Conflicts: ...

code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm

2015-06-27 00:17:02 -06:00

..

crates_lockers

WHOOPS

2015-06-23 12:57:28 -07:00

stool_bed_chair_nest

Squashed Commits

2015-06-27 00:09:16 -06:00

transit_tubes

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

2015-06-23 12:54:26 -07:00

ai_core.dm

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

2015-06-23 12:54:26 -07:00

artstuff.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

barsigns.dm

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

bedsheet_bin.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

displaycase.dm

…

door_assembly.dm

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

2015-06-23 12:54:26 -07:00

dresser.dm

…

electricchair.dm

…

extinguisher.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

false_walls.dm

Merge pull request #9980 from LaharlMontogmmery/ContentTransfer

2015-06-21 00:09:19 +01:00

fireaxe.dm

Fixes runtime with do_after()'s that don't use a target.

2015-06-25 19:05:23 +02:00

flora.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

girders.dm

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

2015-06-23 12:54:26 -07:00

grille.dm

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

2015-06-23 12:54:26 -07:00

guncase.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

hivebot.dm

eol fixes (probably) and examine fix in closets

2015-05-28 20:48:47 +10:00

janicart.dm

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

2015-06-23 12:54:26 -07:00

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

E

2015-05-06 15:31:09 +12:00

mineral_doors.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

mirror.dm

Merge pull request #9974 from phil235/MirrorRaceChangeFix

2015-06-17 12:54:19 -05:00

mop_bucket.dm

Pressure_resistance Tweaks

2015-06-03 23:22:25 -05:00

morgue.dm

…

musician.dm

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

2015-06-23 12:54:26 -07:00

noticeboard.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

OpTable.dm

…

safe.dm

…

showcase.dm

eol conversion

2015-06-13 20:15:49 +10:00

signs.dm

…

spirit_board.dm

…

statues.dm

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

2015-06-23 12:54:26 -07:00

table_frames.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

tables_racks.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

tank_dispenser.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

target_stake.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

watercloset.dm

Destructible Clothing [WIP]

2015-06-25 00:06:47 -06:00

windoor_assembly.dm

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

2015-06-23 12:54:26 -07:00

window.dm

Fixes runtime with do_after()'s that don't use a target.

2015-06-25 19:05:23 +02:00