duncathan 3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs ...

Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm

2016-03-29 14:46:06 -06:00

..

beds_chairs

Nar-Sie will now corrupt doors, tables, windows, and windoors

2016-03-17 16:28:26 -04:00

crates_lockers

Optimizations, statue changes

2016-03-26 21:24:10 -04:00

transit_tubes

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

2016-02-06 15:42:13 +01:00

ai_core.dm

Adds AI card tgui

2016-01-24 12:52:31 +01:00

artstuff.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

barsigns.dm

Adds subtypesof(). It's shorthand for typesof(path) - path.

2015-11-16 18:55:57 -05:00

bedsheet_bin.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

displaycase.dm

Merge pull request #13317 from neersighted/airlock_electronics

2015-11-30 20:43:33 +03:00

door_assembly.dm

Nar-Sie will now corrupt doors, tables, windows, and windoors

2016-03-17 16:28:26 -04:00

dresser.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

electricchair.dm

Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality

2016-03-07 18:03:25 +00:00

extinguisher.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

false_walls.dm

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

2016-03-29 14:46:06 -06:00

fireaxe.dm

The blob eats nondense things in all cases.

2015-11-20 21:03:43 -05:00

flora.dm

fixed an edgecase where you could spam cut a tree and receive multiple logs.

2016-02-26 23:46:09 -07:00

girders.dm

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

2016-03-29 14:46:06 -06:00

grille.dm

removes simulated turfs; adds space gas mixture for space

2016-03-10 17:27:01 -06: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

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

janicart.dm

Can put mop in janicart when dry

2016-01-07 11:02:06 -05:00

kitchen_spike.dm

Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality

2016-03-07 18:03:25 +00:00

ladders.dm

Academy Fixes

2015-11-28 23:17:57 +01:00

lattice.dm

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

mineral_doors.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

mirror.dm

Merge pull request #15855 from kilkun/master

2016-03-08 21:39:46 -06:00

mop_bucket.dm

Pressure_resistance Tweaks

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

morgue.dm

Fixes revive() not properly removing the blind overlay. (fixes staff of healing)

2016-02-14 15:26:46 +01:00

musician.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

noticeboard.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

plasticflaps.dm

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

reflector.dm

Corrected syntax error

2016-01-16 18:19:06 -05:00

safe.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

showcase.dm

eol conversion

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

signs.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

spirit_board.dm

Adds a way to make certain area/space areas not force 100% brightness

2015-10-31 02:30:49 -07:00

statues.dm

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

table_frames.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

tables_racks.dm

Merge pull request #16165 from ChangelingRain/cultlock

2016-03-19 21:58:12 -05:00

tank_dispenser.dm

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

target_stake.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

watercloset.dm

removes simulated turfs; adds space gas mixture for space

2016-03-10 17:27:01 -06:00

windoor_assembly.dm

Merge pull request #13317 from neersighted/airlock_electronics

2015-11-30 20:43:33 +03:00

window.dm

Merge pull request #16165 from ChangelingRain/cultlock

2016-03-19 21:58:12 -05:00