Nadyr fd9fe65610 Merge branch 'master' into upstream-merge-13063

2022-06-11 17:45:04 -04:00

..

antagonist

Upstream-11408

2021-08-24 21:09:43 -07:00

area

Merge pull request #12998 from ItsSelis/selis-patch-10

2022-05-22 18:23:48 +00:00

dna

Merge pull request #12896 from FartMaster69420/dna-patch

2022-05-08 09:49:09 +00:00

gamemodes

Merge pull request #3064 from Rykka-Stormheart/shep-dev-ambience-3.0

2022-05-18 21:42:59 -07:00

jobs

Merge pull request #13035 from lm40/nogods

2022-06-04 16:38:53 +00:00

machinery

Fix Telecomms machine browser and log browser.

2022-06-04 16:20:07 +00:00

magic

The One Where I Port Modals

2021-06-30 19:29:34 +00:00

mecha

More Upgrade Modules for Borgs

2022-03-12 20:44:57 +00:00

objects

Merge branch 'master' into upstream-merge-13063

2022-06-11 17:45:04 -04:00

turfs

powder that makes you say yes

2022-05-27 15:56:27 -04:00

vehicles

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

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

verbs

Merge pull request #11615 from VOREStation/upstream-merge-8311

2021-10-28 00:49:05 +00:00

atoms_movable_vr.dm

Port current /tg/ lighting system

2021-06-18 04:23:09 +00:00

atoms_movable.dm

7914 branch fix

2022-02-19 21:25:16 +00:00

atoms.dm

7914 branch fix

2022-02-19 21:25:16 +00:00

base_turf.dm

The One Where I Port Modals

2021-06-30 19:29:34 +00:00

json.dm

[MIRROR] Linter diagnostics + bans non-var relative pathing

2021-06-22 22:17:02 +00:00

periodic_news.dm

Optimize a couple things

2021-07-20 21:30:20 +00:00

response_team_vr.dm

…

response_team.dm

The One Where I Port Modals

2021-06-30 19:29:34 +00:00

shuttle_engines.dm

Upstream-11421

2021-08-24 21:10:20 -07:00

skincmd.dm

…

socket_talk.dm

…

sound.dm

Reformats preferences to take a list, adds belch pref to emote

2021-09-24 15:14:13 -07:00

trader_visit_vr.dm

…

trader_visit.dm

The One Where I Port Modals

2021-06-30 19:29:34 +00:00

world.dm

Fix 4 more relative paths + error

2021-09-16 09:54:43 -07:00