= 601e6fb7ef Merged with dev.

2015-03-31 11:17:13 +10:30

..

admin

Merge with dev.

2015-03-30 08:36:52 +10:30

alarm

Fixes camera network changes not always being reflected in camera consoles.

2015-02-25 19:50:07 +01:00

assembly

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

awaymissions

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

2015-03-05 08:05:44 +01:00

client

Merged with dev.

2015-03-31 11:17:13 +10:30

clothing

Merged with dev.

2015-03-31 11:17:13 +10:30

customitems

Adds Andrewmeythaler's custom item.

2015-03-17 22:19:13 -05:00

detectivework

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

economy

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

events

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

examine

Fixes #8439.

2015-03-13 23:27:35 +01:00

ext_scripts

…

flufftext

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

food

…

games

…

genetics

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

holodeck

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

2015-03-30 20:17:05 +02:00

hydroponics

Merged with dev.

2015-03-31 11:17:13 +10:30

icon generation

…

library

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

liquid

…

maps

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

2015-03-05 08:05:44 +01:00

mining

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30

mob

Merged with dev.

2015-03-31 11:17:13 +10:30

nano

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

2015-03-28 20:26:24 +01:00

organs

Mob refactoring.

2015-03-29 10:44:31 +02:00

overmap

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

2015-03-13 09:31:03 +01:00

paperwork

Merge with dev.

2015-03-30 08:36:52 +10:30

power

Merged with dev.

2015-03-31 11:17:13 +10:30

projectiles

Merged with dev.

2015-03-31 11:17:13 +10:30

random_map

…

reagents

Merged with dev.

2015-03-31 11:17:13 +10:30

recycling

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

research

Merged with dev.

2015-03-31 11:17:13 +10:30

scripting

…

security levels

…

shieldgen

…

shuttles

First pass on making heist a pirate mode (human based)

2015-03-21 11:13:05 +10:30

spells

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

2015-03-29 16:23:06 +02:00

supermatter

…

surgery

Merged with dev.

2015-03-31 11:17:13 +10:30

vehicles

…

virus2

Replaced display_name with name, worked on severing limbs and damage propagation.

2015-03-25 19:07:22 +10:30