skull132 f24b15fa76 Merge pull request #236 from Aurorastation/development ...

Development Merge - 25MAR2016

2016-03-25 22:35:35 +02:00

..

admin

Conflict resolution

2016-03-25 22:25:41 +02:00

alarm

…

assembly

Issue #46.

2016-02-02 21:16:16 +01:00

awaymissions

…

cciaa

+CCIAA bugs

2016-02-10 00:54:15 +02:00

client

client procs.dm - sso_server addition

2016-03-21 23:05:31 +02:00

clothing

Conflict resolution

2016-03-25 22:25:41 +02:00

customitems

…

detectivework

Porting Zuhayr's Fixes For Forensics

2016-02-01 17:31:29 +02:00

economy

…

events

…

examine

…

ext_scripts

Discord.dm Update

2016-02-16 21:34:41 +02:00

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

JMP logs for days

2016-03-25 18:27:37 +02:00

icon generation

…

intern

Intern Accesses

2016-02-21 22:27:10 +02:00

library

Conflict resolution

2016-03-25 22:25:41 +02:00

lighting

…

liquid

…

maps

…

materials

…

mining

…

mob

Conflict resolution

2016-03-25 22:25:41 +02:00

nano

…

organs

Vampire Blood Immunity

2016-02-02 18:21:45 -05:00

overmap

…

paperwork

Of Helper Procs & Dumbs

2016-03-25 20:33:10 +02:00

power

Tesla Standardization

2016-02-21 22:24:14 +02:00

projectiles

Fixes 120

2016-03-20 14:52:11 +00:00

random_map

…

reagents

Merge pull request #236 from Aurorastation/development

2016-03-25 22:35:35 +02:00

recycling

Fixes #179

2016-03-25 16:52:49 +02:00

research

Conflict resolution

2016-03-25 22:25:41 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Wizardry Fixes

2016-02-21 17:48:48 +02:00

supermatter

Resolves #152

2016-02-21 20:47:21 +02:00

surgery

…

tables

…

telesci

Fixes #187

2016-03-25 21:44:17 +02:00

vehicles

…

virus2

…

web_interface

webint_procs.dm - webint_start_singlesignon()

2016-03-21 23:04:10 +02:00