PsiOmegaDelta 8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs ...

Conflicts:
	baystation12.dme

2015-10-01 09:48:51 +02:00

..

admin

Merge remote-tracking branch 'upstream/dev' into xenomorphs

2015-10-01 09:48:51 +02:00

alarm

…

assembly

Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.

2015-09-03 09:38:15 +02:00

awaymissions

…

client

Adds language prefix reset option.

2015-09-18 21:42:02 +02:00

clothing

Destroy tweaks.

2015-09-25 10:44:23 +02:00

customitems

…

detectivework

…

economy

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

2015-09-12 13:10:29 +02:00

events

Meteor events are now direction biased.

2015-09-18 21:45:15 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Refactors duplicate parry code

2015-08-28 14:39:28 -04:00

hydroponics

Xenomorph Queens can now infest victims.

2015-09-21 20:36:51 +09:30

icon generation

…

library

…

lighting

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

2015-09-18 08:51:10 +02:00

liquid

…

maps

…

materials

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2

2015-09-01 03:22:08 +02:00

mining

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

2015-09-11 08:54:03 +02:00

mob

Merge remote-tracking branch 'upstream/dev' into xenomorphs

2015-10-01 09:48:51 +02:00

multiz

Turf initialization tweaking.

2015-09-27 13:18:18 +02:00

nano

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

2015-09-29 11:52:48 +02:00

organs

Updating to new dev antagonist code.

2015-09-21 20:38:19 +09:30

overmap

…

paperwork

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

2015-09-27 13:48:33 +02:00

power

Destroy tweaks.

2015-09-25 10:44:23 +02:00

projectiles

Merge pull request #11208 from mwerezak/firemode-cleanup

2015-09-28 11:41:03 +01:00

random_map

Amending some loc setting lines.

2015-08-25 12:40:09 +09:30

reagents

Merge remote-tracking branch 'upstream/dev' into xenomorphs

2015-10-01 09:48:51 +02:00

recycling

fix #10882

2015-09-16 14:34:20 +03:00

research

Makes more external sources of radiation respect rad-protection.

2015-09-25 15:02:20 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

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

2015-09-27 13:48:33 +02:00

supermatter

…

surgery

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30

tables

improve defines in table code

2015-08-28 00:12:18 +01:00

vehicles

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

virus2

Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.

2015-09-26 09:19:58 +02:00

xgm

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

2015-08-25 08:12:39 +02:00