Mloc-Argent dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +01:00

..

__HELPERS

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

_onclick

Fixes #5088

2014-06-17 20:35:48 +01:00

ATMOSPHERICS

Makes it so mixers and filters no longer block mob

2014-05-22 03:00:18 -07:00

controllers

Renames supply controller global var

2014-06-18 19:37:46 -04:00

datums

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

2014-06-20 22:02:40 +01:00

defines

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

FEA

…

game

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

2014-06-20 22:02:40 +01:00

js

…

modules

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

2014-06-20 22:02:40 +01:00

TriDimension

…

unused

Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.

2014-06-08 00:52:20 +09:30

WorkInProgress

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

2014-06-20 22:02:40 +01:00

ZAS

Probability to bleed by airflow_hit lowered from 100% to 33%

2014-06-07 04:52:19 +02:00

global.dm

reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors

2014-06-19 11:06:20 +10:00

hub.dm

…

names.dm

…

setup.dm

Adds supply shuttle datum

2014-06-18 19:37:30 -04:00

stylesheet.dm

Reverted verb, adjusted color

2014-05-22 16:34:45 -04:00

world.dm

Fixes #4756

2014-06-17 17:25:57 +01:00