Chinsky 83fdf57540 Merge branch 'feature' of https://github.com/CIB/Baystation12 into cibderp ...

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

2013-02-24 20:29:59 +04: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

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

2013-02-20 12:36:22 -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

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

2013-02-23 00:12:26 +04: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

Commented out debug verb just in case.

2013-02-23 00:45:54 +04:00

paperwork

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

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

power

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

2013-02-22 23:59:38 +10:00

projectiles

Fixed issue with laser beams freezing forever in case they missed the mob.

2013-02-20 19:30:13 +04:00

reagents

Added psychiatrist job and anti-depressants.

2013-02-23 05:36:04 +01:00

recycling

Some uses of ismouse() replaced with isanimal()

2013-02-19 19:22:00 +08: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

Made limb surgery not EXPLODE robotic limbs

2013-02-23 03:58:32 +04:00