Chinsky 82ca870c53 Merge pull request #8028 from GinjaNinja32/beaker ...

Change beakers, bottles, syringes and vials to use /image and multiplicative blending

2015-02-04 18:14:22 +03:00

..

admin

Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap

2015-02-04 11:03:44 +10:30

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 with dev.

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

clothing

Merge with dev.

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

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

Fixes typos and indenting present in the destilery module, and renames it to distillery

2015-01-09 20:49:36 +06:00

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

…

games

…

genetics

…

holodeck

Missing files added

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

hydroponics

Merge pull request #7801 from Mloc/bs12-glowypipes

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

icon generation

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

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 remote-tracking branch 'upstream/dev' into GhostSight

2015-02-04 00:00:17 +01:00

nano

Merge pull request #7617 from fira/obscomps

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

organs

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03: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 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

projectiles

copytext() check for some input

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

random_map

Readded asteroid secret placement, adjusted some values.

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

reagents

Merge pull request #8028 from GinjaNinja32/beaker

2015-02-04 18:14:22 +03: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

…

supermatter

…

surgery

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

vehicles

Merge pull request #7801 from Mloc/bs12-glowypipes

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

virus2

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00