Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cog power setup fix #34188

Merged
merged 56 commits into from
Jan 19, 2025
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
914e6d4
many changes
TytosB Dec 3, 2024
4d9b760
contentingregrationtests
TytosB Dec 3, 2024
7930067
serialized invalid removed
TytosB Dec 3, 2024
18ff974
blank
TytosB Dec 3, 2024
392037f
Merge branch 'space-wizards:master' into looper2
TytosB Dec 4, 2024
871cae7
Merge branch 'space-wizards:master' into looper2
TytosB Dec 7, 2024
84a3be9
"Changes and fixes as suggested"
TytosB Dec 7, 2024
d6cb258
Merge branch 'looper2' of https://github.com/TytosB/space-station-14-…
TytosB Dec 7, 2024
cd4fef2
Merge branch 'space-wizards:master' into looper2
TytosB Dec 7, 2024
99f0704
blank
TytosB Dec 7, 2024
dd31772
Merge branch 'looper2' of https://github.com/TytosB/space-station-14-…
TytosB Dec 7, 2024
0edefbe
Merge branch 'space-wizards:master' into looper2
TytosB Dec 7, 2024
157dc3c
blank
TytosB Dec 7, 2024
7b44c05
Merge branch 'space-wizards:master' into looper2
TytosB Dec 10, 2024
5ba1076
added desk bells
TytosB Dec 10, 2024
4c77192
Merge branch 'looper2' of https://github.com/TytosB/space-station-14-…
TytosB Dec 10, 2024
98f1bc6
Merge branch 'space-wizards:master' into looper2
TytosB Dec 15, 2024
311f967
engi rework rework rework
TytosB Dec 16, 2024
df2666e
pusMerge branch 'looper2' of https://github.com/TytosB/space-station-…
TytosB Dec 16, 2024
aa48321
Merge branch 'space-wizards:master' into looper2
TytosB Dec 16, 2024
c61acbd
added gate to content integration
TytosB Dec 17, 2024
b42d302
Merge branch 'master' into looper2
TytosB Dec 17, 2024
09f9861
Merge branch 'space-wizards:master' into looper2
TytosB Dec 17, 2024
76d06d4
Merge branch 'space-wizards:master' into looper2
TytosB Dec 17, 2024
9c86abb
tweaks
TytosB Dec 17, 2024
b800a86
Merge branch 'space-wizards:master' into looper2
TytosB Dec 18, 2024
3d49cc5
aaa
TytosB Dec 18, 2024
c8cf1e1
bbb
TytosB Dec 18, 2024
392ac21
Merge branch 'space-wizards:master' into looper2
TytosB Dec 18, 2024
7e0cc6c
Merge branch 'space-wizards:master' into looper2
TytosB Dec 18, 2024
7e99986
added holopads
TytosB Dec 18, 2024
089c412
Merge branch 'space-wizards:master' into looper2
TytosB Dec 19, 2024
12c6890
ccc
TytosB Dec 19, 2024
d8f82f9
Update default.yml
Emisse Dec 19, 2024
d83b6f1
Merge branch 'space-wizards:master' into looper2
TytosB Dec 19, 2024
4ee4de7
hotfix
TytosB Dec 19, 2024
6e2879e
Merge branch 'space-wizards:master' into looper2
TytosB Dec 19, 2024
e86d47d
aaa
TytosB Dec 19, 2024
9b1965c
Merge branch 'space-wizards:master' into looper2
TytosB Dec 19, 2024
dcfc99b
bbb
TytosB Dec 19, 2024
6ff97e5
Merge branch 'space-wizards:master' into looper2
TytosB Dec 19, 2024
0517bff
Merge branch 'space-wizards:master' into looper2
TytosB Dec 19, 2024
6a45eae
Merge branch 'space-wizards:master' into looper2
TytosB Dec 25, 2024
a437902
Merge branch 'space-wizards:master' into looper2
TytosB Dec 25, 2024
bf1fe39
many many tweaks and fixes
TytosB Dec 25, 2024
db13312
aaa
TytosB Dec 25, 2024
d606961
Merge branch 'space-wizards:master' into looper2
TytosB Dec 28, 2024
2b76e15
decals and maints
TytosB Dec 28, 2024
c2da137
aaa
TytosB Dec 29, 2024
71b7ccf
bbb
TytosB Dec 30, 2024
4360b3e
ccc
TytosB Dec 30, 2024
bd605ec
cog power setup was bad
TytosB Jan 2, 2025
18573c3
cog power fix
TytosB Jan 3, 2025
1882ee3
Merge branch 'space-wizards:master' into cogger
TytosB Jan 5, 2025
819a338
made it artsy
TytosB Jan 5, 2025
1616b2d
Merge branch 'space-wizards:master' into cogger
TytosB Jan 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
hotfix
TytosB committed Dec 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 4ee4de7dfc45a1079261730b80a2accf0dce99d6
68 changes: 34 additions & 34 deletions Resources/Maps/loop.yml
Original file line number Diff line number Diff line change
@@ -10859,7 +10859,7 @@ entities:
- uid: 15200
components:
- type: Transform
pos: -57.608055,42.841152
pos: -59.461235,42.816093
parent: 2
- proto: BoxBeaker
entities:
@@ -11086,7 +11086,7 @@ entities:
- uid: 15202
components:
- type: Transform
pos: -57.514305,42.450527
pos: -59.679985,42.45672
parent: 2
- proto: BoxNitrileGloves
entities:
@@ -32894,15 +32894,15 @@ entities:
parent: 2
- proto: CarbonDioxideCanister
entities:
- uid: 64
- uid: 798
components:
- type: Transform
pos: 6.5,20.5
pos: 16.5,13.5
parent: 2
- uid: 798
- uid: 9693
components:
- type: Transform
pos: 16.5,13.5
pos: 10.5,22.5
parent: 2
- proto: Carpet
entities:
@@ -40761,31 +40761,31 @@ entities:
pos: -9.5,51.5
parent: 2
- type: Door
secondsUntilStateChange: -232555.16
secondsUntilStateChange: -232643.31
state: Opening
- uid: 6747
components:
- type: Transform
pos: -8.5,51.5
parent: 2
- type: Door
secondsUntilStateChange: -232555.86
secondsUntilStateChange: -232644.02
state: Opening
- uid: 6749
components:
- type: Transform
pos: -6.5,51.5
parent: 2
- type: Door
secondsUntilStateChange: -232554.42
secondsUntilStateChange: -232642.58
state: Opening
- uid: 6750
components:
- type: Transform
pos: -5.5,51.5
parent: 2
- type: Door
secondsUntilStateChange: -232553.8
secondsUntilStateChange: -232641.95
state: Opening
- proto: CyberPen
entities:
@@ -74350,20 +74350,20 @@ entities:
parent: 2
- proto: PlasmaCanister
entities:
- uid: 783
- uid: 80
components:
- type: Transform
pos: 16.5,7.5
pos: 5.5,20.5
parent: 2
- uid: 1398
- uid: 783
components:
- type: Transform
pos: 10.5,23.5
pos: 16.5,7.5
parent: 2
- uid: 1399
- uid: 1398
components:
- type: Transform
pos: 10.5,22.5
pos: 6.5,20.5
parent: 2
- proto: PlasmaReinforcedWindowDirectional
entities:
@@ -74977,6 +74977,11 @@ entities:
- type: Transform
pos: -24.5,58.5
parent: 2
- uid: 8768
components:
- type: Transform
pos: -57.5,41.5
parent: 2
- uid: 9021
components:
- type: Transform
@@ -75132,11 +75137,6 @@ entities:
- type: Transform
pos: -61.5,39.5
parent: 2
- uid: 14899
components:
- type: Transform
pos: -59.5,42.5
parent: 2
- uid: 14901
components:
- type: Transform
@@ -75486,6 +75486,12 @@ entities:
- type: Transform
pos: 20.5,37.5
parent: 2
- uid: 9766
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -47.5,38.5
parent: 2
- uid: 9807
components:
- type: Transform
@@ -76373,12 +76379,6 @@ entities:
- type: Transform
pos: -54.5,43.5
parent: 2
- uid: 13253
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -48.5,38.5
parent: 2
- uid: 13254
components:
- type: Transform
@@ -89008,6 +89008,11 @@ entities:
rot: 1.5707963267948966 rad
pos: -1.5,66.5
parent: 2
- uid: 1399
components:
- type: Transform
pos: -59.5,42.5
parent: 2
- uid: 1553
components:
- type: Transform
@@ -89725,11 +89730,6 @@ entities:
rot: -1.5707963267948966 rad
pos: -52.5,2.5
parent: 2
- uid: 15201
components:
- type: Transform
pos: -57.5,42.5
parent: 2
- uid: 15204
components:
- type: Transform
@@ -103728,10 +103728,10 @@ entities:
parent: 2
- proto: WaterVaporCanister
entities:
- uid: 80
- uid: 64
components:
- type: Transform
pos: 5.5,20.5
pos: 10.5,23.5
parent: 2
- uid: 784
components: