Hubblenaut a40ef85a5f Merge branch 'grab' into dev ...

Conflicts:
	icons/mob/screen1.dmi

2015-04-19 16:00:28 +02:00

..

admin

Merge pull request #8891 from volas/sanitize3

2015-04-19 14:59:36 +03:00

alarm

…

assembly

Merge pull request #8910 from Baystation12/master

2015-04-19 17:26:04 +09:30

awaymissions

Clean server start.

2015-04-18 15:32:25 +02:00

client

On join clients are now given a changelog notice, if the changelog has changed since last.

2015-04-18 15:53:23 +02:00

clothing

Adds Hardsuit Module tab.

2015-04-16 08:54:04 +02:00

customitems

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

2015-03-31 01:37:55 -04:00

detectivework

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

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

economy

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

2015-04-08 10:55:26 +02:00

events

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

2015-04-03 09:33:05 +02:00

examine

Fixes #8439.

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

ext_scripts

…

flufftext

…

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

Fixes #8696

2015-03-31 20:30:06 -04:00

hydroponics

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

2015-04-13 12:49:07 +01:00

icon generation

…

library

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00

liquid

…

maps

…

mining

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

2015-04-08 10:55:26 +02:00

mob

Merge branch 'grab' into dev

2015-04-19 16:00:28 +02:00

nano

Fixes #8880.

2015-04-18 08:59:49 +02:00

organs

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

2015-04-13 17:12:02 -04:00

overmap

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

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

paperwork

Makes it possible to write [date] and [time] to get the current date and time in ISO 8601 format.

2015-04-18 18:40:35 +02:00

power

Merge pull request #8910 from Baystation12/master

2015-04-19 17:26:04 +09:30

projectiles

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

2015-04-13 12:49:07 +01:00

random_map

Clean server start.

2015-04-18 15:32:25 +02:00

reagents

Merge pull request #8910 from Baystation12/master

2015-04-19 17:26:04 +09:30

recycling

sanitize() refactor: first pass (sanitize)

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

research

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

2015-04-14 15:54:22 +02:00

scripting

…

security levels

Allows admins to more easily set security levels.

2015-03-31 14:32:28 +02:00

shieldgen

Fixes #7943.

2015-04-18 11:52:03 +02:00

shuttles

Adds refresh button, fixes arrivals docking frequency.

2015-04-02 00:26:45 -04:00

spells

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

supermatter

Changes SM alerts to Engineering frequency

2015-04-16 07:01:11 -07:00

surgery

Fixes a monkey runtime and updates head reattachment surgery.

2015-04-04 20:03:54 -07:00

vehicles

…

virus2

Added macros for droplimb flags.

2015-03-31 11:42:45 +10:30