Raeschen 74765cf864 fix merge conflicts

2023-06-19 12:32:36 +02:00

..

admin

Spell Fixes

2023-06-19 04:40:45 +00:00

ai

Spell Fixes

2023-06-19 04:40:45 +00:00

alarm

…

artifice

More 515 Compatibility

2023-06-05 21:21:35 +00:00

assembly

More 515 Compatibility

2023-06-05 21:21:35 +00:00

asset_cache

…

awaymissions

…

blob

…

blob2

Spell Fixes

2023-06-19 04:40:45 +00:00

busy_space

…

busy_space_vr

Spell Fixes

2023-06-19 04:40:45 +00:00

busy_space_yw

…

casino

Spell Fixes

2023-06-19 04:40:45 +00:00

catalogue

fix merge conflicts

2023-06-19 12:32:36 +02:00

client

Spell Fixes

2023-06-19 04:40:45 +00:00

clothing

Spell Fixes

2023-06-19 04:40:45 +00:00

compass

…

customitems

…

detectivework

…

DMAPI

…

economy

Spell Fixes

2023-06-19 04:40:45 +00:00

emotes

powder that makes you say yes

2023-04-25 20:34:32 -04:00

entopics_vr

…

error_handler

…

events

Spell Fixes

2023-06-19 04:40:45 +00:00

examine

Spell Fixes

2023-06-19 04:40:45 +00:00

ext_scripts

More 515 Compatibility

2023-06-05 21:21:35 +00:00

fireworks

…

fishing

Merge pull request #14912 from Youtubeboy139/Thaler-Change

2023-06-01 20:36:54 +00:00

flufftext

…

food

fix merge conflicts

2023-06-19 12:32:36 +02:00

gamemaster

Merge branch 'master' into upstream-merge-14976

2023-06-17 14:47:37 +02:00

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

Merge branch 'master' into upstream-merge-14957

2023-06-09 22:27:00 -04:00

icon generation

…

identification

…

instruments

Spell Fixes

2023-06-19 04:40:45 +00:00

integrated_electronics

fix merge conflicts

2023-06-19 12:32:36 +02:00

interserver shipping

…

keybindings

…

library

Spell Fixes

2023-06-19 04:40:45 +00:00

lighting

Lighting subsystem update

2023-06-07 17:40:59 +02:00

looking_glass

…

lore_codex

fix merge conflicts

2023-06-19 12:32:36 +02:00

makeup

…

maps

…

materials

…

media

…

mentor

…

metric

…

mining

Spell Fixes

2023-06-19 04:40:45 +00:00

mob

Spell Fixes

2023-06-19 04:40:45 +00:00

modular_computers

Spell Fixes

2023-06-19 04:40:45 +00:00

multi-tile

…

multiz

…

nano

…

news

…

nifsoft

Merge branch 'master' into upstream-merge-14976

2023-06-17 14:47:37 +02:00

organs

Merge pull request #14921 from Seris02/mirrortransparent

2023-05-31 08:38:10 +00:00

overmap

Merge branch 'master' into upstream-merge-14976

2023-06-17 14:47:37 +02:00

paperwork

More 515 Compatibility

2023-06-05 21:21:35 +00:00

pda

…

persistence

…

Phorochemistry

…

planet

A few nullchecks

2023-06-07 20:20:47 +02:00

player_tips_vr

…

power

Spell Fixes

2023-06-19 04:40:45 +00:00

projectiles

Spell Fixes

2023-06-19 04:40:45 +00:00

radiation

…

random_map

More 515 Compatibility

2023-06-05 21:21:35 +00:00

reagents

Spell Fixes

2023-06-19 04:40:45 +00:00

recycling

Merge pull request #15029 from Runa-Dacino/disposals

2023-06-16 06:30:29 +00:00

research

Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds

2023-06-18 16:27:37 +02:00

resleeving

Spell Fixes

2023-06-19 04:40:45 +00:00

rogueminer_vr

…

scripting

More 515 Compatibility

2023-06-05 21:21:35 +00:00

security levels

…

shieldgen

Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds

2023-06-18 16:27:37 +02:00

shuttles

More 515 Compatibility

2023-06-05 21:21:35 +00:00

spells

…

stockmarket

…

surgery

Update organs_internal.dm

2023-05-10 22:16:23 +12:00

tables

…

telesci

…

tension

fix merge conflicts

2023-06-17 13:38:08 +02:00

tgs

fix merge conflicts

2023-06-17 15:57:46 +02:00

tgui

Merge branch 'master' into upstream-merge-14976

2023-06-17 14:47:37 +02:00

tgui_input

TextBox Shift-Enter (Multilines)

2023-05-19 22:49:46 +02:00

tools

…

tooltip

More 515 Compatibility

2023-06-05 21:21:35 +00:00

turbolift

…

vchat

More 515 Compatibility

2023-06-05 21:21:35 +00:00

vehicles

…

ventcrawl

…

virus2

…

vore

Spell Fixes

2023-06-19 04:40:45 +00:00

webhooks

More 515 Compatibility

2023-06-05 21:21:35 +00:00

whitelist

…

xenoarcheaology

…

xenobio

…

xenobio2

…

xgm

…