Chinsky c9f6894163 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm

2013-06-23 11:17:03 +04:00

..

admin

Merge pull request #3054 from comma/manup

2013-06-19 09:55:22 -07:00

assembly

…

awaymissions

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

client

Armalis simple_animal/sprite.

2013-06-15 04:09:49 -07:00

clothing

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

2013-06-23 00:17:13 -04:00

customitems

Fixes #3131

2013-06-22 22:19:52 -07:00

destilery

…

detectivework

Apparently flick() is a thing, thanks Chinsky.

2013-06-16 22:30:30 -07:00

DetectiveWork

Changed the vote sound as discussed by admins, and made it so that -all- votes (Not just crew transfer) automatically disable OOC.

2013-06-21 14:40:36 +01:00

events

Changes to some AI Ion Storm Laws.

2013-06-19 01:57:38 +01:00

flufftext

Cobpipe fix

2013-05-31 00:21:48 -05:00

food

Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from.

2013-04-23 22:52:08 +01:00

genetics

…

icon generation

…

library

…

liquid

…

maps

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

mining

excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster

2013-06-23 10:25:16 +10:00

mob

Merge pull request #3126 from CIB/bleeding-edge-freeze

2013-06-22 22:58:04 -07:00

organs

Merge pull request #3119 from CIB/bleeding-edge-freeze

2013-06-21 01:14:29 -07:00

paperwork

Merge pull request #2816 from comma/HTML

2013-05-24 14:30:36 -07:00

power

Fixes #3082.

2013-06-19 00:21:15 -07:00

projectiles

Armalis additions, tweaks.

2013-06-16 13:17:20 -07:00

reagents

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

2013-06-23 00:17:13 -04:00

recycling

DRY BLOOD FOR THE BLOOD GOD.

2013-06-01 10:56:59 +04:00

research

halved the length of xenoarch scans, scans actually shut down when they exceed the safety by too much

2013-06-23 10:27:48 +10:00

scripting

…

security levels

Actually calls the ERT proc on red alert now. Hurr.

2013-06-12 17:23:39 -04:00

surgery

Fixes #3081

2013-06-21 18:00:25 -07:00