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

Upstream sync #2347

Merged
merged 110 commits into from
Jun 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
f041f58
Add time index to connection log (#29281)
PJB3005 Jun 21, 2024
b7c088f
Fix SSD indicator for scaled humanoids (#29310)
Macoron Jun 22, 2024
0ff144a
Automatic changelog update
PJBot Jun 22, 2024
6aa7e2e
Fix noticeboard drawdepth (#29262)
Ko4ergaPunk Jun 22, 2024
e0a6604
Fix pistols not displaying ammo count in-hand (#29289)
Doomsdrayk Jun 22, 2024
07fe1a6
Rewrite the options menu (#28389)
PJB3005 Jun 22, 2024
8922633
Update submodule to 226.3.0 (#29323)
metalgearsloth Jun 22, 2024
be7ffd8
AME Deconstruction Changes (#29317)
EmoGarbage404 Jun 22, 2024
1048817
Automatic changelog update
PJBot Jun 22, 2024
bb61f44
Move air sensor components into abstract base prototype (#29261)
Partmedia Jun 22, 2024
b5f6aa0
Pacifist messages use target's identity name instead of entity name (…
ArkiveDev Jun 22, 2024
dfe01c7
Fix comments (#29330)
Partmedia Jun 22, 2024
c418758
Fix for missing survival boxes (#29336)
Errant-4 Jun 22, 2024
df5c4df
Automatic changelog update
PJBot Jun 22, 2024
061c1f5
Admin UI localization (#29340)
MetalSage Jun 22, 2024
45a4596
Disk """resprite""" (#29277)
Flareguy Jun 22, 2024
5ee79b5
Sound Station 14 like a nukie song (#29345)
marboww Jun 22, 2024
092cad4
Automatic changelog update
PJBot Jun 22, 2024
475c2a0
add access reader log wire (#29094)
deltanedas Jun 22, 2024
4d6da00
Automatic changelog update
PJBot Jun 22, 2024
02fb432
Adjust some gas thresholds (#29331)
Partmedia Jun 22, 2024
8112063
Add air alarm hysteresis (#29223)
Partmedia Jun 22, 2024
f954970
Automatic changelog update
PJBot Jun 22, 2024
2a6fc45
Thief toolbox minor rebalance & description clean-up (#27771)
K-Dynamic Jun 22, 2024
b9172a7
Automatic changelog update
PJBot Jun 22, 2024
325ab97
Prying reinforced tile now will give you back metal rod (#29084)
lzk228 Jun 22, 2024
061445e
Automatic changelog update
PJBot Jun 22, 2024
6aced66
Firelocks are no longer pryable by hand if they are powered (#29221)
nikthechampiongr Jun 22, 2024
640115d
Automatic changelog update
PJBot Jun 22, 2024
ae84889
Don't add untriage lable if it has been labeled at issue creation (#2…
VasilisThePikachu Jun 22, 2024
f582e69
Remove robotics and supermatter lobby images (#29355)
PJB3005 Jun 22, 2024
3284c24
add lemon juice and fix bad sprite allocation (#27465)
Shadowtheprotogen546 Jun 22, 2024
627b19c
Automatic changelog update
PJBot Jun 22, 2024
966aca4
Add the ability to put hats on medibots (#28584)
Cojoke-dot Jun 23, 2024
dbe283c
Automatic changelog update
PJBot Jun 23, 2024
f15ccea
Update Credits (#29363)
github-actions[bot] Jun 23, 2024
9f9cf08
TEG can power itself when turned on (#29072)
WarMechanic Jun 23, 2024
089cdcf
Automatic changelog update
PJBot Jun 23, 2024
0546c9b
Revert "Weapon Reflection Movement Mechanic (#27219)" (#29326)
metalgearsloth Jun 23, 2024
c2f8984
Apply RoleLoadout MinLimit fix to EnsureValid too (#29358)
Tayrtahn Jun 23, 2024
c90c065
swap siren (#29369)
EmoGarbage404 Jun 23, 2024
de22f65
fix(packed): Fill the medical lockers in medbay (#29319)
Brandon-Huu Jun 23, 2024
bada3bc
fix(omega): Connect the disposal unit in medbay to the disposal "netw…
Brandon-Huu Jun 23, 2024
252a3e6
tweak(saltern): Place a red phone in bridge meeting room, add another…
Brandon-Huu Jun 23, 2024
b1955f7
tweat(emergency_delta): Add screens around the evacuation shuttle (#2…
Brandon-Huu Jun 23, 2024
9455d0d
tweak(emergency_box): Swap out Salvage Material crate with Engineerin…
Brandon-Huu Jun 23, 2024
6ba2df7
tweak(fland): Add radiation shutters to front of PA (#29265)
Brandon-Huu Jun 23, 2024
32e2a4e
tweak(meta): Swap around some of the computers in bridge (#29263)
Brandon-Huu Jun 23, 2024
00e7aa4
tweak(marathon): Fix some stuff (#29256)
Brandon-Huu Jun 23, 2024
8573eda
fix(origin): Replace mindshield crate with implanter crate (#29183)
Brandon-Huu Jun 23, 2024
33baf41
fix(cluster): Replace mindshield crate with implanter crate (#29182)
Brandon-Huu Jun 23, 2024
7399c75
fix(oasis): Replace mindshield crate with implanter crate (#29181)
Brandon-Huu Jun 23, 2024
801c4f9
tweak(medical): Reduce chemist slots (#28711)
Brandon-Huu Jun 23, 2024
93eded4
fix: Adds a missing defribilator to nukie planet (#28362)
Brandon-Huu Jun 23, 2024
e8a4808
fix(atlas): Replace mindshield crate with implanter crate (#29184)
Brandon-Huu Jun 23, 2024
ba39b6f
Survival box loadout group cleanup (#29379)
Errant-4 Jun 23, 2024
2762470
Add "Structure" tag to switches, buttons, and levers (#29378)
eoineoineoin Jun 23, 2024
6385c8c
Automatic changelog update
PJBot Jun 23, 2024
19bc6f9
ironrock ores (#29381)
EmoGarbage404 Jun 23, 2024
0c34eb6
Ban template system (#29365)
PJB3005 Jun 23, 2024
ba164f9
ContainmentFieldComponent's garbage destruction can now be disabled (…
mhamsterr Jun 23, 2024
ac1bdd2
Fix unlabeled jugs in ChemVend (#29178)
Tayrtahn Jun 23, 2024
0835215
Automatic changelog update
PJBot Jun 23, 2024
6590109
Add bagels (#24799)
DrEnzyme Jun 23, 2024
c41558a
Automatic changelog update
PJBot Jun 23, 2024
6888511
Fix cargo and salvage's computer point light (#29384)
MureixloI Jun 23, 2024
c6e5b23
Network BaseEmitSoundComponent (#29400)
metalgearsloth Jun 24, 2024
d9506ce
Force map confirmation (#29391)
ArkiveDev Jun 24, 2024
e7bcb27
Ghosts can now always see examine details (#29404)
PJB3005 Jun 24, 2024
f068687
Automatic changelog update
PJBot Jun 24, 2024
3df7309
Hotfix examine (#29408)
PJB3005 Jun 24, 2024
c1ad5cd
Fix gay nuke layering (#29410)
PJB3005 Jun 24, 2024
fd05111
Use moderator perms for grant_connect_bypass (#29406)
Chief-Engineer Jun 24, 2024
5aaac8b
Automatic changelog update
PJBot Jun 24, 2024
7453f45
hardsuit fireproof nerf (#29416)
Emisse Jun 24, 2024
0822284
Automatic changelog update
PJBot Jun 24, 2024
8aea47a
Fix forcemap not bypassing requirements (#29426)
Tayrtahn Jun 24, 2024
bd3508d
Colorblind friendly thermomachine LED colors (#29397)
deathride58 Jun 24, 2024
56c4e60
Automatic changelog update
PJBot Jun 24, 2024
ebbe3c9
Revert "TEG can power itself when turned on" (#29434)
PJB3005 Jun 25, 2024
27665e4
Fix filter yml names in the lobby so they actually work (#29435)
VasilisThePikachu Jun 25, 2024
a4d9336
Attempt to fix random test fail by undeleted AlertControl._spriteView…
DrSmugleaf Jun 25, 2024
8c7fc98
Increase of riot shield durability (#29239)
Elysium206 Jun 25, 2024
84a5440
Automatic changelog update
PJBot Jun 25, 2024
3009687
Fix internals not auto-activating for entities spawned in space (#29213)
Tayrtahn Jun 25, 2024
866ca96
Automatic changelog update
PJBot Jun 25, 2024
d2eff3e
Oasis update (#29440)
IProduceWidgets Jun 25, 2024
231e180
reclaimer-lobby-art (#29343)
GetOutMarutak Jun 25, 2024
37fffca
Cut low pressure damage to 1/4 (#29478)
PJB3005 Jun 26, 2024
06e21aa
Automatic changelog update
PJBot Jun 26, 2024
33dd7d4
Fix dragon ghost role rules (#29474)
notquitehadouken Jun 26, 2024
90c33da
Security Webbing Resprite (#29441)
DieselMohawk Jun 26, 2024
a540d1a
Make blood less satiate hunger (#29433)
lzk228 Jun 26, 2024
7ee2b6f
Automatic changelog update
PJBot Jun 26, 2024
4241ad3
Give moldy food the "Trash" tag (#29380)
Veritable-Calamity Jun 26, 2024
c34fb39
Automatic changelog update
PJBot Jun 26, 2024
1a67ab8
Forcemap can be cleared with empty string again (#29472)
Tayrtahn Jun 26, 2024
c81ba6e
Alert shared connections (#29405)
Chief-Engineer Jun 26, 2024
063011e
Automatic changelog update
PJBot Jun 26, 2024
58efe4f
Fix storages bugging out if an open storage has its component removed…
DrSmugleaf Jun 26, 2024
4a0c637
Fixes magic mirror interactions (#29491)
Plykiya Jun 26, 2024
4413253
Fix disposals being effective nuclear bunkers (#29438)
Doomsdrayk Jun 26, 2024
fb705ab
Automatic changelog update
PJBot Jun 26, 2024
f1e7b4c
Fix double labels on pills and pill canisters (#29499)
Tayrtahn Jun 27, 2024
4ec2966
Automatic changelog update
PJBot Jun 27, 2024
849a790
Increase lockout threshold (#29504)
Partmedia Jun 27, 2024
da333a1
Merge remote-tracking branch 'refs/remotes/upstream/master' into mast…
Morb0 Jun 27, 2024
f135037
Return TTS volume slider
Morb0 Jun 27, 2024
55783a6
Update locale
Morb0 Jun 27, 2024
5dd4169
Moved out locale
Morb0 Jun 27, 2024
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
tweat(emergency_delta): Add screens around the evacuation shuttle (#2…
…9267)
  • Loading branch information
Brandon-Huu authored Jun 23, 2024
commit b1955f72d7049267f35a5f3b4e717c167a263918
70 changes: 55 additions & 15 deletions Resources/Maps/Shuttles/emergency_delta.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ entities:
name: NT Evac Delta
- type: Transform
pos: -0.5625,0.671875
parent: invalid
parent: 761
- type: MapGrid
chunks:
0,0:
@@ -395,22 +395,30 @@ entities:
chunkSize: 4
- type: GasTileOverlay
- type: RadiationGridResistance
- uid: 761
components:
- type: MetaData
name: Map Entity
- type: Transform
- type: Map
mapPaused: True
- type: PhysicsMap
- type: GridTree
- type: MovedGrids
- type: Broadphase
- type: OccluderTree
- proto: AirCanister
entities:
- uid: 326
components:
- type: Transform
pos: -13.5,-3.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- uid: 445
components:
- type: Transform
pos: -1.5,-18.5
parent: 1
- type: AtmosDevice
joinedGrid: 1
- proto: AirlockCommandGlassLocked
entities:
- uid: 70
@@ -450,7 +458,7 @@ entities:
- type: Transform
pos: -2.5,-17.5
parent: 1
- proto: AirlockExternalGlassEasyPry
- proto: AirlockExternalGlass
entities:
- uid: 91
components:
@@ -497,7 +505,7 @@ entities:
rot: 3.141592653589793 rad
pos: -9.5,-4.5
parent: 1
- proto: AirlockGlassShuttleEasyPry
- proto: AirlockGlassShuttle
entities:
- uid: 3
components:
@@ -3154,7 +3162,7 @@ entities:
rot: -1.5707963267948966 rad
pos: -9.5,-16.5
parent: 1
- proto: MagazinePistolRubber
- proto: MagazinePistol
entities:
- uid: 784
components:
@@ -3218,6 +3226,13 @@ entities:
- type: Transform
pos: -12.5,-16.5
parent: 1
- proto: OxygenTankFilled
entities:
- uid: 799
components:
- type: Transform
pos: -10.44437,-3.5553346
parent: 1
- proto: PaperBin10
entities:
- uid: 117
@@ -3541,6 +3556,38 @@ entities:
- type: Transform
pos: -2.5,8.5
parent: 1
- proto: Screen
entities:
- uid: 765
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -1.5,-11.5
parent: 1
- uid: 766
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -9.5,-15.5
parent: 1
- uid: 767
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -2.5,-1.5
parent: 1
- uid: 768
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -11.5,-1.5
parent: 1
- uid: 781
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -4.5,3.5
parent: 1
- proto: ShotGunCabinetFilled
entities:
- uid: 745
@@ -4885,11 +4932,4 @@ entities:
rot: -1.5707963267948966 rad
pos: -1.5,2.5
parent: 1
- proto: YellowOxygenTankFilled
entities:
- uid: 799
components:
- type: Transform
pos: -10.44437,-3.5553346
parent: 1
...