ShadowLarkens cd5e2976c5 Merge remote-tracking branch 'upstream/master' into rconsolefix

2020-08-31 11:19:53 -07:00

..

admin

Improve quick nif

2020-08-30 20:53:23 +02:00

ai

Fixes Mercs threaten timers, and threaten sounds

2020-08-23 18:47:02 -04:00

alarm

…

artifice

…

assembly

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

asset_cache

TGUI Research

2020-08-25 13:30:47 -07:00

awaymissions

…

blob

…

blob2

…

busy_space

…

busy_space_vr

…

catalogue

…

client

adds toeless jackboots to loadout

2020-08-30 09:15:16 +10:00

clothing

Site Management lookover for _vr stuff

2020-08-29 05:22:52 +10:00

customitems

…

detectivework

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

economy

Changes the dates of bank account creation to be more reasonable

2020-08-30 13:57:21 +10:00

entopics_vr

…

error_handler

…

events

Site Management lookover for _vr stuff

2020-08-29 05:22:52 +10:00

examine

Vendor enhancement fixes (#7577)

2020-08-30 02:49:00 -04:00

ext_scripts

…

fishing

…

flufftext

Update Dreaming.dm

2020-08-28 12:52:12 -04:00

food

Vendor enhancement fixes (#7577)

2020-08-30 02:49:00 -04:00

gamemaster

Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases

2020-08-27 22:28:46 -04:00

games

Merge pull request #8868 from VOREStation/upstream-merge-7571

2020-08-28 13:17:58 -04:00

genetics

…

ghosttrap

…

holodeck

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

holomap

…

hydroponics

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

icon generation

…

identification

…

integrated_electronics

TGUI Research

2020-08-25 13:30:47 -07:00

library

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

lighting

…

looking_glass

…

lore_codex

…

maps

…

materials

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

media

…

metric

…

mining

Some quick fixes

2020-08-28 14:36:16 -04:00

mob

Update robot.dm

2020-08-30 14:59:10 -04:00

modular_computers

Update supermatter_monitor.dm

2020-08-28 13:28:03 -04:00

multi-tile

…

multiz

Make flying not cost your entire fat reserves

2020-08-30 20:33:39 +02:00

nano

TGUI Law Manager

2020-08-28 11:36:47 -07:00

nifsoft

…

organs

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

overmap

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

paperwork

Merge pull request #8868 from VOREStation/upstream-merge-7571

2020-08-28 13:17:58 -04:00

persistence

Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch

2020-08-21 01:14:04 -04:00

planet

…

power

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

projectiles

Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576

2020-08-28 13:30:54 -04:00

radiation

…

random_map

…

reagents

Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions

2020-08-28 00:47:23 -04:00

recycling

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

research

Whoops, don't make research levels global, we don't want permaautosync

2020-08-29 13:24:28 -07:00

resleeving

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

rogueminer_vr

…

scripting

…

security levels

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

shieldgen

Merge pull request #7507 from listerla/shieldgen

2020-08-20 22:24:21 -04:00

shuttles

…

spells

…

surgery

…

tables

…

telesci

…

tension

…

tgs

…

tgui

Fixes emergent exploit of iteration order in crew monitors

2020-08-30 19:05:05 -07:00

tooltip

…

turbolift

Beginnings of a global volume control system

2020-08-21 04:42:47 -04:00

vchat

Fixes Runtime in vchat_client.dm,85: Cannot execute null.is preference enabled (#7557)

2020-08-25 00:32:25 -04:00

vehicles

…

ventcrawl

Fixes mobs being able to ventcrawl while buckled (#7526)

2020-08-22 04:24:31 -04:00

virus2

…

vore

TGUI Drag Inventory

2020-08-25 21:56:51 -07:00

xenoarcheaology

Also fix the depth scanner

2020-08-29 13:31:50 -07:00

xenobio

…

xenobio2

…

xgm

…