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

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm

2013-06-12 23:11:28 +04:00

..

admin

Merge resolution.

2013-06-12 20:31:29 -07:00

assembly

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

awaymissions

Activated magboots will now, definitely, prevent airflow based grieving of your personage. (Included is a possible fix for airflow opening doors by throwing you at them)

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

client

Fixed a small spelling error in job prefs

2013-06-11 21:36:40 -04:00

clothing

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

2013-06-12 23:11:28 +04:00

customitems

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

2013-05-19 06:21:32 +07:00

destilery

- Added a config option that requires players to have played a certain number of days to select some jobs to play. The option is turned off by default and requires the database to work. See screenshot for default age requirement.

2013-01-15 03:39:46 +00:00

detectivework

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

DetectiveWork

Added bloody footprints.

2013-06-01 14:30:05 +04:00

events

Merge pull request #2927 from Baystation12/master

2013-05-31 19:49:13 -07: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

…

mining

reduced the chance of safely extracting xenoarch finds without the proper process

2013-05-14 13:08:30 +10:00

mob

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

2013-06-12 23:11:28 +04:00

organs

Putting VOX back in.

2013-06-07 12:31:38 -05:00

paperwork

Merge pull request #2816 from comma/HTML

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

power

Airlock and APC changes.

2013-05-23 16:43:29 +02:00

projectiles

Polished off some pneumatic cannon bugs. All done.

2013-06-11 12:19:20 -07:00

reagents

Merge pull request #3015 from comma/master

2013-06-10 11:50:50 -07:00

recycling

DRY BLOOD FOR THE BLOOD GOD.

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

research

Fixed some typos. (feotal, "/red ...")

2013-06-11 15:01:48 -04:00

scripting

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

security levels

Updated the map with fixed incinerator doors that use the new heat_proof var.

2012-12-16 20:52:29 +00:00

surgery

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

2013-06-12 20:31:52 -07:00