Morb0
fe48e6deda
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/ICharacterProfile.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# SpaceStation14.sln
2024-02-26 15:14:44 +03:00
Nemanja
ce0a51fc29
Predict doors and airlocks ( #25419 )
...
* predict doors and airlocks
* prying, too
* ack
* eek
2024-02-23 10:01:31 +11:00
Morb0
8a0a435965
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json
2024-01-05 00:55:19 +03:00
themias
7c22a1cc59
Increase zombie prying time for bolted doors ( #23383 )
2024-01-03 17:41:39 -07:00
Morb0
259233ad78
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/CharacterSetupGui.xaml
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Resources/Prototypes/Catalog/Fills/Boxes/general.yml
# Resources/Prototypes/Entities/Clothing/Back/satchel.yml
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
Leon Friedrich
f308adffaf
Move ActorComponent to shared ( #21293 )
2023-10-29 04:21:02 +11:00
Morb0
681762aca7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Prototypes/Objectives/objectiveGroups.yml
2023-10-28 14:14:36 +03:00
nikthechampiongr
8f181b4534
Fix popup messages appearing when someone tries to open a door without a tool. ( #21099 )
...
* The fixTM
* typo fix
* addressing review
2023-10-26 22:26:52 -04:00
Morb0
75443d7fb6
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Communications/CommunicationsConsoleSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
2023-10-11 16:56:19 +03:00
chromiumboy
7d20aefc0a
Fix opening wire panels without WiresPanelSecurityComponent ( #20798 )
2023-10-06 13:26:02 -08:00
chromiumboy
acc9c8940b
Use construction graphs for hacking protections ( #20265 )
2023-10-05 19:15:03 -08:00
Morb0
2046506e17
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-10-02 18:29:43 +03:00
chromiumboy
149c494972
Fix powered door prying popup ( #20669 )
2023-10-01 22:27:29 -08:00
Morb0
64f1e79a5a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/manifest.yml
2023-09-28 17:32:44 +03:00
nikthechampiongr
5ff79120e6
EasyPry airlocks for arrivals. Now also prying refactor I guess ( #19394 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-28 21:34:21 +10:00
Morb0
58ef40767e
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
2023-09-19 11:41:15 +03:00
chromiumboy
3753fed920
Fix adding/removing airlock protections via welding ( #19926 )
2023-09-13 21:54:49 -08: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
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
Tom Leys
a196756124
Split Door Bolt functionality out of AirlockDoor ( #16354 )
2023-05-31 10:23:35 -04:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03: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
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
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
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
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
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
0x6273
fe00c1c10b
Airlock bolt and deconstruction fixes ( #11985 )
2022-10-17 11:44:04 +11:00
metalgearsloth
0b38589728
Raise power events by ref and not broadcast ( #11923 )
...
Also some other minor stuff.
2022-10-14 23:08:15 -05:00
Visne
94178804df
Keep windoors open if they are clicked ( #11180 )
2022-09-11 07:48:03 +10:00
Rane
822c8f3c70
make jaws of life not awful ( #10770 )
2022-08-31 20:22:25 -07:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
Flipp Syder
2c6158e115
Wires refactor ( #7699 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-05-06 12:35:06 +10:00
Leon Friedrich
1914560773
Fix firelock door init ( #6384 )
2022-01-30 15:47:24 +11:00
Leon Friedrich
c465715273
ECS Doors ( #5887 )
2022-01-30 11:49:56 +11:00
Paul Ritter
9e1607722d
removes componentdependencies ( #6160 )
2022-01-15 13:26:37 +11:00
Vera Aguilera Puerto
c8b65be747
Replace IEntityManager resolves in systems for cached EntityManager
2021-12-08 13:00:43 +01:00
Vera Aguilera Puerto
5cd42c9ad6
Inline UID
2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
69b270017b
Inline TryGetComponent completely, for real
2021-12-03 14:17:01 +01:00
Vera Aguilera Puerto
0767bd3777
Popup ECS Refactor ( #4692 )
2021-09-26 15:18:45 +02:00
Kara D
9354abb024
reviews + test
2021-08-05 22:01:02 -07:00
Kara D
e460285187
proper sprites + visualizes nicely
2021-08-05 19:43:58 -07:00
mirrorcult
af2e21c355
Refactor IDoorCheck into entity events ( #4366 )
...
* IDoorCheck refactored to events
# Conflicts:
# Content.Server/Atmos/TileAtmosphere.cs
# Content.Server/Doors/Components/AirlockComponent.cs
# Content.Server/Doors/Components/FirelockComponent.cs
# Content.Server/Doors/Components/ServerDoorComponent.cs
# Content.Server/Doors/IDoorCheck.cs
* namespaces
* Fix mapinit bug with refreshautoclose
* ok i guess these just didnt feel like staging today
2021-08-02 21:57:06 +10:00
