Tigercat2000 c562680098 Merge remote-tracking branch 'origin/master' into bay_examine ...

# Conflicts:
#	code/game/objects/structures/displaycase.dm

2015-09-15 14:08:36 -07:00

..

admin

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

2015-09-15 04:18:27 +02:00

alarm

Display case update, some forceMove updates

2015-09-14 20:21:56 +02:00

assembly

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

atmos_automation

…

awaymissions

Minor bluespace artillery interface update

2015-08-30 22:49:05 +02:00

client

Tails Notification Hotfix

2015-09-15 16:24:00 -04:00

clothing

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

computer3

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

crafting

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

customitems

Fixes Derp Fox

2015-09-01 22:46:33 -04:00

destilery

…

DetectiveWork

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

economy

Accounts database fixes

2015-09-14 02:04:07 +02:00

events

Radiation damage fix

2015-09-12 18:51:24 +02:00

examine

Bayxamine: WEAPONS\!

2015-09-15 09:10:17 -07:00

ext_scripts

…

fish

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

flufftext

…

food

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

games

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

garbage collection

Reduces Powernet Lag

2015-08-25 17:46:20 -04:00

genetics2

…

holiday

…

hydroponics

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

icon generation

…

jungle

Guns update

2015-09-14 04:05:20 +02:00

karma

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

library

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

lighting

Fixes light sources getting destroyed after their colour changes (no updates in between) leaving artifacts.

2015-09-12 22:51:10 +02:00

liquid

…

media

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

mining

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

mob

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

nano

Merge pull request #2049 from Markolie/display

2015-09-15 16:02:43 -04:00

ninja

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

organs

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00

paperwork

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

pooling

…

power

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

procedural mapping

…

projectiles

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

reagents

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

recycling

sprite-revert

2015-09-07 16:55:40 -04:00

research

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

scripting

Port Bay's intercom overhaul

2015-09-03 21:21:20 +02:00

security levels

Remove double follow link

2015-08-22 01:14:10 +02:00

shieldgen

Pass II

2015-09-04 16:32:18 -04:00

shuttles

R&D Update and Fix & Cargo Tweaks

2015-09-07 20:03:06 -04:00

store

Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update

2015-08-14 06:26:40 +02:00

surgery

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00

telesci

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

tram

…

vehicle

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

virus2

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00