Zuhayr 3472513cf9 Merge pull request #8645 from mwerezak/gun-icons ...

Adds Skowron's inhand icons for various guns

2015-03-31 14:12:03 +10:30

..

admin

Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file

2015-03-29 01:52:26 -04:00

alarm

Fixes camera network changes not always being reflected in camera consoles.

2015-02-25 19:50:07 +01:00

assembly

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

awaymissions

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

2015-03-05 08:05:44 +01:00

client

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

2015-03-23 11:45:32 +01:00

clothing

Merge pull request #8674 from GinjaNinja32/rig_guns

2015-03-30 15:02:22 +02:00

customitems

Adds Andrewmeythaler's custom item.

2015-03-17 22:19:13 -05:00

detectivework

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

economy

…

events

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

examine

Fixes #8439.

2015-03-13 23:27:35 +01:00

ext_scripts

…

flufftext

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

food

…

games

…

genetics

…

holodeck

Makes holo objs slightly transparent

2015-03-27 10:32:41 -04:00

hydroponics

Should fix issues with invisible seeds/products/plants.

2015-03-24 13:51:44 +10:30

icon generation

…

library

…

liquid

…

maps

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

2015-03-05 08:05:44 +01:00

mining

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

mob

Merge pull request #8645 from mwerezak/gun-icons

2015-03-31 14:12:03 +10:30

nano

Station alert monitor should now only react to major alarms.

2015-03-08 17:58:48 +01:00

organs

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

2015-03-16 12:37:43 +01:00

overmap

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

2015-03-13 09:31:03 +01:00

paperwork

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

2015-03-23 21:14:32 +01:00

power

Merge pull request #8469 from mwerezak/robot-emp

2015-03-26 19:00:39 +10:30

projectiles

Merge pull request #8645 from mwerezak/gun-icons

2015-03-31 14:12:03 +10:30

random_map

…

reagents

Fixes #8652

2015-03-29 23:19:21 +01:00

recycling

…

research

Fixes xenoarch runtime

2015-03-09 12:20:08 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

supermatter

…

surgery

Rebalanced xenoflora sprites, fixed numerous issues.

2015-03-22 16:13:15 +10:30

vehicles

…

virus2

Master into dev-freeze.

2015-03-07 11:33:39 +10:30