LordFowl 471ef657d5 Merge branch 'Aurorastation/development' into Map-Development ...

# Conflicts:
#	code/TriDimension/controller_presets.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/game/objects/structures/signs.dm
#	code/game/turfs/simulated/floor_types.dm
#	code/modules/random_map/mining_distribution.dm
#	code/modules/random_map/random_map.dm
#	code/world.dm
#	icons/obj/barsigns.dmi
#	icons/obj/decals.dmi
#	icons/obj/plants.dmi
#	icons/obj/structures.dmi
#	icons/turf/floors.dmi
#	icons/turf/wall_masks.dmi
#	maps/exodus-2.dmm

2017-01-27 01:57:29 -05:00

..

acting

…

admin

Fix general antagonist bans (#1643)

2017-01-26 01:33:44 +02:00

alarm

…

antag_contest

Fixing Airlocks (#1546)

2017-01-13 23:39:22 +02:00

assembly

Mousetrap, mouse and spawning fixes (#1497)

2017-01-11 22:40:30 +02:00

awaymissions

…

blob

Nar-Nar and Blob Fixes (#1569)

2017-01-15 20:50:01 +02:00

cargo

More delay issues, magboots, knive-boot, marble and ccia (#1586)

2017-01-18 18:56:06 +02:00

cciaa

Fixes #1564, #1330, #1434 and #1210 (#1621)

2017-01-21 22:53:58 +02:00

client

Fixes no client passed to delete_character_sql() (#1570)

2017-01-14 20:57:28 +02:00

clothing

Fixes #1564, #1330, #1434 and #1210 (#1621)

2017-01-21 22:53:58 +02:00

customitems

Fix a ligger's broken cane (#1584)

2017-01-15 23:51:35 +02:00

detectivework

Printing Fixes (#1476)

2017-01-09 00:44:42 +02:00

economy

More delay issues, magboots, knive-boot, marble and ccia (#1586)

2017-01-18 18:56:06 +02:00

events

Event tweaks, misc changes and fixes pack (#1588)

2017-01-20 19:23:04 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

More delay issues, magboots, knive-boot, marble and ccia (#1586)

2017-01-18 18:56:06 +02:00

genetics

…

ghosttrap

Fix general antagonist bans (#1643)

2017-01-26 01:33:44 +02:00

holodeck

…

http

…

hydroponics

Nar-Nar and Blob Fixes (#1569)

2017-01-15 20:50:01 +02:00

icon generation

…

intern

…

law

…

library

Fix two SQL errors (#1424)

2017-01-07 20:50:06 +02:00

lighting

…

liquid

…

maps

…

materials

Merge branch 'Aurorastation/development' into Map-Development

2017-01-27 01:57:29 -05:00

mining

Fixes blobs and other stuff (#1513)

2017-01-11 22:24:39 +02:00

mob

Fix constructs being unable to hit things (#1639)

2017-01-25 16:23:14 +02:00

modular_computers

Computer manager and more (#1406)

2017-01-20 21:45:53 +02:00

multiz

…

nano

…

organs

Fixes #1591, #1567, and grammar (#1629)

2017-01-23 15:59:39 +02:00

overmap

…

paperwork

Tray, paper bin and bottle fixes (#1631)

2017-01-23 23:41:33 +02:00

power

Fixes #1564, #1330, #1434 and #1210 (#1621)

2017-01-21 22:53:58 +02:00

projectiles

Merge branch 'master' into development

2017-01-24 16:37:24 -05:00

random_map

Merge branch 'Aurorastation/development' into Map-Development

2017-01-27 01:57:29 -05:00

reagents

Tray, paper bin and bottle fixes (#1631)

2017-01-23 23:41:33 +02:00

recycling

Gripper overhaul + New borg sprites (#1518)

2017-01-13 00:07:18 +02:00

research

Gripper overhaul + New borg sprites (#1518)

2017-01-13 00:07:18 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

Merge branch 'Aurorastation/development' into Map-Development

2017-01-27 01:57:29 -05:00

spells

Fix heist not ending again with the transfer shuttle (#1633)

2017-01-24 20:28:17 +02:00

supermatter

…

surgery

Fixing Airlocks (#1546)

2017-01-13 23:39:22 +02:00

tables

Gripper overhaul + New borg sprites (#1518)

2017-01-13 00:07:18 +02:00

telesci

…

vehicles

…

ventcrawl

…

virus2

Automatic pistol, nutriment and sprites fixes (#1617)

2017-01-21 17:23:11 +02:00

web_interface

…

wireless

…

xgm

…