mwerezak d8a8384c41 Fixes errors introduced by merge ...

Fixes errors introduced by commit
fac32d07e9.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).

2015-02-09 17:53:47 -05:00

..

admin

Merge pull request #8029 from GinjaNinja32/viro

2015-02-06 00:18:13 +03:00

assembly

Removes FPRINT and TABLEPASS flags

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

awaymissions

Conflict fix

2015-02-03 20:57:16 +03:00

client

Merge with dev.

2015-02-04 11:05:35 +10:30

clothing

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

customitems

Removes FPRINT and TABLEPASS flags

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

detectivework

Merge pull request #7964 from Baystation12/dev-freeze

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

distillery

…

economy

Merge resolution.

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

events

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

2015-02-03 15:18:27 -08:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

Missing files added

2015-02-04 20:40:39 +08:00

hydroponics

Merge pull request #8054 from mwerezak/chembottles

2015-02-05 23:05:45 +10:30

icon generation

…

library

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

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

liquid

…

maps

…

mining

Merge pull request #7887 from Zuhayr/pickaxes

2015-02-04 06:32:37 +01:00

mob

Merge pull request #8052 from mwerezak/boolit

2015-02-07 14:07:22 -05:00

nano

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

2015-02-05 12:37:15 +01: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 remote-tracking branch 'upstream/dev' into pacman

2015-02-06 23:32:39 -05:00

projectiles

Fixes errors introduced by merge

2015-02-09 17:53:47 -05:00

random_map

Readded asteroid secret placement, adjusted some values.

2015-01-23 13:40:10 +10:30

reagents

Merge pull request #8052 from mwerezak/boolit

2015-02-07 14:07:22 -05:00

recycling

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

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

research

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

scripting

…

security levels

…

shieldgen

Removes FPRINT and TABLEPASS flags

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

shuttles

…

supermatter

…

surgery

Merge pull request #7844 from Kelenius/ofDryingAndRacks

2015-02-04 18:15:13 +03:00

vehicles

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

virus2

Fixes startup runtime

2015-02-06 08:54:28 +00:00