Skip to content

Commit 8f4be2c

Browse files
committed
Update
1 parent 99cc704 commit 8f4be2c

File tree

206 files changed

+45502
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+45502
-1
lines changed

GarrysMod/garrysmod/data/other/packs/DGrouse/info.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212

1313
### 1. dg-collection
1414

15+
- Date (dd-mm-yyyy): 06-05-2017
1516
- Source: https://dg-collection.weebly.com/expression-2.html
1617
- Source Accessed (dd-mm-yyyy): 17-08-2025
18+
- Pack Type: expression2

GarrysMod/garrysmod/data/other/packs/Darkmessenger84/info.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@
1616
- Date (dd-mm-yyyy): 08-07-2011
1717
- Source: https://pastebin.com/u/darkmessenger84
1818
- Source Accessed (dd-mm-yyyy): 01-07-2025
19+
- Pack Type: expression2

GarrysMod/garrysmod/data/other/packs/Derpius/info.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
- Date (dd-mm-yyyy): 17-02-2022
1818
- Source: https://github.com/Derpius/public-starfalls
1919
- Source Accessed (dd-mm-yyyy): 23-08-2025
20+
- Pack Type: starfall

GarrysMod/garrysmod/data/other/packs/Divran/info.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
- Date (dd-mm-yyyy): 20-11-2009
1616
- Source: https://web.archive.org/web/20160510070918/http://www.wiremod.com:80/forum/finished-contraptions/16081-divrans-e2-contraptions-thread.html
1717
- Source Accessed (dd-mm-yyyy): 30-08-2025
18+
- Pack Type: expression2
1819

1920
### 2. e2imageloader-master
2021

2122
- Description: e2 image loader
2223
- Date (dd-mm-yyyy): 16-06-2021
2324
- Source: https://github.com/Divran/e2imageloader
2425
- Source Accessed (dd-mm-yyyy): 06-09-2025
26+
- Pack Type: expression2, php

GarrysMod/garrysmod/data/other/packs/EnyxRB/info.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
- Date (dd-mm-yyyy): 11-08-2018
1818
- Source: https://github.com/EnyxRB/CodeRelease
1919
- Source Accessed (dd-mm-yyyy): 05-06-2025
20+
- Pack Type: expression2, lua

GarrysMod/garrysmod/data/other/packs/FailCake/info.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@
1818
- Source: https://www.dropbox.com/scl/fi/apld9uimpv222f1e3rriq/E2-600-PACK.rar?e=1&rlkey=hxmfler3tzw9pox624tiyu97u
1919
- Source: https://www.youtube.com/watch?v=MM7QJr6WSP0
2020
- Source Accessed (dd-mm-yyyy): 06-06-2025
21+
- Pack Type: expression2

GarrysMod/garrysmod/data/other/packs/Fasteroid/info.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@
1818
- Date (dd-mm-yyyy): 17-05-2025
1919
- Source: https://github.com/Fasteroid/expression2-public
2020
- Source Accessed (dd-mm-yyyy): 05-06-2025
21+
- Pack Type: expression2
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
--@name Array Merge
2+
--@server
3+
4+
wire.adjustPorts({
5+
Array1 = "array",
6+
Array2 = "array",
7+
Array3 = "array",
8+
Complete1 = "number",
9+
Complete2 = "number",
10+
Complete3 = "number",
11+
}, {
12+
Props = "array",
13+
})
14+
15+
-- Hook to check inputs every frame
16+
hook.add("think", "CheckAndMerge", function()
17+
-- Read wire inputs
18+
local A1 = wire.ports.Array1 or {}
19+
local A2 = wire.ports.Array2 or {}
20+
local A3 = wire.ports.Array3 or {}
21+
22+
-- Read completion flags
23+
local Complete1 = wire.ports.Complete1 or 0
24+
local Complete2 = wire.ports.Complete2 or 0
25+
local Complete3 = wire.ports.Complete3 or 0
26+
27+
-- Only merge and update Props when all complete flags are 1
28+
if Complete1 == 1 and Complete2 == 1 and Complete3 == 1 then
29+
local Merged = {}
30+
31+
-- Merge the arrays
32+
for k, v in ipairs(A1) do
33+
table.insert(Merged, v)
34+
end
35+
for k, v in ipairs(A2) do
36+
table.insert(Merged, v)
37+
end
38+
for k, v in ipairs(A3) do
39+
table.insert(Merged, v)
40+
end
41+
42+
-- Update wire output
43+
wire.ports.Props = Merged
44+
45+
-- Remove the hook since we only need to merge **once**
46+
hook.remove("think", "CheckAndMerge")
47+
end
48+
end)

0 commit comments

Comments
 (0)