skull132 c0f22a1cdd Merge branch 'master' into development ...

# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm

2017-10-29 16:15:53 +02:00

..

acting

…

admin

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

alarm

…

ambient_occlusion

Merge branch 'master' into development

2017-10-20 13:30:03 -05:00

antag_contest

…

assembly

Kill processing_objects (#3398)

2017-09-09 15:22:58 -05:00

awaymissions

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

blob

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

cargo

Cargo random stock and some fixes (#3609)

2017-10-13 17:38:33 +03:00

cciaa

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

client

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

clothing

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

customitems

Custom items 17/10 (#3692)

2017-10-17 21:51:26 +03:00

detectivework

Kill processing_objects (#3398)

2017-09-09 15:22:58 -05:00

economy

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

effects

…

events

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

examine

New turret icons & turret code tweaks (#3416)

2017-09-22 23:11:41 +03:00

ext_scripts

…

flufftext

…

food

Adds more food recipes (#3544)

2017-10-07 00:41:29 -05:00

games

…

genetics

…

ghosttrap

Revert #3241 (#3670)

2017-10-17 20:39:50 -05:00

global_listener

Add ringers (#3414)

2017-09-12 15:59:43 -05:00

holodeck

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

http

…

hydroponics

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

integrated_electronics

Fixes some missing push_data calls (fixes #3683) (#3714)

2017-10-20 14:17:41 +03:00

intern

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

item_worth

Coloured lighting & related stuff (#3555)

2017-10-10 18:46:24 +02:00

law

Fix More Baylore References (#3393)

2017-09-08 10:31:16 -05:00

library

Bug fixes (#3493, #3428, #3444) (#3494)

2017-09-25 10:59:52 +03:00

lighting

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

liquid

…

maps

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

materials

Turret fixes (#3520)

2017-10-02 19:17:17 -05:00

merchant

Baystation12 merchant port (#3155)

2017-08-04 21:36:04 +03:00

mining

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

mob

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

modular_computers

Sound Tweaks (#3627)

2017-10-20 17:53:44 +03:00

multiz

Better openspace (#3744)

2017-10-29 13:31:04 +02:00

nano

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

orbit

…

organs

Fix IPCs' right leg being organic (#3733)

2017-10-22 13:48:56 +03:00

overmap

Kill processing_objects (#3398)

2017-09-09 15:22:58 -05:00

paperwork

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

power

Merge branch 'master' into development

2017-10-29 16:15:53 +02:00

projectiles

Fixes some runtimes (#3727)

2017-10-22 02:37:44 +03:00

random_map

Borg and dionae vines fixes (#3758)

2017-10-27 22:56:36 +03:00

reagents

Fixes some runtimes (#3727)

2017-10-22 02:37:44 +03:00

recycling

Global Listeners (#3373)

2017-08-29 16:09:41 -05:00

research

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

scripting

…

security levels

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

shieldgen

Fixes #3096 and #3461 (#3728)

2017-10-22 02:37:30 +03:00

shuttles

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

spells

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

supermatter

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

surgery

Fixed bugs with shell surgery and human damage overlays. (#3637)

2017-10-14 20:03:47 +03:00

tables

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

telesci

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

turbolift

Smooth doors + multi-tile door code tweaks (#3365)

2017-09-03 16:24:25 +03:00

udp

…

vehicles

Adds drop pods (#3296)

2017-08-29 23:14:41 +03:00

ventcrawl

…

virus2

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

web_interface

…

xgm

More ZAS performance stuff (#3186)

2017-09-14 21:19:07 +03:00