Hawk-v3 0c102792c3 Merge branch 'master' into master

2019-09-19 23:00:15 +01:00

..

admin

Merge remote-tracking branch 'upstream/release'

2019-09-16 14:57:39 +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

…

blob

Fixes merge errors

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

blob2

Emitters Hit Blob Again (#6310)

2019-07-19 16:13:10 -04:00

busy_space

…

busy_space_vr

delete KHI

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

catalogue

delete KHI

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

client

Fix for wrong object path (not related to the issue at hand just might want to get the item you selected)

2019-09-19 02:01:05 +02:00

clothing

Merge remote-tracking branch 'upstream/master'

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

customitems

…

detectivework

…

DMAPI

…

economy

…

entopics_vr

…

error_handler

…

events

Also restricts spam

2019-09-04 04:27:07 +10: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-01 19:02:01 +01:00

gamemaster

Also restricts spam

2019-09-04 04:27:07 +10: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 #6419 from Mechoid/PrinterHREF

2019-08-26 23:33:03 -04:00

interserver shipping

…

library

Adds NOCONDUCT to Some Items

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

lighting

An assortment of Lighting Stuff

2019-06-18 19:57:40 -04:00

lore_codex

Merge pull request #6234 from Cerebulon/newsJune19

2019-06-28 20:12:47 -04:00

maps

…

materials

Ports Sofas from CitRP

2019-09-10 00:15:07 -05:00

media

…

metric

Merge pull request #6362 from Mechoid/EventTweaks

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

mining

Merge branch 'master' into master

2019-09-19 23:00:15 +01:00

mob

Merge remote-tracking branch 'upstream/master'

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

modular_computers

Fixes bugs with suit sensors and tether levels

2019-08-17 09:24:57 +10:00

multi-tile

Multi-Tile Objects, Multi-Tile Hovershuttle

2019-07-01 20:43:53 -04:00

multiz

…

nano

…

nifsoft

deletes more KHI, reworks some wording and other corps

2019-09-14 15:13:11 -04:00

organs

Merge remote-tracking branch 'upstream/master'

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

overmap

…

paperwork

…

persistence

…

Phorochemistry

…

planet

…

power

Merge remote-tracking branch 'upstream/master'

2019-09-08 18:55:37 +01:00

projectiles

delete KHI

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

random_map

…

reagents

Merge remote-tracking branch 'upstream/release'

2019-09-14 17:10:36 +01:00

recycling

Okay that should be all

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

research

Update medical.dm

2019-09-18 20:14:50 -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

…

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

Merge pull request #6270 from Heroman3003/inviscrawl

2019-07-06 21:35:17 -04:00

virus2

Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG

2019-05-13 22:57:23 -04:00

vore

Merge remote-tracking branch 'upstream/master'

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

xenoarcheaology

Merge remote-tracking branch 'upstream/master'

2019-09-01 19:02:01 +01:00

xenobio

Makes Heavy-Duty Cell Chargers Constructable

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

xenobio2

…

xgm

…