Cheridan c9c2e90acb Merge pull request #10268 from GunHog/Ore_ID ...

Ore Redemption Machine ID improvement

2015-07-04 12:10:56 -05:00

..

admin

Merge pull request #10129 from AnturK/ayy

2015-07-04 16:57:10 +02:00

assembly

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

awaymissions

…

client

-Used Incoming's suggestion to fix the issue instead, by adding a default value to the sanitize_inlist call for tail_human and ears.

2015-07-03 20:55:26 +02:00

clothing

Merge pull request #10222 from MMMiracles/freedomsocks

2015-07-04 10:04:46 +03:00

crafting

Merge from upstream.

2015-06-25 20:30:19 +02:00

detectivework

Merge from upstream.

2015-06-25 20:30:19 +02:00

emoji

…

events

Merge pull request #10238 from Incoming5643/catgirls2015

2015-06-29 21:44:39 -05:00

flufftext

Merge from upstream.

2015-06-25 20:30:19 +02:00

food&drinks

Spillable var instead of checking for OPENCONTAINER as that flag encompasses a lot more than necessary.

2015-07-04 08:54:04 -06:00

games

Merge pull request #10244 from Ikarrus/workplacesafety

2015-07-03 05:05:36 +03:00

holiday

Adds a category for food items, adds some missing weapons and a Misc category

2015-06-25 11:58:42 +01:00

html_interface

Minimap support for the crew monitoring computer.

2015-06-28 23:00:39 +02:00

hydroponics

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

library

Squashed Commits

2015-06-27 00:09:16 -06:00

lighting

…

mining

Merge pull request #10268 from GunHog/Ore_ID

2015-07-04 12:10:56 -05:00

mob

Merge pull request #10335 from Ikarrus/bombcover

2015-07-04 17:24:59 +02:00

nano

Merge from upstream.

2015-06-25 20:30:19 +02:00

ninja

Adds a thrownby var that's used by admin logging.

2015-07-01 13:00:12 -06:00

paperwork

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

power

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

2015-07-02 18:49:41 +01:00

procedural mapping

Merge from upstream.

2015-06-25 20:30:19 +02:00

projectiles

Merge pull request #10313 from optimumtact/chickychickyrumba

2015-07-03 11:45:49 +02:00

reagents

More fixes and changelogs

2015-07-04 09:40:24 -06:00

recycling

Squashed Commits

2015-06-27 00:09:16 -06:00

research

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

scripting

Merge from upstream.

2015-06-25 20:30:19 +02:00

security levels

…

shuttle

Merge from upstream.

2015-06-25 20:30:19 +02:00

surgery

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

2015-07-02 18:49:41 +01:00

telesci

Fixes telesci console icon

2015-06-26 17:03:29 +03:00