kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

admin

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

assembly

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

atmospherics

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

awaymissions

Ports radios to Initialize (#983)

2017-05-18 12:19:55 -05:00

cargo

[MIRROR] Fixed tech disk exports (#971)

2017-05-18 11:59:06 -05:00

chatter

…

client

[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)

2017-05-18 09:37:30 -05:00

clothing

Ports radios to Initialize (#983)

2017-05-18 12:19:55 -05:00

crafting

Adds a few new recipes created with plastic sheets (#979)

2017-05-18 11:53:17 -05:00

detectivework

[MIRROR] Fixes language code ignoring holder restrictions (#858)

2017-05-18 04:13:57 -05:00

emoji

…

error_handler

…

events

Space vines can no longer spread on transit turfs (#1026)

2017-05-18 13:18:48 -05:00

fields

[READY]Peacekeeper cyborg projectile dampening fields, attempt three

2017-05-18 16:36:50 -05:00

flufftext

[MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710)

2017-05-18 01:39:16 -05:00

food_and_drinks

Merge pull request #1047 from Citadel-Station-13/upstream-merge-27343

2017-05-18 23:46:20 -04:00

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

Adds Bonfire Grills (#1003)

2017-05-18 12:23:07 -05:00

jobs

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

language

Adds a proc for copying languages from another thing (#1021)

2017-05-18 13:18:04 -05:00

library

[MIRROR] Devil refactor+small revamp (#887)

2017-05-18 09:06:01 -05:00

lighting

More /vg/lighting tweaks (#884)

2017-05-10 16:11:22 -07:00

mapping

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

mentor

…

mining

Survival pod doors will properly turn if on shuttles (#1070)

2017-05-21 17:43:53 -07:00

mob

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

modular_computers

[MIRROR] Refactor of modular PC UIs (#874)

2017-05-18 05:22:34 -05:00

ninja

[MIRROR] Ninja Refactor (#1037)

2017-05-21 00:39:26 -05:00

orbit

…

paperwork

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

power

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

procedural_mapping

…

projectiles

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

reagents

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

recycling

…

research

[MIRROR] Fixed tech disk exports (#971)

2017-05-18 11:59:06 -05:00

ruins

Gives lavaland syndicates the syndicate faction.

2017-05-18 16:37:57 -05:00

security_levels

…

shuttle

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

space_transition

…

spells

fixes aimed spells not recharging

2017-05-19 06:21:06 -05:00

station_goals

…

stock_market

…

surgery

Adjusts ear/eye protection based on missing organs (#999)

2017-05-18 12:07:33 -05:00

telesci

…

tgui

…

tooltip

…

uplink

Merge pull request #1051 from cebutris/holofixes

2017-05-19 22:46:30 -05:00

vehicles

…

vore

[MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710)

2017-05-18 01:39:16 -05:00

VR

…

zombie

Merge pull request #640 from Citadel-Station-13/upstream-merge-26527

2017-05-13 01:24:55 -04:00