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

Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-03-10 23:01:33 +10:00

..

admin

added an admin proc to check for any inactive players with custom items

2013-03-01 19:15:27 +10:00

assembly

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

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

awaymissions

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

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

client

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

2013-02-20 12:36:22 -08:00

clothing

Removes Medical's random slowdown and faulty coding.

2013-02-27 22:07:30 -05:00

customitems

Added Purple Gloves

2013-01-15 17:44:23 -05: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

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

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

2013-03-08 11:49:54 +10:00

flufftext

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

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

food

removed a bunch of unused files, moved amorphs and meme to workinprogress/cib

2013-01-15 23:29:49 +10:00

genetics

…

icon generation

…

library

Committing a fix for recursive books

2012-11-15 20:30:36 +00:00

liquid

…

maps

…

mining

tweaked artifact extraction, artifacts

2013-02-19 02:27:46 +10:00

mob

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

2013-03-10 23:01:33 +10:00

paperwork

You can now switch off cameras.

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

power

circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later)

2013-03-06 01:28:57 +10:00

projectiles

If you aim at people, shots will be slightly more accurate.

2013-03-08 03:21:47 +04:00

reagents

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

2013-03-10 23:01:33 +10:00

recycling

Some uses of ismouse() replaced with isanimal()

2013-02-19 19:22:00 +08:00

research

tewaked the noticeboard memos a bit, added 5 (verbose) manuals explaining how to do xenoarchaeology in character, added a bookcase for the manuals

2013-03-10 22:57:08 +10: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

roro to slime fix

2013-03-06 05:59:21 +04:00