duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos ...

Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract

2016-01-13 20:07:21 -06:00

..

beds_chairs

Makes burn_state use defines

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

crates_lockers

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

2016-01-13 20:07:21 -06:00

transit_tubes

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

2016-01-13 20:07:21 -06:00

ai_core.dm

Adds the toolspeed var and adds it to most usages of tools which has a timer

2015-11-21 19:24:14 +02: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

Makes burn_state use defines

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

displaycase.dm

Merge pull request #13317 from neersighted/airlock_electronics

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

door_assembly.dm

Line ending apocalypse

2015-12-17 14:12:37 +13:00

dresser.dm

Fixes proc arguments

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

electricchair.dm

removes argument that did not need to be specified

2015-12-30 09:34:42 +01:00

extinguisher.dm

removes a bunch of .0

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

false_walls.dm

Rough Metal Wall

2015-10-12 18:47:22 +02:00

fireaxe.dm

The blob eats nondense things in all cases.

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

flora.dm

Volcanic rocks

2015-12-15 23:31:14 -06:00

girders.dm

Fixes girders on low layer

2015-12-11 02:29:46 -06:00

grille.dm

fix

2016-01-09 23:00:24 +00:00

guncase.dm

…

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

Meat spike

2015-12-31 12:50:05 -06:00

ladders.dm

Academy Fixes

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

lattice.dm

The blob eats nondense things in all cases.

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

mineral_doors.dm

Makes burn_state use defines

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

mirror.dm

Maybe now it'll compile?

2016-01-10 01:58:44 -05:00

mop_bucket.dm

…

morgue.dm

Fixes runtime when trying to cremate an animal that deletes itself upon death (mouse, cockroach).

2016-01-03 18:11:18 +01:00

musician.dm

Adds the toolspeed var and adds it to most usages of tools which has a timer

2015-11-21 19:24:14 +02:00

noticeboard.dm

Fixes proc arguments

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

plasticflaps.dm

Convert bots to simple animals - Updated 7.0

2015-11-26 22:06:07 +01:00

reflector.dm

Merge pull request #13149 from Firecage/toolspeed

2015-11-29 21:06:15 +11:00

safe.dm

Fixes proc arguments

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

showcase.dm

…

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

i did things

2015-12-15 16:46:24 -05:00

table_frames.dm

Makes burn_state use defines

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

tables_racks.dm

Makes burn_state use defines

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

tank_dispenser.dm

removes a bunch of .0

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

target_stake.dm

makes all Destroy()'s return properly

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

watercloset.dm

Upgrades do_after and progress bars

2015-12-26 21:04:19 -08: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 #14487 from xxalpha/shingles

2016-01-09 20:30:02 -03:00