Aronai Sieyes 8bcd31c91e Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

..

admin

Fixes #10920

2021-07-05 19:35:38 -04:00

ai

…

alarm

…

artifice

…

assembly

Use material defines more

2021-07-03 18:18:05 -04:00

asset_cache

…

awaymissions

…

blob

…

blob2

…

busy_space

…

busy_space_vr

…

catalogue

…

client

Merge pull request #10847 from MarinaGryphon/nailpolish

2021-07-05 19:55:48 -04:00

clothing

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

compass

…

customitems

…

detectivework

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

economy

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

emotes

…

entopics_vr

…

error_handler

…

events

…

examine

…

ext_scripts

…

fishing

…

flufftext

…

food

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

gamemaster

…

games

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

genetics

…

ghosttrap

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

holodeck

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

holomap

Fix a mapper runtime

2021-07-05 18:17:23 -04:00

hydroponics

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

icon generation

…

identification

…

instruments

…

integrated_electronics

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

library

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

lighting

…

looking_glass

…

lore_codex

…

makeup

Code review and tweaks

2021-07-04 12:05:51 -05:00

maps

Fixes #10874, Fixes #10871

2021-07-04 17:50:20 -04:00

materials

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

media

…

metric

…

mining

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

mob

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

modular_computers

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

multi-tile

…

multiz

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

nano

…

news

…

nifsoft

…

organs

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

overmap

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

paperwork

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

pda

…

persistence

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

planet

…

power

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

projectiles

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

radiation

…

random_map

…

reagents

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

recycling

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

research

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

resleeving

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

Merge pull request #10908 from MarinaGryphon/spannening

2021-07-05 16:30:03 -04:00

shuttles

…

spells

…

surgery

…

tables

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

telesci

…

tension

…

tgs

…

tgui

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

tooltip

…

turbolift

Merge pull request #10908 from MarinaGryphon/spannening

2021-07-05 16:30:03 -04:00

vchat

Add discord button to top

2021-07-02 18:22:56 -04:00

vehicles

…

ventcrawl

…

virus2

…

vore

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

webhooks

…

xenoarcheaology

Merge branch 'master' into Arokha/matdefs

2021-07-07 14:29:30 -04:00

xenobio

first pass (emotification, some \the -> \The)

2021-07-05 09:42:48 -05:00

xenobio2

…

xgm

…