deathride58 aedf16a76e merges #4011

2017-11-21 15:07:31 -05:00

..

admin

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

assembly

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

atmospherics

Cleans up unused code

2017-11-20 10:14:32 -06:00

awaymissions

Refactor ladders so that they actually work (#32797)

2017-11-20 02:05:52 -06:00

cargo

JSON feedback

2017-11-17 01:44:12 -06:00

chatter

…

client

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

clothing

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

crafting

JSON feedback

2017-11-17 01:44:12 -06:00

detectivework

Update footprints_and_rag.dm

2017-11-20 13:43:48 -05:00

emoji

…

error_handler

…

events

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

fields

Nerfs peaceborg chain bucklestun (#32251)

2017-10-31 17:40:03 -05:00

flufftext

Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00

food_and_drinks

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

games

…

goonchat

reeeeEEEEEEEEEEEEEEE

2017-11-13 22:55:18 -05:00

holiday

Makes false alarm use more explicit in event code.

2017-11-11 14:36:36 -06:00

holodeck

Cleans up unused code

2017-11-20 10:14:32 -06:00

html_interface

…

hydroponics

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

integrated_electronics

Merge pull request #4009 from Citadel-Station-13/upstream-merge-32788

2017-11-19 05:16:15 +00:00

jobs

JSON feedback

2017-11-17 01:44:12 -06:00

language

…

library

Cleans up unused code

2017-11-20 10:14:32 -06:00

lighting

Cleans up unused code

2017-11-20 10:14:32 -06:00

mapping

Fixes some cases where changeturf were called incorrectly (#32584)

2017-11-11 14:32:13 -06:00

mentor

…

mining

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

mob

merges #4011

2017-11-21 15:07:31 -05:00

modular_computers

Cleans up unused code

2017-11-20 10:14:32 -06:00

ninja

Cleans up unused code

2017-11-20 10:14:32 -06:00

orbit

Merge pull request #32871 from AnturK/orbitclean

2017-11-19 17:13:08 -06:00

paperwork

Cleans up unused code

2017-11-20 10:14:32 -06:00

power

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

reagents

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

recycling

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

research

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

ruins

Fixes whiteship ruin board swap (#32869)

2017-11-19 21:04:11 -06:00

security_levels

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

server_tools

Delete nudge.py

2017-10-30 01:48:48 -05:00

shuttle

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

space_transition

…

spells

Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176

2017-11-14 15:58:20 -06:00

station_goals

Little change. More the same

2017-11-06 08:46:39 -06:00

stock_market

…

surgery

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

telesci

…

tgui

Update tgui.dm

2017-11-12 13:18:42 -06:00

tooltip

…

uplink

JSON feedback

2017-11-17 01:44:12 -06:00

vehicles

tweak skateboard crashes, gives brain damage (#32885)

2017-11-20 01:50:24 -06:00

vore

…

VR

…

zombie

…