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

..

admin

Fixed up BrokenInHands a little.

2013-05-16 13:05:23 +01:00

assembly

…

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

Merge branch 'master' into bleeding-edge-freeze

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

clothing

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

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

customitems

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

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

destilery

…

detectivework

…

DetectiveWork

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

events

4th times the charm.

2013-05-15 15:55:58 -07:00

flufftext

4th times the charm.

2013-05-15 15:55:58 -07: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 'master' into bleeding-edge-freeze

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

organs

Runtime fix. IV injecting from empty blood pack caused it. Now not doing a thing if no blood is injected.

2013-05-05 20:24:33 +04:00

paperwork

You can now switch off cameras.

2013-02-28 13:46:56 +04:00

power

Merged master into BEF.

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

projectiles

Adds new drinks and fixes a few things

2013-04-24 18:49:01 -04:00

reagents

Merged master into BEF.

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

recycling

Adjustment

2013-05-16 21:26:26 -04:00

research

cleaned up some tools issues with w_class, depth scanners now reveal the reagent a find responds to (meaning lab analysis can be skipped)

2013-05-14 13:09:48 +10:00

scripting

…

security levels

…

surgery

Fix typos in brain surgery

2013-03-18 13:32:13 +04:00