Nadyr 8247ddd9a7 Merge pull request #4915 from xnqm8h/circuit-updates ...

Allows interaction with mounted circuit assemblies, FIXES #4647

2022-09-19 00:27:51 -04:00

..

antagonist

Merge branch 'master' into upstream-merge-13122

2022-06-22 22:37:44 -04:00

area

Merge pull request #13742 from Heroman3003/moreruntimes

2022-09-18 09:35:35 +00:00

dna

Merge pull request #13669 from Heroman3003/runtimes2

2022-09-06 19:42:35 +00:00

gamemodes

Mutes some adminlog spam

2022-08-12 21:39:10 -04:00

jobs

Fixes some adminverb runtimes

2022-09-15 13:52:33 +00:00

machinery

Add charger penalty to biofuel processors

2022-09-18 09:36:54 +00:00

magic

TGUI Input Conversions

2022-06-19 03:59:14 +00:00

mecha

Merge pull request #13468 from VOREStation/upstream-merge-8675

2022-08-14 05:39:06 +00:00

objects

Merge pull request #4915 from xnqm8h/circuit-updates

2022-09-19 00:27:51 -04:00

turfs

Merge pull request #4541 from CHOMPStation2/upstream-merge-12911

2022-07-13 19:44:05 -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

…

atoms_movable.dm

7914 branch fix

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

atoms.dm

Fixes in-chat icons being broken in oldchat

2022-07-20 17:24:27 +00:00

base_turf.dm

TGUI Input Conversions

2022-06-19 03:59:14 +00:00

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

Merge pull request #13616 from Heroman3003/soundchange

2022-08-31 07:38:20 +00:00

trader_visit_vr.dm

…

trader_visit.dm

…

world.dm

Merge pull request #4701 from CHOMPStation2/upstream-merge-13488

2022-08-28 17:59:26 -04:00