Nadyr 1dc06fd9e6 Merge branch 'master' into upstream-merge-11928

2021-12-05 12:50:21 -05:00

..

antagonist

Upstream-11408

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

area

Merge pull request #11746 from Very-Soft/holodeck!!!

2021-11-01 22:03:46 +00:00

dna

Fix digitigrade vars being set to null, made some comments as to type int over bool

2021-09-12 19:08:58 +02:00

gamemodes

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

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

jobs

reverse vorespawn

2021-11-25 19:49:28 +13:00

machinery

Merge pull request #3237 from CHOMPStation2/upstream-merge-11905

2021-12-05 12:07:07 -05:00

magic

…

mecha

adds double upstreams too

2021-10-22 17:23:07 +03:00

objects

Merge branch 'master' into upstream-merge-11928

2021-12-05 12:50:21 -05:00

turfs

Offmap Tweaks

2021-12-03 07:14:17 +00:00

vehicles

…

verbs

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

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

atoms_movable_vr.dm

…

atoms_movable.dm

Adds a pref toggle for autotransferability

2021-11-24 17:34:43 +02:00

atoms.dm

Merge pull request #11533 from VOREStation/upstream-merge-8236

2021-10-22 17:52:40 +00:00

base_turf.dm

…

json.dm

…

periodic_news.dm

Optimize a couple things

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

response_team_vr.dm

…

response_team.dm

…

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

…

world.dm

Fix 4 more relative paths + error

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