Nadyr 59090266bd Merge pull request #3717 from CHOMPStation2/upstream-merge-12286 ...

[MIRROR] Merge Fixes for 8222

2022-02-19 20:51:16 -05:00

..

antagonist

…

area

Adds soundproofing to dorms

2021-12-26 14:36:54 +02:00

dna

Merge pull request #12210 from VOREStation/upstream-merge-8200

2022-02-13 21:48:53 +00:00

gamemodes

Renames Engineer, new alt-titles for Stellar Delight

2021-12-12 08:46:53 +00:00

jobs

Merge pull request #3654 from CHOMPStation2/upstream-merge-12192

2022-02-13 01:19:20 -07:00

machinery

Donk Co. Toys

2022-02-19 04:27:50 +00:00

magic

…

mecha

Update mecha_construction_paths.dm

2022-02-08 23:34:16 -08:00

objects

Merge pull request #3717 from CHOMPStation2/upstream-merge-12286

2022-02-19 20:51:16 -05:00

turfs

powder that makes you say yes

2022-02-19 20:29:45 -05: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

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

…

json.dm

…

periodic_news.dm

…

response_team_vr.dm

…

response_team.dm

…

shuttle_engines.dm

…

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