RadiantFlash7 44060adba4 Merge pull request #1 from Yawn-Wider/map ...

Merging fresh upstream changes into my branch

2019-04-14 15:41:12 -04:00

..

admin

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

ai

Ports Stasis Cages from Baystation (#6017)

2019-03-30 14:55:52 -04:00

alarm

…

artifice

…

assembly

Merge pull request #4832 from VOREStation/upstream-merge-5985

2019-03-28 21:59:48 -04:00

awaymissions

Merge branch 'map' into RadiantMaster

2019-04-14 18:27:05 +01:00

blob

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

blob2

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

busy_space

Explorer Update - Cataloguers

2019-03-30 16:19:24 -04:00

busy_space_vr

Next time, take the easy route

2019-03-30 17:33:54 -04:00

catalogue

Fixes ghosts being counted as contributors for cataloguers. (#6032)

2019-04-05 15:08:10 -04:00

client

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

clothing

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

customitems

…

detectivework

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

DMAPI

…

economy

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

entopics_vr

…

error_handler

…

events

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

examine

Adds pressure protection bounds to clothing.

2019-03-27 13:26:07 -04:00

ext_scripts

…

flufftext

Guns sounds refactor and improvements

2019-03-27 10:42:18 -04:00

food

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

gamemaster

Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it

2019-03-27 14:49:30 -04:00

games

Fixes deck of cards bringing up unnecesary prompt when picked up

2019-04-08 10:49:56 +10:00

genetics

…

ghosttrap

…

holodeck

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

holomap

…

hydroponics

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

icon generation

…

identification

…

integrated_electronics

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

interserver shipping

UI fixes

2019-04-14 19:56:11 +01:00

library

Merge pull request #4746 from VOREStation/upstream-merge-5922

2019-03-28 16:38:18 -04:00

lighting

…

lore_codex

Merge branch 'master' into upstream-merge-5908

2019-03-28 15:19:53 -04:00

maps

Merge pull request #4789 from VOREStation/upstream-merge-5967

2019-03-28 21:08:01 -04:00

materials

Update materials.dm

2019-04-13 22:55:08 -04:00

media

Conflict Resolution Part 2

2019-03-27 15:51:05 -04:00

metric

…

mining

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

mob

Merge pull request #1 from Yawn-Wider/map

2019-04-14 15:41:12 -04:00

multiz

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

nano

Ports Chemistry/NanoUI Fixes Early

2019-04-08 16:15:29 -04:00

nifsoft

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

organs

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

overmap

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

paperwork

Merge branch 'master' into map

2019-04-14 20:07:12 +01:00

persistence

…

Phorochemistry

UI fixes

2019-04-14 19:56:11 +01:00

planet

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

power

Merge pull request #1 from Yawn-Wider/map

2019-04-14 15:41:12 -04:00

projectiles

Merge branch 'map' into RadiantMaster

2019-04-14 18:27:05 +01:00

random_map

Base features for Precursotech and Anomalotech Expansion

2019-04-13 22:44:52 -04:00

reagents

Merge branch 'master' into map

2019-04-14 20:07:12 +01:00

recycling

Merge pull request #6073 from Heroman3003/conveyor-boogalo

2019-04-14 02:25:14 -04:00

research

Merge pull request #5038 from VOREStation/upstream-merge-6028

2019-04-14 02:29:25 -04:00

resleeving

Allows ghosts with backups to ping medical again

2019-04-09 10:28:55 +10:00

rogueminer_vr

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

scripting

…

security levels

Adds New Alert Levels (#6019)

2019-03-30 18:29:12 -04:00

shieldgen

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

shuttles

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

spells

[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work

2019-03-27 22:02:07 -04:00

surgery

Belt-Worn RIGs (#6002)

2019-03-30 03:20:41 -04:00

tables

Conflict Resolution

2019-03-28 19:41:16 -04:00

telesci

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

tension

…

tooltip

…

turbolift

Fixes hud-zshadow bug

2019-04-07 07:52:19 +10:00

vehicles

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

ventcrawl

…

virus2

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

vore

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

xenoarcheaology

Merge branch 'master' into map

2019-04-14 20:07:12 +01:00

xenobio

Merge pull request #4643 from VOREStation/upstream-merge-5790

2019-03-28 15:48:47 -04:00

xenobio2

…

xgm

…