Morb
|
08ad5e3f87
|
Revert "Fixed door connection crash bug" (#1327)
|
2023-08-14 03:15:23 +03:00 |
|
Morb0
|
636bea81df
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
# Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
|
2023-06-19 21:06:28 +03:00 |
|
deltanedas
|
07d2430840
|
logic gate stuff (#16943)
Co-authored-by: deltanedas <@deltanedas:kde.org>
|
2023-06-07 16:48:42 -07:00 |
|
Tom Leys
|
a196756124
|
Split Door Bolt functionality out of AirlockDoor (#16354)
|
2023-05-31 10:23:35 -04:00 |
|
faint
|
69ddbdd9f4
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Resources/Prototypes/secret_weights.yml
|
2023-05-31 03:26:01 +03:00 |
|
Sailor
|
ccda80f31d
|
Allow remote signallers to toggle bolt on doors (#16909)
|
2023-05-29 19:51:31 -07:00 |
|
Julian Giebel
|
49cb9d0e1e
|
Prevent infinite loops in device linking (#16856)
|
2023-05-29 02:14:06 +10:00 |
|
Morb
|
5bb841dc1f
|
Fixed door connection crash bug (#1097)
Co-authored-by: Canvas123 <lunarfury6@gmail.com>
|
2023-05-26 13:41:42 +03:00 |
|
Julian Giebel
|
5e0a96dfc7
|
Blast door/shutter, timer and or gate device linking fixes (#16347)
|
2023-05-11 18:16:02 -04:00 |
|
Kevin Zheng
|
4e5adc2b86
|
Add interlocking airlocks (#14177)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2023-05-07 16:49:11 +10:00 |
|
Julian Giebel
|
6ebd784cb6
|
Device Linking and better linking ui (#13645)
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2023-05-07 16:07:24 +10:00 |
|