Chinsky 7b15bd59e5 Merge pull request #8768 from Yoshax/emergencymessage ...

Emergency message changes

2015-04-09 08:15:19 +03:00

..

admin

Merge pull request #8768 from Yoshax/emergencymessage

2015-04-09 08:15:19 +03:00

alarm

…

assembly

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

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

awaymissions

…

client

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

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

clothing

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

2015-04-08 10:55:26 +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 pull request #8655 from volas/sanitize_procs2

2015-04-06 15:16:17 +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 pull request #8768 from Yoshax/emergencymessage

2015-04-09 08:15:19 +03:00

nano

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

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

organs

Some dislocation fixes/adjustments.

2015-04-07 19:50:26 -07:00

overmap

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

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

paperwork

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

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

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-08 10:55:26 +02:00

random_map

…

reagents

Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.

2015-04-06 18:40:11 -04:00

recycling

sanitize() refactor: first pass (sanitize)

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

research

Big emergency message changes

2015-04-06 20:17:18 +01:00

scripting

…

security levels

Allows admins to more easily set security levels.

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

shieldgen

…

shuttles

Adds refresh button, fixes arrivals docking frequency.

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

spells

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

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

supermatter

…

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