Ccomp5950 ad4c35fd29 Merge pull request #5133 from mwerezak/custom-item-yankeesamurai ...

Adds custom item for yankeesamurai - Hal Ishimaru

2014-06-03 19:50:35 -05:00

..

admin

Merge resolution with master.

2014-06-02 12:05:12 +09:30

assembly

…

awaymissions

…

client

Merge branch 'dev' into mutiny

2014-05-25 14:22:16 -05:00

clothing

Merge resolution with master.

2014-06-02 12:05:12 +09:30

customitems

Custom item for YankeeSamurai: Hal Ishimaru

2014-05-30 19:52:54 -04:00

destilery

…

detectivework

Updates the Screen even when usr is using another console

2014-05-06 04:54:06 +02:00

economy

Merge pull request #4968 from MrLeebo/mutiny

2014-05-28 00:13:42 -05:00

events

Merge pull request #5086 from UristMcKerman/spam-filter

2014-06-01 20:09:06 +04:00

ext_scripts

Bot down? Let's not lock up the entire server.

2014-05-29 21:36:34 -05:00

flufftext

…

food

…

genetics

…

icon generation

…

library

Targeting eyes with book/paper shows book/paper

2014-05-03 19:56:55 +03:00

liquid

…

maps

…

mining

Merge resolution with master.

2014-06-02 12:05:12 +09:30

mob

Merge resolution with master.

2014-06-02 12:05:12 +09:30

nano

…

organs

Merge remote-tracking branch 'upstream/master' into dev

2014-05-05 22:22:01 +01:00

paperwork

Merge resolution with master.

2014-06-02 12:05:12 +09:30

power

Nitpickity addressed: Added span classes.

2014-06-02 21:58:06 +01:00

projectiles

Split vox and vox armalis icons up into their own files. Set up species-level sprite files for vox and vox armalis. Removed icons/mob/vox.dmi.

2014-05-15 14:46:27 +09:30

reagents

Merge resolution with master.

2014-06-02 12:05:12 +09:30

recycling

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

2014-05-16 18:11:11 -05:00

research

Merge resolution with master.

2014-06-02 12:05:12 +09:30

scripting

…

security levels

Mutiny Mode

2014-05-11 15:03:50 -05:00

shuttles

Replaces the derelict, modifies the DJ station, adds a shuttle bay to Engineering.

2014-06-02 15:54:40 +09:30

supermatter

Supermatter becomes anchored when detonating, and is hence not pushed by mobs than gib against it.

2014-06-02 03:34:58 +08:00

surgery

…

virus2

Fixes circuit var for other consoles

2014-05-22 18:05:57 -04:00