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

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

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

2013-02-14 22:02:06 +10:00

..

admin

disabled simultaneous admin PM warning

2013-02-13 17:49:48 +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

disabled simultaneous admin PM warning

2013-02-13 17:49:48 +10:00

clothing

Icons and code for an NT-knockoff soghun space suit.

2013-02-11 19:23:23 -08: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

renamed a file, added rogue drones random event (laser drones spawn and fly around the map, teleport out after a while), added infestation random event (lizards, mice, slimes spawn on the map in some rooms)

2013-02-13 17:50:57 +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

…

liquid

…

maps

…

mining

observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update

2013-01-21 18:47:03 +10:00

mob

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

2013-02-14 22:02:06 +10:00

paperwork

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

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

power

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

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

projectiles

Revert "Traitor's revolver is now w_class=2.0 (pocketable). Sprite is now that of a snub-nosed revolver."

2013-02-12 17:43:28 +08:00

reagents

Added various new side effects:

2013-02-12 18:20:57 +01:00

recycling

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

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

research

mice no longer have universal speak, carp and giant spiders will no longer carve through the station, removed unused item

2013-02-09 01:13:30 +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

…

surgery

Readded limb cutoff surgery.

2013-02-09 22:43:39 +04:00