Hawk-v3 7cde34bfb3 Merge branch 'master' into master

2019-10-08 15:27:01 +01:00

..

admin

Merge from Vorestation

2019-09-29 21:53:09 +01:00

ai

Fixes slimes not resetting back to help intent after attacking

2019-09-04 10:12:54 +10:00

alarm

…

artifice

Exploration Expansion 1: Or, How I Learned To Love The Tree

2019-08-21 17:23:07 -04:00

assembly

…

awaymissions

Fixes issue with gateway landmarks

2019-10-02 01:35:34 -04:00

blob

Fixes merge errors

2019-07-28 07:08:18 +10:00

blob2

Blind port of Bay Radiation Subsystem

2019-10-06 03:30:36 -04:00

busy_space

…

busy_space_vr

Clearing out some more.

2019-09-23 21:40:26 +01:00

catalogue

delete KHI

2019-09-14 13:17:20 -04:00

client

Merge remote-tracking branch 'upstream/master'

2019-10-08 15:14:36 +01:00

clothing

Merge remote-tracking branch 'upstream/master'

2019-10-08 15:14:36 +01:00

customitems

…

detectivework

…

DMAPI

…

economy

…

entopics_vr

…

error_handler

…

events

Blind port of Bay Radiation Subsystem

2019-10-06 03:30:36 -04:00

examine

…

ext_scripts

…

fishing

More emergency fixes

2019-08-20 11:49:09 +10:00

flufftext

…

food

Merge remote-tracking branch 'upstream/master'

2019-09-23 20:55:18 +01:00

gamemaster

Blind port of Bay Radiation Subsystem

2019-10-06 03:30:36 -04:00

games

…

genetics

…

ghosttrap

…

holodeck

Early Polaris Ports

2019-08-30 23:55:58 -04:00

holomap

…

hydroponics

Merge remote-tracking branch 'upstream/master'

2019-09-19 19:54:34 +01:00

icon generation

…

identification

…

integrated_electronics

Merge pull request #6469 from Verkister/patch-23

2019-10-01 02:38:09 -04:00

interserver shipping

…

library

Adds NOCONDUCT to Some Items

2019-08-08 16:07:50 -04:00

lighting

…

lore_codex

Merge pull request #6474 from Cerebulon/newsoct19

2019-10-06 03:33:55 -04:00

maps

…

materials

Blind port of Bay Radiation Subsystem

2019-10-06 03:30:36 -04:00

media

…

metric

Merge pull request #6362 from Mechoid/EventTweaks

2019-08-06 14:54:10 -04:00

mining

Merge remote-tracking branch 'upstream/master'

2019-10-08 15:14:36 +01:00

mob

Merge remote-tracking branch 'upstream/master'

2019-10-08 15:14:36 +01:00

modular_computers

Ill maintain this I sware!

2019-10-05 21:43:09 -04:00

multi-tile

…

multiz

Map Updates.

2019-10-04 01:52:44 +01:00

nano

…

nifsoft

Merge from Vorestation

2019-09-29 21:53:09 +01:00

organs

Merge remote-tracking branch 'upstream/master'

2019-08-22 21:32:01 +01:00

overmap

…

paperwork

YW edit properly

2019-10-01 17:13:56 -04:00

persistence

…

Phorochemistry

…

planet

Merge remote-tracking branch 'upstream/master'

2019-10-08 15:14:36 +01:00

power

Merge branch 'master' into master

2019-10-08 15:27:01 +01:00

projectiles

Merge remote-tracking branch 'upstream/master'

2019-10-08 15:14:36 +01:00

radiation

Conflict Resolution

2019-10-06 13:12:11 -04:00

random_map

…

reagents

Merge remote-tracking branch 'upstream/master'

2019-10-08 15:14:36 +01:00

recycling

Okay that should be all

2019-08-15 23:06:26 +08:00

research

Suggestions

2019-10-05 22:20:05 -04:00

resleeving

oi-vey

2019-09-17 15:10:49 -04:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

Combat Mechs Can Punch More Things (#6303)

2019-07-24 17:00:24 -04:00

shuttles

…

spells

…

surgery

Removes A Few Alternate Tool Options For 2 Surgical Operations (#6312)

2019-08-04 04:17:40 -04:00

tables

Exploration Expansion 1: Or, How I Learned To Love The Tree

2019-08-21 17:23:07 -04:00

telesci

Sorts vorestation-only rnd recipies

2019-09-26 18:41:54 +10:00

tension

Exploration Expansion 1: Or, How I Learned To Love The Tree

2019-08-21 17:23:07 -04:00

tooltip

…

turbolift

…

vehicles

Merge remote-tracking branch 'upstream/master'

2019-08-22 21:32:01 +01:00

ventcrawl

…

virus2

…

vore

Map Updates.

2019-10-04 01:52:44 +01:00

xenoarcheaology

Merge remote-tracking branch 'upstream/master'

2019-10-08 15:14:36 +01:00

xenobio

Makes Heavy-Duty Cell Chargers Constructable

2019-07-30 20:18:33 -04:00

xenobio2

…

xgm

…