cib ad6105b380 Merge remote-tracking branch 'main/master' into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html

2013-05-14 01:29:45 +02: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

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

2013-05-10 15:28:32 +04: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

Map Fixes - BEF

2013-05-11 09:33:45 -07:00

js

…

modules

Merge remote-tracking branch 'main/master' into bleeding-edge-freeze

2013-05-14 01:29:45 +02:00

TriDimension

…

unused

…

WorkInProgress

Centcom now has sexy uniforms and IDs. Emag now looks like modified standard ID card

2013-05-11 03:39:31 -07:00

ZAS

Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors.

2013-05-08 11:26:38 -07: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