PsiOmegaDelta 2402b3ccd8 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-07 17:56:27 +01:00

..

admin

Added holder to the locked vars list

2015-12-07 12:07:08 +00:00

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

…

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

…

economy

…

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

…

hydroponics

Merge pull request #11516 from Baystation12/dev-freeze

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

icon generation

…

library

…

lighting

Re-adds missing lighting initializer.

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

liquid

…

maps

…

materials

…

mining

Tweaks to the previous commits.

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

mob

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-07 17:56:27 +01:00

multiz

…

nano

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-06 12:10:33 +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 pull request #11605 from mwerezak/click-cooldown

2015-12-07 19:56:23 +03:00

projectiles

Sparks now qdel() cleanly.

2015-12-07 09:19:06 +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 for disposal pipes not vanishing under floors.

2015-12-04 09:58:08 +01:00

research

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

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

scripting

…

security levels

…

shieldgen

…

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

…

vehicles

Adds missing click cooldowns for aggressive actions

2015-12-06 00:05:06 -05:00

virus2

…

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