Cheridan ab7fef8082 Merge pull request #10526 from phil235/ImprovisedShotgunFix ...

Fixes improvised shotgun being deleted when tablecrafted.

2015-07-11 18:57:13 -05:00

..

admin

Makes log viewing use ftp() over run()

2015-07-07 21:14:55 -07:00

assembly

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

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

awaymissions

…

client

Merge pull request #10439 from Incoming5643/takethatracism

2015-07-09 20:44:56 +10:00

clothing

Fixes siren helmet spam

2015-07-09 12:25:56 -07:00

crafting

Merge pull request #10389 from Razharas/PinFix

2015-07-06 00:31:43 +01:00

detectivework

Merge from upstream.

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

emoji

…

events

Fixes The clogged vent event making smoke spawn on welded scrubbers.

2015-07-09 20:28:28 +02:00

flufftext

Merge from upstream.

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

food&drinks

Attack logging tweaks

2015-07-08 23:14:37 -07: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

Attack logging tweaks

2015-07-08 23:14:37 -07:00

library

Squashed Commits

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

lighting

…

mining

Attack logging tweaks

2015-07-08 23:14:37 -07:00

mob

Merge pull request #10525 from phil235/FixFix1

2015-07-11 18:06:29 -05:00

nano

Merge from upstream.

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

ninja

Update and Changelog

2015-07-05 22:20:00 -06:00

paperwork

Attack logging tweaks

2015-07-08 23:14:37 -07:00

power

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

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

procedural mapping

Repath grass.

2015-07-08 02:06:14 +01:00

projectiles

Merge pull request #10526 from phil235/ImprovisedShotgunFix

2015-07-11 18:57:13 -05:00

reagents

Merge pull request #10525 from phil235/FixFix1

2015-07-11 18:06:29 -05:00

recycling

Added sanity check to disposal climbing

2015-06-30 15:45:48 +02:00

research

Merge pull request #10336 from AlexanderUlanH/riotshotguns

2015-07-09 20:56:25 +10:00

scripting

Fix for request console emergency runtime

2015-07-07 11:02:44 -05:00

security levels

…

shuttle

Merge from upstream.

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

surgery

Update and Changelog

2015-07-05 22:20:00 -06:00

telesci

Fixes telesci console icon

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