Chinsky 3259ccf86f Merge pull request #4217 from DJSnapshot/dev ...

Custom stuffs!

2014-01-08 17:22:29 -08:00

..

admin

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

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

assembly

Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.

2013-12-18 02:08:38 +08:00

awaymissions

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

client

Mixed up some whitelist flags.

2014-01-07 20:53:42 +10:30

clothing

Using DNA2 files from master.

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

customitems

stealthfix

2014-01-06 17:21:26 -08:00

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

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

flufftext

…

food

Made cookies able to be baked in the microwave

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

genetics

…

icon generation

…

library

Added two new manuals by MagmaRam to the default engineering manual bookcase.

2013-10-27 18:25:25 -04:00

liquid

…

maps

…

mining

Nerfs abandoned crates to be less fucking moronic.

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

mob

Merge pull request #4217 from DJSnapshot/dev

2014-01-08 17:22:29 -08:00

nano

NanoUI fix.

2014-01-08 12:42:20 +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

Indentation fix.

2014-01-08 11:13:36 +10:30

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

Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station.

2013-11-07 16:02:57 -08:00

surgery

Manual binary merge of head icons.

2013-12-22 23:23:25 +10:30

telesci

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

2013-12-13 19:13:43 +00:00

virus2

DNA2 - A recode of DNA

2013-12-01 00:04:27 -08:00