Atlantis 0e78d9b51c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed

2015-12-07 13:55:48 +01:00

..

admin

Merge pull request #11502 from PsiOmegaDelta/151121-InWorldParams

2015-12-02 09:56:28 +10:30

alarm

Relables alarm (un)registration to (un)register_alarm.

2015-11-29 12:32:19 +01:00

assembly

Runtime fixes.

2015-12-02 08:37:09 +01:00

awaymissions

…

blob

Fixes a minor blob issue, adds mecha attack message

2015-10-07 10:49:24 +03:00

client

Merge pull request #11590 from PsiOmegaDelta/151204-SaveMyCharacter

2015-12-05 18:59:19 +00:00

clothing

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

2015-12-06 11:48:20 +01:00

customitems

…

detectivework

Porting forensics from Aurora.

2015-10-24 02:15:06 +10:30

economy

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

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

events

Minor update

2015-11-07 18:05:47 +01:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Additional respawn refactoring.

2015-11-08 20:05:37 +01:00

holodeck

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

2015-10-15 07:08:16 -04:00

hydroponics

Merge pull request #11516 from Baystation12/dev-freeze

2015-11-24 14:35:56 +01:00

icon generation

…

library

Fixes missing cooldowns, missing cult blade sound.

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

lighting

Re-adds missing lighting initializer.

2015-11-21 16:20:04 +01:00

liquid

…

maps

…

materials

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

2015-10-14 08:41:38 +02:00

mining

Tweaks to the previous commits.

2015-12-01 02:14:47 +10:30

mob

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed

2015-12-07 13:55:48 +01:00

multiz

Turf initialization tweaking.

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

nano

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

2015-12-06 11:48:20 +01:00

organs

Removes a leftover world <<

2015-12-02 18:21:09 +10:30

overmap

…

paperwork

Removed uneceserry variable

2015-11-22 13:23:45 +02:00

power

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

2015-12-06 11:48:20 +01:00

projectiles

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

2015-12-06 11:48:20 +01:00

random_map

Merge pull request #11570 from Raptor1628/dev

2015-12-03 21:22:34 +01:00

reagents

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

2015-12-06 11:48:20 +01:00

recycling

fix #10882

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

research

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

2015-12-06 11:48:20 +01:00

scripting

…

security levels

…

shieldgen

Updates blob

2015-10-05 18:10:16 +03:00

shuttles

Merge pull request #11516 from Baystation12/dev-freeze

2015-11-24 14:35:56 +01:00

spells

Reduces wizard subjugate duration

2015-10-27 15:14:40 -05:00

supermatter

…

surgery

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

2015-12-06 11:48:20 +01:00

tables

improve defines in table code

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

vehicles

Updates blob

2015-10-05 18:10:16 +03:00

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

wireless

More wireless fixes

2015-12-06 16:50:48 +13:00

xgm

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

2015-12-06 11:34:36 +01:00