Mloc 5faabba7fb Merge branch 'master' into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html

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

2013-05-16 12:21:55 +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

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

- Added null checks for get_mobs_in_radio_range().

2013-01-17 06:52:49 +00:00

game

Merge branch 'master' into bleeding-edge-freeze

2013-05-16 12:21:55 +01:00

js

…

modules

Merge branch 'master' into bleeding-edge-freeze

2013-05-16 12:21:55 +01:00

TriDimension

…

unused

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

WorkInProgress

Fixes air alarms going off if the upper bounds were set to disabled.

2013-05-15 14:31: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

Players have to wait 5 minutes between dying as a mouse and respawning as a mouse. Global variable mouse_respawn_time determines the respawn time in minutes.

2013-02-19 08:04:53 +08:00

hub.dm

…

names.dm

…

setup.dm

Fixes issues:

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

stylesheet.dm

unique voice text colour for soghun, skrell and taj

2013-02-10 22:36:23 +10:00

world.dm

Plasma no longer contaminates backpacks (They cannot be washed)

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