mwerezak 229f4cb043 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color ...

Conflicts:
	code/modules/customitems/item_defines.dm

2015-04-26 02:04:59 -04:00

..

admin

Removes most instances of item_color

2015-04-22 17:40:27 -04: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

Updates clothing/under to use item_state_slots.

2015-04-23 08:03:40 -04:00

customitems

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 02:04:59 -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-23 13:15:43 +02:00

examine

Fixes #8439.

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

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

hydroponics

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

2015-04-23 13:15:43 +02: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 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 02:04:59 -04:00

nano

Merge pull request #8941 from Baystation12/master

2015-04-22 09:32:56 +02:00

organs

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

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

overmap

Fix

2015-04-22 09:43:15 +03:00

paperwork

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

power

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

projectiles

Renames inventory slot string key defines

2015-04-23 04:57:03 -04:00

random_map

Clean server start.

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

reagents

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

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