Mloc-Argent 27759f47df Merged master into BEF. ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

2013-05-06 15:43:50 +01:00

..

__HELPERS

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

2013-02-25 14:40:46 +10:00

ATMOSPHERICS

Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery.

2013-04-24 15:58:39 -07:00

controllers

Makes change game mode votes in pre-game lobby delay the roundstart. Fixes #2686.

2013-05-02 14:07:11 +01:00

datums

Added a shotgun shell ammo crate

2013-04-27 21:42:56 -04:00

defines

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

FEA

…

game

Merged master into BEF.

2013-05-06 15:43:50 +01:00

js

…

modules

Merged master into BEF.

2013-05-06 15:43:50 +01:00

TriDimension

…

unused

…

WorkInProgress

Merged master into BEF.

2013-05-06 15:43:50 +01:00

ZAS

Merged master into BEF.

2013-05-06 15:43:50 +01:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Fixes issues:

2013-04-18 09:56:49 -07:00

stylesheet.dm

…

world.dm

Plasma no longer contaminates backpacks (They cannot be washed)

2013-04-18 09:57:28 -07:00