Razharas c548df264b Conflict fix

2014-03-05 06:30:29 +04:00

..

admin

Merge pull request #2936 from MrPerson/jitterbug_dizzydummies

2014-03-03 11:35:27 -06:00

assembly

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

awaymissions

Removes the away mission box2550

2014-02-20 12:47:08 -05:00

client

adds a small check to see if the job controller started up before using buttons related to it and generate runtimes.

2014-02-14 02:37:31 -03:00

clothing

Conflict fix

2014-03-05 06:30:29 +04:00

detectivework

…

events

Added RPED, some sprites and new power cell path

2014-02-24 05:14:43 +04:00

flufftext

missing exclamation points

2014-02-20 12:41:23 -08:00

food

By sticking a crayon in the mix when making a burger you can now make a colored burger!

2014-02-23 18:34:32 -05:00

hydroponics

Conflict fix

2014-03-05 06:30:29 +04:00

library

Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.

2014-02-20 17:47:33 +00:00

mining

Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes

2014-03-02 17:07:24 -08:00

mob

Conflict fix

2014-03-05 06:30:29 +04:00

nano

…

paperwork

Merge pull request #2826 from YotaXP/polaroid-fix

2014-02-20 16:22:59 -08:00

power

Merge conflicts fix

2014-03-03 05:42:31 +04:00

projectiles

Merge conflicts fix

2014-03-03 05:42:31 +04:00

reagents

Conflict fix

2014-03-05 06:30:29 +04:00

recycling

now it's finished entirely \o/

2014-02-15 16:56:12 +01:00

research

Conflict fix

2014-03-02 04:14:32 +04:00

scripting

…

security levels

…

shuttle

…

surgery

second pass

2014-02-15 20:11:12 -08:00

telesci

Merge conflicts fix

2014-03-03 05:42:31 +04:00