skull132 d536d9f4aa Merge branch 'fake-master' into development ...

# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm

2017-12-09 00:08:21 +02:00

..

acting

…

admin

Misc code removals/changes (#3813)

2017-11-18 18:44:00 +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

…

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 'fake-master' into development

2017-12-09 00:08:21 +02:00

clothing

Fix ring runtimes (#3950)

2017-12-07 23:35:15 -06:00

customitems

Skrell and estus fixes (#3824)

2017-11-10 23:27:07 -06: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

Merge branch 'fake-master' into development

2017-12-09 00:08:21 +02: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

added insert_slot class (#3825)

2017-11-18 18:45:03 +02: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

Adds a new reg - i220 (#3816)

2017-11-05 17:43:13 +02:00

library

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

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

lighting

Merge branch 'master' into development

2017-11-25 12:57:38 -06:00

liquid

…

maps

Runtime Map Loading (#3597)

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

materials

Rings (#3886)

2017-12-04 18:53:39 -06:00

merchant

…

mining

Merge branch 'fake-master' into development

2017-12-09 00:08:21 +02:00

mob

Merge branch 'fake-master' into development

2017-12-09 00:08:21 +02:00

modular_computers

Recharger QoL Tweaks (#3826)

2017-11-18 18:46:14 +02: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

New Hair & Sprite Accessories Cleanup (#3897)

2017-11-29 11:41:09 +02:00

overmap

Kill processing_objects (#3398)

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

paperwork

Rings (#3886)

2017-12-04 18:53:39 -06:00

power

Merge branch 'fake-master' into development

2017-12-09 00:08:21 +02:00

projectiles

Its a drill, not a gun (#3937)

2017-12-08 14:55:55 +01:00

random_map

Borg and dionae vines fixes (#3758)

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

reagents

Unapologetic Diona Buffs (#3829)

2017-11-29 10:33:02 +02:00

recycling

…

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

Misc code removals/changes (#3813)

2017-11-18 18:44:00 +02:00

spells

Adds new reagents and recipes (#3688)

2017-11-15 23:11:51 +01: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 tables to absolute pathing (#3805)

2017-11-08 22:23:27 -06:00

telesci

Adds new reagents and recipes (#3688)

2017-11-15 23:11:51 +01:00

turbolift

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

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

udp

…

vehicles

…

ventcrawl

…

virus2

Runtime fixes (#3859)

2017-11-17 00:54:33 +02:00

web_interface

…

xgm

More ZAS performance stuff (#3186)

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