Zuhayr cdb3907493 Binary file merge conflict.

2013-02-20 00:28:14 -08:00

..

admin

Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed.

2013-02-20 00:24:26 -08: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

Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed.

2013-02-20 00:24:26 -08:00

clothing

Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed.

2013-02-20 00:24:26 -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

removed debug output, cleanup of alien languages, bumped tajaran darkseeing

2013-02-18 13:07:01 +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

Binary file merge conflict.

2013-02-20 00:28:14 -08: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

Fixes #2343 (and #2342), #2356 Readded pre-merge bottle and pill icon choosing system.

2013-02-17 18:31:03 +04:00

recycling

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

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

research

Merge pull request #2333 from Baystation12/BEF-staging

2013-02-17 04:44:25 -08: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

Added surgery to put things in people.

2013-02-18 13:22:23 +04:00