Mark Aherne (Faerdan) e9be0ed44e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2014-01-08 02:31:03 +00:00

..

admin

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2014-01-04 11:35:07 +10:30

assembly

…

awaymissions

…

client

Fixed a duplicate definition bug with WHITELISTED.

2014-01-05 23:36:16 +10:30

clothing

Using DNA2 files from master.

2014-01-03 11:19:40 +10:30

customitems

…

destilery

Openable soda cans and beer bottles!

2013-12-31 17:52:12 -08:00

detectivework

Mass updates to paths for blood decals.

2013-12-26 01:56:06 +10:30

economy

Small fixes, again

2014-01-04 21:26:28 +01:00

events

PDA NanoUI spam event update.

2013-12-28 20:56:06 -06:00

ext_scripts

…

flufftext

…

food

Made cookies able to be baked in the microwave

2014-01-02 17:15:34 -08:00

genetics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Nerfs abandoned crates to be less fucking moronic.

2014-01-02 00:42:11 +10:30

mob

More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.

2014-01-06 14:54:35 +10:30

nano

NanoUI Updates.

2014-01-08 02:30:33 +00:00

organs

More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.

2014-01-06 14:54:35 +10:30

paperwork

Mass updates to paths for blood decals.

2013-12-26 01:56:06 +10:30

power

Using dev-freeze map.

2013-12-27 10:42:13 +10:30

projectiles

Merge of blood file, ammo icons, map. Manual binary file merge incoming.

2013-12-28 23:13:04 +10:30

reagents

Merge pull request #4213 from Zuhayr/dev

2014-01-06 20:25:12 -08:00

recycling

Converted robots over to current blood system/paths, updated various files to work with update.

2013-12-29 02:48:20 +10:30

research

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

2014-01-06 02:49:50 +00:00

scripting

…

security levels

…

surgery

…

telesci

…

virus2

…