Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
deltanedas
24810d916b
ninja 2 electric boogaloo ( #15534 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
Morb0
b1550d7db0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
2023-09-05 00:12:02 +03:00
metalgearsloth
db1ff07821
Weldable cleanup ( #19809 )
2023-09-05 00:07:01 +10:00
Morb0
5277dceed2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
Morb0
f5c44e5bd0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/typing_indicator.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Effects/speech.rsi/alien0.png
# Resources/Textures/Effects/speech.rsi/alien1.png
# Resources/Textures/Effects/speech.rsi/alien2.png
# Resources/Textures/Effects/speech.rsi/alienroyal0.png
# Resources/Textures/Effects/speech.rsi/alienroyal1.png
# Resources/Textures/Effects/speech.rsi/alienroyal2.png
# Resources/Textures/Effects/speech.rsi/blob0.png
# Resources/Textures/Effects/speech.rsi/blob1.png
# Resources/Textures/Effects/speech.rsi/blob2.png
# Resources/Textures/Effects/speech.rsi/clock0.png
# Resources/Textures/Effects/speech.rsi/clock1.png
# Resources/Textures/Effects/speech.rsi/clock2.png
# Resources/Textures/Effects/speech.rsi/default0.png
# Resources/Textures/Effects/speech.rsi/default1.png
# Resources/Textures/Effects/speech.rsi/default2.png
# Resources/Textures/Effects/speech.rsi/guardian0.png
# Resources/Textures/Effects/speech.rsi/guardian1.png
# Resources/Textures/Effects/speech.rsi/guardian2.png
# Resources/Textures/Effects/speech.rsi/holo0.png
# Resources/Textures/Effects/speech.rsi/holo1.png
# Resources/Textures/Effects/speech.rsi/holo2.png
# Resources/Textures/Effects/speech.rsi/lawyer0.png
# Resources/Textures/Effects/speech.rsi/lawyer1.png
# Resources/Textures/Effects/speech.rsi/lawyer2.png
# Resources/Textures/Effects/speech.rsi/machine0.png
# Resources/Textures/Effects/speech.rsi/machine1.png
# Resources/Textures/Effects/speech.rsi/machine2.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/robot0.png
# Resources/Textures/Effects/speech.rsi/robot1.png
# Resources/Textures/Effects/speech.rsi/robot2.png
# Resources/Textures/Effects/speech.rsi/slime0.png
# Resources/Textures/Effects/speech.rsi/slime1.png
# Resources/Textures/Effects/speech.rsi/slime2.png
# Resources/Textures/Effects/speech.rsi/swarmer0.png
# Resources/Textures/Effects/speech.rsi/swarmer1.png
# Resources/Textures/Effects/speech.rsi/swarmer2.png
# Resources/Textures/Effects/speech.rsi/syndibot0.png
# Resources/Textures/Effects/speech.rsi/syndibot1.png
# Resources/Textures/Effects/speech.rsi/syndibot2.png
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/command.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/science.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
2023-08-13 05:40:29 +03:00
Tom Leys
4a55a000cb
Add Fire-fighting remote for Fire-doors ( #16189 )
2023-08-11 02:29:33 -07:00
Morb0
9a4db6ca8d
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Server/Doors/Systems/AirlockSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/diona.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
# Resources/Textures/Tiles/attributions.yml
2023-08-11 03:09:35 +03:00
chromiumboy
636819f4e3
Hacking protections for airlocks ( #18894 )
...
* Adds the ability to better protect to the internal wiring of airlocks
- Achieved by opening the maintenance panel, adding either steel or plasteel to the airlock, then welding the plate in place
- To access the wiring, the plating must be cut with a welder and then pried out with a crowbar
* Code revisions
- Cleaned up the code
- Cutting the security grille can now shock you
- Atmospherics and Security dept airlocks start with a medium level of protection (a welded steel plate)
- Command dept airlocks start with a high level of protection (a welded plasteel plate and electrified security grille)
* Code revision
- Accounted for a potentially null string
* Update Content.Server/Construction/Completions/AttemptElectrocute.cs
Co-authored-by: Slava0135 <40753025+Slava0135@users.noreply.github.com>
* Update ChangeWiresPanelSecurityLevel.cs
Adjusted scope
* Update Content.Shared/Wires/SharedWiresSystem.cs
Co-authored-by: Slava0135 <40753025+Slava0135@users.noreply.github.com>
* Update Content.Shared/Wires/SharedWiresSystem.cs
Co-authored-by: Slava0135 <40753025+Slava0135@users.noreply.github.com>
* Update ChangeWiresPanelSecurityLevel.cs
Removed get / setter and added [ValidatePrototypeId] attribute
* Update ChangeWiresPanelSecurityLevel.cs
Set security level to "Level0" as the default
* Update airlock.yml
Removed 'super max' level of security
* Update WiresPanelSecurityLevelPrototype.cs
* Update WiresSystem.cs
Added check for WiresAccessible to OnInteractUsing
* Update AttemptElectrocute.cs
File scoped namespace
* Update ChangeWiresPanelSecurityLevel.cs
File scoped namespace
* Update AirlockSystem.cs
File scoped namespace
* Update SharedWiresSystem.cs
Removed boiler plate 'OnGetState' and 'OnHandleState'
* Update WiresPanelComponent.cs
Implemented AutoGenerateComponentState
* Removed unnecessary usage references
* use TryCloseAll when wires not accessible
* minor changes to AttemmptElectrocute
* lets try all 7 levels
* fix indent in airlock graph
* fix indent 2
---------
Co-authored-by: Slava0135 <40753025+Slava0135@users.noreply.github.com>
Co-authored-by: Slava0135 <super.novalskiy_0135@inbox.ru>
2023-08-10 11:33:03 +03:00
Morb0
23eef7660d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-07-28 01:02:37 +03:00
Leon Friedrich
f2bfdd8e17
Remove superseded machine linking code ( #18244 )
2023-07-24 12:07:35 +10:00
faint
5828dca50b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cent.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-iaa.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png
2023-07-21 16:32:31 +03:00
Vordenburg
e47b782ba2
Set door bolt wire cut to false when mended ( #18122 )
2023-07-18 14:56:51 -06: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
metalgearsloth
b67209cb24
Revert "Door opening tweaks" ( #17395 )
2023-06-17 12:09:49 +10:00
Chief-Engineer
bfa5ce44d4
add airlock pry logs ( #17377 )
2023-06-16 20:58:29 +10:00
metalgearsloth
c24c6e93ec
Door opening tweaks ( #16799 )
2023-06-13 20:30:04 +10:00
Tom Leys
a196756124
Split Door Bolt functionality out of AirlockDoor ( #16354 )
2023-05-31 10:23:35 -04:00
Morb0
c124b716a3
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Traits/TraitSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Research/technologies.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/moose.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png
2023-05-20 13:51:12 +03:00
Tom Leys
9fce417662
Firelocks only open on click (not close) ( #16516 )
2023-05-16 23:37:37 -07:00
Morb0
6d4e9c2b32
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Structures/Power/apc.rsi/apcox-0.png
# Resources/Textures/Structures/Power/apc.rsi/apcox-1.png
# Resources/Textures/Structures/Power/apc.rsi/meta.json
2023-05-09 13:48:44 +03:00
Leon Friedrich
2bd5fb3736
Remove obsolete Fixture.Body references ( #16259 )
2023-05-09 17:21:26 +10:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03: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
Tom Leys
79eeefd813
Fix firelock lights for hot / pressurized rooms ( #15892 )
2023-05-06 15:54:36 +10:00
Slava0135
c47ec40c43
prevent from prying blast doors ( #16077 )
2023-05-05 23:16:23 +10:00
Morbo
1b79af1fc2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Changelog/ChangelogManager.cs
# Content.Client/Doors/AirlockVisualizer.cs
# Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2023-04-23 16:02:09 +03:00
metalgearsloth
e780c6a98a
Fix NPC door prying ( #15605 )
2023-04-21 15:05:29 +10:00
Nemanja
31851e5468
[Entity] Brig Timers ( #15285 )
...
* brigtimer
* ok
* TextScreen w timer implementation
* second commit
* working brig timer
* signal timers near completion
* soon done
* removed licenses, fixes noRotation on screens, minor edits
* no message
* no message
* removed my last todos
* removed csproj.rej??
* missed a thing with .yml and tests
* fix tests
* Update base_structureairlocks.yml
* timespan type serialize
* activation turned into comp
* sloth review
* Update timer.yml
* small changes
---------
Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
Co-authored-by: rolfero <45628623+rolfero@users.noreply.github.com>
2023-04-19 01:47:01 -06:00
keronshb
ac87effca0
[Revert] Reverts Ninja ( #15516 )
...
* Revert "[Antag] add space ninja as midround antag (#14069 )"
This reverts commit c1cda0dbf8#15490 )"
This reverts commit 251f429fb3
2023-04-19 01:43:09 -06:00
Morbo
ea68e39611
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/RulesCorvax.txt
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-04-19 02:54:06 +03:00
deltanedas
c1cda0dbf8
[Antag] add space ninja as midround antag ( #14069 )
...
* start of space ninja midround antag
* suit has powercell, can be upgraded only (not replaced with equal or worse battery)
* add doorjacking to ninja gloves, power cell, doorjack objective (broken), tweaks
* 💀
* add basic suit power display that uses stamina rsi
* add draining apc/sub/smes - no wires yet
* add research downloading
* ninja starts implanted, move some stuff to yaml
* add Automated field to OnUseTimerTrigger
* implement spider charge and objective
* fix client crash when taking suit off, some refactor
* add survive condition and tweak locale
* add comms console icon for objective
* add calling in a threat - currently revenant and dragon
* combine all glove abilities
* locale
* spark sounds when draining, refactoring
* toggle is actually toggle now
* prevent crash if disabling stealth with outline
* add antag ctrl for ninja, hopefully show greentext
* fix greentext and some other things
* disabling gloves if taken off or suit taken off
* basic energy katana, change ninja loadout
* recallable katana, refactoring
* start of dash - not done yet
* katana dashing ability
* merge upstream + compiling, make AutomatedTimer its own component
* docs and stuff
* partial refactor of glove abilities, still need to move handling
* make dooremaggedevent by ref
* move bunch of stuff to shared - broken
* clean ninja antag verb
* doc
* mark rule config fields as required
* fix client crash
* wip systems refactor
* big refactor of systems
* fuck
* make TryDoElectrocution callable from shared
* finish refactoring?
* no guns
* start with internals on
* clean up glove abilities, add range check
* create soap, in place of ninja throwing stars
* add emp suit ability
* able to eat chefs stolen food in space
* stuff, tell client when un/cloaked but there is bug with gloves
* fix prediction breaking gloves on client
* ninja soap despawns after a minute
* ninja spawns outside the station now, with gps + station coords to navigate
* add cooldown to stun ability
* cant use glove abilities in combat mode
* require empty hand to use glove abilities
* use ghost role spawner
* Update Content.Server/Ninja/Systems/NinjaSuitSystem.cs
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
* some review changes
* show powercell charge on examine
* new is needed
* address some reviews
* ninja starts with jetpack, i hope
* partial feedback
* uhh
* pro
* remove pirate from threats list
* use doafter refactor
* pro i gave skeleton jetpack
* some stuff
* use auto gen state
* mr handy
* use EntityQueryEnumerator
* cleanup
* spider charge target anti-troll
* mmmmmm
---------
Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
2023-04-17 01:33:27 -06:00
Morbo
8cc2a785fc
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-04-04 23:53:11 +03:00
Leon Friedrich
19277a2276
More DoAfter Changes ( #14609 )
...
* DoAfters
* Compact Clone()
* Fix mice and cuffables
* Try generalize attempt events
* moves climbabledoafter event to shared, fixes issue with climbable target
* Fix merge (cuffing)
* Make all events netserializable
* handful of doafter events moved
* moves the rest of the events to their respective shared folders
* Changes all mentions of server doafter to shared
* stop stripping cancellation
* fix merge errors
* draw paused doafters
* handle unpausing
* missing netserializable ref
* removes break on stun reference
* removes cuffing state reference
* Fix tools
* Fix door prying.
* Fix construction
* Fix dumping
* Fix wielding assert
* fix rev
* Fix test
* more test fixes
---------
Co-authored-by: keronshb <keronshb@live.com>
2023-04-02 21:13:48 -04:00
Morbo
c58729755f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
2023-03-24 05:48:43 +03:00
Slava0135
d03ca61da1
Telecom server panel check ( #14523 )
2023-03-23 20:09:45 -04:00
Morbo
e5fda096d9
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Resources/Prototypes/Maps/box.yml
2023-02-25 07:37:50 +03:00
keronshb
9ebb452a3c
DoAfter Refactor ( #13225 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-02-25 01:01:25 +01:00
Morbo
f989de7af5
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
# Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
2023-02-05 03:01:05 +03:00
Visne
5a5a3afbb1
Remove some obsolete AppearanceComponent method usages ( #13726 )
2023-02-02 12:34:53 -04:00
Morbo
cdfcfe6722
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-01-22 00:07:21 +03:00
Morb
9874ce5f48
Update bolt light after bolts fall ( #13636 )
2023-01-21 12:33:11 -04:00
Nemanja
d87d8f2886
predict emag and make blessed record struct events ( #13623 )
2023-01-22 02:12:45 +11:00
Leon Friedrich
b20b4b11cc
Wire action cleanup ( #13496 )
2023-01-21 10:51:02 +11:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
Morbo
b3c177f119
Fix airlock closed light
2023-01-17 23:58:41 +03:00
metalgearsloth
2873a830bd
ECS airlocks ( #13500 )
2023-01-17 11:44:32 -07:00
Chief-Engineer
3cfd814503
Add logging for hacking ( #12861 )
2023-01-16 08:14:46 +11:00
