Jordan Brown 0603ad4db0 Merge branch 'master' into codejanitoring

2017-10-07 14:53:43 -04:00

..

admin

Merge pull request #31388 from vuonojenmustaturska/atmoscherrypicking

2017-10-07 14:36:28 -04:00

assembly

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

atmospherics

Merge pull request #31388 from vuonojenmustaturska/atmoscherrypicking

2017-10-07 14:36:28 -04:00

awaymissions

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

cargo

…

chatter

…

client

Merge pull request #31374 from MrStonedOne/highpopmode

2017-10-07 09:42:15 -04:00

clothing

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

crafting

…

detectivework

merge conflict fix

2017-10-05 11:22:57 +02:00

emoji

Configuration datum refactor (#30763)

2017-09-29 15:36:51 +13:00

error_handler

Configuration datum refactor (#30763)

2017-09-29 15:36:51 +13:00

events

Nightmare spawn event (#31376)

2017-10-07 09:41:04 -04:00

fields

[READY]Refactors timestops to use fields (#30858)

2017-09-29 15:46:10 +13:00

flufftext

Does some code standardization/consistency

2017-10-05 11:13:47 +02:00

food_and_drinks

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

games

merge conflict fix

2017-10-05 11:22:57 +02:00

goonchat

merge conflict fix

2017-10-05 11:22:57 +02:00

holiday

Grammar fixes to atom descriptions (#31293)

2017-10-05 16:33:35 -04:00

holodeck

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

html_interface

Does some code standardization/consistency

2017-10-05 11:13:47 +02:00

hydroponics

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

jobs

Configuration datum refactor (#30763)

2017-09-29 15:36:51 +13:00

language

…

library

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

lighting

…

mapping

Fixes lighting object initialization on new zlevels.

2017-10-05 09:13:36 +02:00

mining

Merge branch 'master' into codejanitoring

2017-10-07 14:53:43 -04:00

mob

Merge branch 'master' into codejanitoring

2017-10-07 14:53:43 -04:00

modular_computers

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

ninja

Merge pull request #31289 from ShizCalev/hacknslash

2017-10-04 21:24:44 -03:00

orbit

…

paperwork

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

power

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

procedural_mapping

…

projectiles

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

reagents

Merge branch 'master' into codejanitoring

2017-10-07 14:53:43 -04:00

recycling

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

research

Merge branch 'master' into codejanitoring

2017-10-07 14:53:43 -04:00

ruins

Grammar fixes to atom descriptions (#31293)

2017-10-05 16:33:35 -04:00

security_levels

Configuration datum refactor (#30763)

2017-09-29 15:36:51 +13:00

server_tools

Server tools API update to 3.1.0.1

2017-10-02 10:58:44 -04:00

shuttle

Adds navigation consoles to boxstation and metastation white ships. (#31367)

2017-10-07 12:05:19 -04:00

space_transition

…

spells

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

station_goals

Grammar fixes to atom descriptions (#31293)

2017-10-05 16:33:35 -04:00

stock_market

merge conflict fix

2017-10-05 11:22:57 +02:00

surgery

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

tgui

…

tooltip

Strip propriety macros from tooltips (#31113)

2017-09-30 14:57:28 +02:00

uplink

…

vehicles

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

VR

Grammar fixes to atom descriptions (#31293)

2017-10-05 16:33:35 -04:00

zombie

…