NovacatandGitHub e2afa12e38 Merge pull request #4841 from VOREStation/upstream-merge-5992 ...

[MIRROR] Departmental Turtlenecks

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

..

admin

Merge branch 'master' into upstream-merge-5905

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

ai

Fixes blast door issue, and slimesky being considered unjustified.

2019-03-28 20:35:17 -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 #4841 from VOREStation/upstream-merge-5992

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

clothing

Merge pull request #4841 from VOREStation/upstream-merge-5992

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

customitems

…

detectivework

…

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

…

examine

…

ext_scripts

…

flufftext

…

food

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

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

gamemaster

…

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

…

metric

…

mining

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

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

mob

Removes conductive flags from VR stuff

2019-03-28 21:45:38 -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

…

organs

Merge pull request #4783 from VOREStation/upstream-merge-5942

2019-03-28 21:27:19 -04:00

overmap

…

paperwork

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

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

persistence

…

planet

…

power

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

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

projectiles

Removes conductive flags from VR stuff

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

random_map

…

reagents

Tweaks Daxons

2019-03-28 20:29:05 -04:00

recycling

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

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

research

Changes (R&D made) Saber SMG to Advanced SMG

2019-03-28 18:22:23 -04:00

resleeving

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

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

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

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

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

shuttles

…

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

…

tables

Conflict Resolution

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

telesci

…

tension

…

tooltip

…

turbolift

[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

vehicles

…

ventcrawl

…

virus2

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

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

vore

Removes conductive flags from VR stuff

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

xenoarcheaology

…

xenobio

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

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

xenobio2

…

xgm

…