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

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/under/miscellaneous.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/custom_items.dmi
	maps/tgstation.2.1.0.0.1.dmm

2013-05-18 04:56:40 -07: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

New less obnoxious vote noise

2013-05-17 17:44:39 +02: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

Merge pull request #2762 from Baystation12/bleeding-edge-freeze

2013-05-16 18:30:10 -07:00

js

…

modules

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

2013-05-18 04:56:40 -07:00

TriDimension

…

unused

…

WorkInProgress

Adjusting air alarm settings.

2013-05-16 17:29:58 -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