Neerti 00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme

2015-08-23 01:30:46 -04:00

..

crates_lockers

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

stool_bed_chair_nest

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

2015-08-08 15:34:51 +02:00

barsign.dm

Barsigns now rotate correctly with client.dir, improved the code a bit

2015-08-18 07:18:13 +01:00

bedsheet_bin.dm

Allows bedsheets to be cut up into rags

2015-08-13 18:37:18 -04:00

coathanger.dm

Debugging!

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

curtains.dm

Fewer decal icon states, shower curtains.

2015-08-16 06:09:16 -07:00

displaycase.dm

Ports /tg/'s meteor implementation.

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

door_assembly.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

electricchair.dm

…

extinguisher.dm

All the span-corrected dm files.

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

flora.dm

…

girders.dm

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

2015-08-17 09:37:49 +02:00

grille.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

inflatable.dm

Ports /tg/'s meteor implementation.

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

janicart.dm

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

2015-07-24 10:53:57 +02:00

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

Ports /tg/'s meteor implementation.

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

lattice.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

mirror.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-22 03:11:53 +09:30

mop_bucket.dm

All the span-corrected dm files.

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

morgue.dm

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03: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

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

signs.dm

Woodrat Work v7 Bugbash

2015-08-03 22:25:52 -07:00

simple_doors.dm

Adds common proc to obtain the material of an object

2015-08-01 23:03:21 -04:00

tank_dispenser.dm

…

target_stake.dm

…

transit_tubes.dm

…

under_wardrobe.dm

Splits species flags

2015-08-18 17:02:44 -04:00

watercloset.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

windoor_assembly.dm

objects/effects, objects/structures

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

window_spawner.dm

Post-merge decal cleanup.

2015-08-18 12:33:49 +02:00

window.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00