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

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm

2015-06-07 10:30:27 +02:00

..

admin

Merge pull request #9711 from mwerezak/syringelog

2015-06-07 09:00:21 +02:00

alarm

more lightweight camera caching

2015-05-10 17:06:30 +01:00

assembly

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

awaymissions

…

client

Fixes #9623

2015-06-02 13:13:44 +03:00

clothing

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

2015-05-30 15:59:54 +02:00

customitems

Allowed accessories to function as custom items using icon_override

2015-05-16 01:37:04 +09:30

detectivework

…

economy

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

2015-06-04 08:10:49 +02:00

events

Merge pull request #9626 from GinjaNinja32/vine_event_fix

2015-06-03 04:00:21 +09:30

examine

Updated ashtrays and mineral doors.

2015-05-17 03:02:03 +09:30

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

New tables, code section. Changelog entry soon.

2015-05-13 19:08:39 +01:00

hydroponics

Merge pull request #9626 from GinjaNinja32/vine_event_fix

2015-06-03 04:00:21 +09:30

icon generation

…

library

Renamed knives.

2015-05-16 20:54:34 +09:30

lighting

fix an issue with destroying light sources that have 0 light_range

2015-05-14 10:58:52 +01:00

liquid

…

maps

…

materials

Merge pull request #9701 from Zuhayr/dev-freeze

2015-06-07 03:14:06 +01:00

mining

Rebalancing and adjusting divisors for all weapon damage values.

2015-05-17 16:51:55 +09:30

mob

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

2015-06-07 10:30:27 +02:00

nano

Allows all synths to view the alternative law sets.

2015-06-02 14:48:08 +02:00

organs

Fixes #9619

2015-06-06 06:52:42 +02:00

overmap

…

paperwork

More consistent logging via admin_inject_log proc

2015-05-29 16:57:42 +01:00

power

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

2015-06-05 10:23:23 +02:00

projectiles

Merge pull request #9711 from mwerezak/syringelog

2015-06-07 09:00:21 +02:00

random_map

…

reagents

Adds logging for syringe_gun

2015-06-06 17:02:42 -04:00

recycling

Now when welding sorting pipe, game update it's name

2015-06-04 20:48:57 +03:00

research

Merge pull request #9553 from GinjaNinja32/reagent_protection

2015-05-30 13:57:31 +09:30

scripting

…

security levels

…

shieldgen

fix #9666

2015-06-04 18:46:27 +03:00

shuttles

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

2015-05-30 15:59:54 +02:00

spells

new object-based lighting system

2015-05-10 20:54:25 +01:00

supermatter

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

2015-06-07 10:30:27 +02:00

surgery

Merge with dev.

2015-05-20 13:39:31 +09:30

tables

Fixes IV stands blocking bullets

2015-05-26 23:05:38 -04:00

vehicles

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

virus2

…