mwerezak e829f8a633 Fixes wound merging ...

Fixes wound merging completely ignoring things like bleed_timers,
bandaged and salved states, etc.

2014-06-16 12:15:11 -04:00

..

admin

Rights check instead of holder check? Sure why not.

2014-06-03 15:28:14 -05:00

assembly

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

awaymissions

…

client

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

2014-05-24 19:02:16 -05:00

clothing

Fixes shoulder holster

2014-06-08 15:25:04 +01:00

customitems

Initial commit for Kaine's custom items.

2014-04-25 19:13:51 -06:00

destilery

…

detectivework

Fixes some printouts causing a runtime error when photocopied

2014-06-07 18:27:22 +02:00

economy

Fixes runtime error when copying the stamped EFTPOS paper

2014-06-06 20:45:39 +02:00

events

Replaces the now non-existing "unused assembly line" with another area.

2014-05-01 13:33:58 +02:00

ext_scripts

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

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

flufftext

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

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 remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00

mob

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

nano

…

organs

Fixes wound merging

2014-06-16 12:15:11 -04:00

paperwork

Fixes some printouts causing a runtime error when photocopied

2014-06-07 18:27:22 +02:00

power

Fixes #5098

2014-06-01 21:09:30 +09:30

projectiles

Bullets are now properly sharp

2014-06-15 20:28:34 -04:00

reagents

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

recycling

refactors some disposals filtering code and remaps some disposals pipes

2014-06-01 23:30:20 +01:00

research

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

2014-05-31 00:17:56 +01:00

scripting

…

security levels

…

supermatter

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

2014-05-31 00:17:56 +01:00

surgery

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

virus2

Fixes circuit var for other consoles

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