Chinsky 39b9e636d3 Now completely merged.. damn git.

2013-01-22 20:58:54 +04:00

..

admin

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

2013-01-14 22:14:46 +10:00

assembly

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

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

awaymissions

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

client

cleanup of alt titles handling, made sechuds able to see icons for the real job if players have an alt title, made custom job titles via id computer into alt titles

2013-01-21 04:55:02 +10:00

clothing

changed erroneous name in sec hardsuit, reverted some derpy chemistry merging

2013-01-21 05:38:04 +10:00

customitems

Added Purple Gloves

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

removed extraneous line in detectivework/evidence.dm, removed constructing closets from plasteel

2013-01-22 17:56:57 +10:00

events

Updating the conjure spell to just use paths instead of strings.

2013-01-11 00:08:17 +00: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

Replaced monkey with confusion effect.

2012-11-11 19:35:01 +01:00

icon generation

…

library

Committing a fix for recursive books

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

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 pull request #2205 from caelaislinn/bleeding-edge-freeze

2013-01-22 06:55:44 -08:00

paperwork

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

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

power

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

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

projectiles

empty guns play a "click" sound

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

reagents

Now completely merged.. damn git.

2013-01-22 20:58:54 +04:00

recycling

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

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

research

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

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' into surgery

2013-01-15 13:42:13 +04:00