Zuhayr ee657d64f8 Fixes handle_grasp() spam.

2015-04-03 19:15:47 -07:00

..

admin

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

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

alarm

…

assembly

…

awaymissions

…

client

Merged with dev.

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

clothing

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

2015-04-03 09:33:05 +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

sanitize() refactor: third pass (misc)

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

events

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

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

examine

…

ext_scripts

Bot down? Let's not lock up the entire server.

2014-05-29 21:36:34 -05:00

flufftext

Fixes captain's laser gun

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

food

…

games

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

genetics

…

holodeck

Fixes #8696

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

hydroponics

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

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

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

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

2015-03-31 02:13:22 -04:00

mob

Fixes handle_grasp() spam.

2015-04-03 19:15:47 -07:00

nano

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

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

organs

Should fix the limb spam issue.

2015-04-03 19:11:35 -07:00

overmap

…

paperwork

Merge with dev.

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

power

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

2015-03-31 02:13:22 -04:00

projectiles

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

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

random_map

…

reagents

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

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

recycling

sanitize() refactor: first pass (sanitize)

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

research

Fixes #8696

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

scripting

…

security levels

Allows admins to more easily set security levels.

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

shieldgen

…

shuttles

…

spells

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

2015-03-31 00:16:56 -04:00

supermatter

…

surgery

God dammit copypaste before commit.

2015-04-03 18:47:59 -07:00

vehicles

…

virus2

Added macros for droplimb flags.

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