Jordan Brown 963fc6b4ae Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

..

admin

Adds a fireball from the heavens as an admin smite (#31502)

2017-10-12 21:37:11 -04:00

assembly

Update bomb.dm (#31557)

2017-10-12 11:36:09 -06:00

atmospherics

Radiation rework and subsystem (#30909)

2017-10-13 10:22:00 -04:00

awaymissions

Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

cargo

Improve extended examination text for many objects (#31381)

2017-10-10 21:06:46 +13:00

chatter

…

client

Fixes client vv not working. (#31556)

2017-10-12 17:37:43 +02:00

clothing

Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

crafting

…

detectivework

merge conflict fix

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

emoji

…

error_handler

…

events

Minor refactor of how gas IDs are handled (#31528)

2017-10-11 15:04:12 -04:00

fields

Fix many instances of "the the"

2017-10-11 21:55:44 -07:00

flufftext

Does some code standardization/consistency

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

food_and_drinks

Fix many instances of "the the"

2017-10-11 21:55:44 -07: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

Fix many instances of "the the"

2017-10-11 21:55:44 -07:00

holodeck

Fixes being able to sell camera mobs to CentCom (#31306)

2017-10-08 13:12:53 +13:00

html_interface

Does some code standardization/consistency

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

hydroponics

Fix many instances of "the the"

2017-10-11 21:55:44 -07:00

jobs

…

language

…

library

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

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

lighting

Radiation rework and subsystem (#30909)

2017-10-13 10:22:00 -04:00

mapping

_1

2017-10-12 08:08:10 +02:00

mining

Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

mob

Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

modular_computers

Fix many instances of "the the"

2017-10-11 21:55:44 -07:00

ninja

Improve extended examination text for many objects (#31381)

2017-10-10 21:06:46 +13:00

orbit

…

paperwork

Fix many instances of "the the"

2017-10-11 21:55:44 -07:00

power

Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

procedural_mapping

…

projectiles

Fix many instances of "the the"

2017-10-11 21:55:44 -07:00

reagents

Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

recycling

Radiation rework and subsystem (#30909)

2017-10-13 10:22:00 -04:00

research

Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

ruins

Refactors away mission & space ruin area code (#31512)

2017-10-12 11:46:30 -06:00

security_levels

…

server_tools

Update server tools API to 3.1.0.2 (#31451)

2017-10-09 20:02:08 -04:00

shuttle

Merge pull request #31588 from ninjanomnom/shuttle-parallax

2017-10-12 17:06:05 -04:00

space_transition

…

spells

loc -- > forcemove (#31176)

2017-10-13 00:12:03 +13:00

station_goals

Fix many instances of "the the"

2017-10-11 21:55:44 -07:00

stock_market

merge conflict fix

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

surgery

loc -- > forcemove (#31176)

2017-10-13 00:12:03 +13:00

tgui

…

tooltip

Strip propriety macros from tooltips (#31113)

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

uplink

Update uplink_item.dm (#31448)

2017-10-09 14:25:14 -05:00

vehicles

loc -- > forcemove (#31176)

2017-10-13 00:12:03 +13:00

VR

Grammar fixes to atom descriptions (#31293)

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

zombie

…