GinjaNinja32 c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro ...

Conflicts:
	code/modules/virus2/disease2.dm

2015-02-03 15:33:37 +00:00

..

admin

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

2015-02-03 15:33:37 +00:00

assembly

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

awaymissions

Cleared out my WIP folder.

2015-02-03 03:20:42 -07:00

client

Merge pull request #7591 from mwerezak/custom-item

2015-02-03 18:09:44 +03:00

clothing

Merge pull request #7582 from Zuhayr/richard

2015-02-03 18:10:34 +03:00

customitems

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

destilery

…

detectivework

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30

economy

Merge resolution.

2015-01-12 07:17:02 +10:30

events

Fixes up some helpers.

2015-02-03 03:18:34 -07:00

ext_scripts

…

flufftext

…

food

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

games

…

genetics

…

hydroponics

Merge pull request #7801 from Mloc/bs12-glowypipes

2015-02-03 18:12:09 +03:00

icon generation

…

library

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

liquid

…

maps

* Made the preloader independant of the called New().

2014-12-23 23:47:30 +01:00

mining

Merge pull request #7902 from Kelenius/ofCratesAndMastermind

2015-02-03 18:15:35 +03:00

mob

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

2015-02-03 15:33:37 +00:00

nano

Merge pull request #7617 from fira/obscomps

2015-02-03 18:12:16 +03:00

organs

Antibodies rework.

2015-01-26 05:32:00 +00:00

overmap

Compile fix

2015-02-03 08:39:39 +03:00

paperwork

copytext() check for some input

2015-02-01 23:16:04 +03:00

power

Merge pull request #7617 from fira/obscomps

2015-02-03 18:12:16 +03:00

projectiles

copytext() check for some input

2015-02-01 23:16:04 +03:00

reagents

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

2015-02-03 15:33:37 +00:00

recycling

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

2015-02-03 14:51:54 +01:00

research

Merge pull request #7801 from Mloc/bs12-glowypipes

2015-02-03 18:12:09 +03:00

scripting

…

security levels

…

shieldgen

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

shuttles

Updates references

2014-12-27 00:03:20 +01:00

supermatter

…

surgery

Merge pull request #7885 from Baystation12/master

2015-01-20 18:49:03 +10:30

vehicles

Merge pull request #7801 from Mloc/bs12-glowypipes

2015-02-03 18:12:09 +03:00

virus2

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

2015-02-03 15:33:37 +00:00