Unknown 692d8265ba Something reverted one of my changes

2019-03-31 12:45:36 -04:00

..

admin

Merge branch 'master' into upstream-merge-5905

2019-03-28 14:55:54 -04:00

ai

Merge pull request #4875 from Sebbe9123/Mobspeedtweak

2019-03-29 09:36:04 -04:00

alarm

…

artifice

…

assembly

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

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

awaymissions

…

blob

Rewrites Atmospherics

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

blob2

Rewrites Atmospherics

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

busy_space

…

busy_space_vr

…

client

Merge pull request #4867 from Novacat/nova-survival

2019-03-30 09:58:29 -04:00

clothing

Merge pull request #4885 from VOREStation/upstream-merge-5999

2019-03-30 04:37:12 -04:00

customitems

…

detectivework

[READY]Makes a bunch of processes subsystems instead

2019-03-27 16:03:51 -04:00

economy

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

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

entopics_vr

…

error_handler

…

events

Conflict Resolution

2019-03-27 16:36:41 -04:00

examine

Adds pressure protection bounds to clothing.

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

ext_scripts

…

flufftext

…

food

Runtimes plz

2019-03-29 08:42:06 -04: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

…

genetics

…

ghosttrap

…

holodeck

Rewrites Atmospherics

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

holomap

…

hydroponics

Rewrites Atmospherics

2019-03-28 19:25:11 -04: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

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

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

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

media

Conflict Resolution Part 2

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

metric

…

mining

Merge pull request #4849 from VOREStation/upstream-merge-5978

2019-03-28 22:01:36 -04:00

mob

Something reverted one of my changes

2019-03-31 12:45:36 -04:00

multiz

Merge pull request #4739 from VOREStation/upstream-merge-5924

2019-03-28 17:55:27 -04:00

nano

Merge pull request #4775 from VOREStation/upstream-merge-5961

2019-03-28 20:24:38 -04:00

nifsoft

Merge pull request #4647 from Novacat/nova-ert

2019-03-29 10:12:01 -04:00

organs

Merge pull request #4843 from VOREStation/upstream-merge-5993

2019-03-28 22:00:55 -04:00

overmap

Merge pull request #4684 from VOREStation/upstream-merge-5814

2019-03-27 17:46:31 -04:00

paperwork

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

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

persistence

…

planet

Ports Weather Improvements

2019-03-29 16:32:07 -04:00

power

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

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

projectiles

Merge pull request #4849 from VOREStation/upstream-merge-5978

2019-03-28 22:01:36 -04:00

random_map

…

reagents

Buffs Xenochimera Protein

2019-03-29 09:39:30 -04:00

recycling

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

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

research

Removes Phase weapons from R&D

2019-03-29 23:07:50 -04:00

resleeving

Merge pull request #4837 from Heroman3003/borg-sleever-interaction

2019-03-28 22:00:14 -04:00

rogueminer_vr

Conflict Resolution

2019-03-27 16:36:41 -04:00

scripting

…

security levels

…

shieldgen

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

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

shuttles

[READY]Makes a bunch of processes subsystems instead

2019-03-27 16:03:51 -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

Merge pull request #4684 from VOREStation/upstream-merge-5814

2019-03-27 17:46:31 -04:00

tension

…

tooltip

…

turbolift

Merge pull request #4872 from VOREStation/upstream-merge-6018

2019-03-28 22:10:05 -04:00

vehicles

…

ventcrawl

…

virus2

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

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

vore

Merge pull request #4858 from Heroman3003/uncontamine

2019-03-28 22:12:38 -04:00

xenoarcheaology

Merge pull request #4684 from VOREStation/upstream-merge-5814

2019-03-27 17:46:31 -04:00

xenobio

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

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

xenobio2

…

xgm

…