Nadyr 38b67b77c1 Merge pull request #2593 from CHOMPStationBot/upstream-merge-11136 ...

[MIRROR] Prevent synths from taking temp traits

2021-07-19 19:56:08 -04:00

..

admin

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

ai

…

alarm

…

artifice

Fixes a bunch of bools missed in #11100

2021-07-16 21:12:20 +00:00

assembly

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

asset_cache

Move like every clothing icon file

2021-07-10 16:23:23 +00:00

awaymissions

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

blob

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

blob2

…

busy_space

…

busy_space_vr

Add a lot of clothes/armor/suits/spacesuits/rigs

2021-07-14 22:44:11 -04:00

busy_space_yw

…

catalogue

…

client

Merge pull request #2593 from CHOMPStationBot/upstream-merge-11136

2021-07-19 19:56:08 -04:00

clothing

Merge pull request #2589 from CHOMPStationBot/upstream-merge-11146

2021-07-19 19:55:12 -04:00

compass

…

customitems

Ports new Bay SolGov suits as Commonwealth suits

2021-07-15 19:29:34 -04:00

detectivework

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

DMAPI

…

economy

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

emotes

…

entopics_vr

…

error_handler

…

events

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

examine

…

ext_scripts

…

fishing

…

flufftext

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

food

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

holomap

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

hydroponics

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

icon generation

…

identification

…

instruments

…

integrated_electronics

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

interserver shipping

…

keybindings

…

library

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

lighting

Merge branch 'master' into upstream-merge-10961

2021-07-08 00:09:21 -04:00

looking_glass

Fixes a bunch of bools missed in #11100

2021-07-16 21:12:20 +00:00

lore_codex

…

makeup

…

maps

Fixes a bunch of bools missed in #11100

2021-07-16 21:12:20 +00:00

materials

Fixes a bunch of bools missed in #11100

2021-07-16 21:12:20 +00:00

media

…

metric

…

mining

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

mob

Merge pull request #11136 from VOREStation/Arokha/synthtemp

2021-07-19 21:17:22 +00:00

modular_computers

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

multi-tile

…

multiz

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

nano

…

news

…

nifsoft

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

organs

Merge pull request #11104 from Verkister/patch-72

2021-07-16 17:41:19 +00:00

overmap

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

paperwork

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

pda

…

persistence

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

Phorochemistry

…

planet

Merge branch 'master' into upstream-merge-10969

2021-07-09 23:49:21 -04:00

power

Merge pull request #11132 from VOREStation/Fixes/11129

2021-07-18 19:14:51 +00:00

projectiles

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

radiation

…

random_map

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

reagents

Merge pull request #11147 from VOREStation/Arokha/supermatter

2021-07-19 21:16:49 +00:00

recycling

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

research

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

resleeving

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

rogueminer_vr

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

scripting

…

security levels

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

shieldgen

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

shuttles

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

spells

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

surgery

Fixes a bunch of bools missed in #11100

2021-07-16 21:12:20 +00:00

tables

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

telesci

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

tension

…

tgs

…

tgui

Merge pull request #11121 from KillianKirilenko/kk-fixes2

2021-07-17 14:24:27 +00:00

tooltip

…

turbolift

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

vchat

…

vehicles

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

ventcrawl

Merge pull request #11088 from VOREStation/Fixes/11082

2021-07-15 19:02:53 +00:00

virus2

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

vore

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

webhooks

…

xenoarcheaology

Merge branch 'master' into upstream-merge-11110

2021-07-16 19:09:43 -04:00

xenobio

…

xenobio2

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

xgm

…