sleepyyapril
|
885ee5a831
|
Wizmerge for Station AI (#1351)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
the adding AI is now up to y'all because i'm not touching loadout code
for name datasets, but it shouldn't be too bad from here
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com>
Co-authored-by: Saphire <lattice@saphi.re>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com>
Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net>
Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Julian Giebel <juliangiebel@live.de>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: TGRCDev <tgrc@tgrc.dev>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Fildrance <fildrance@gmail.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com>
Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com>
Co-authored-by: archrbx <punk.gear5260@fastmail.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: neuPanda <chriseparton@gmail.com>
Co-authored-by: neuPanda <spainman0@yahoo.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
(cherry picked from commit 93ed70acfeda357133a701f637d3faeec02749bb)
|
2025-01-14 00:13:42 +03:00 |
|
Spatison
|
a2557f75a6
|
Upstream (#129)
|
2024-11-21 17:49:04 +07:00 |
|
DEATHB4DEFEAT
|
47b10a01b0
|
Catch-Up Cherry Pick 2 (#944)
# Description
Picked 400 commits (and skipped many, many more) from WizDen since #540.
Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby
Refactor).
---
# TODO
- [x] Pick
- [x] Compile
- [x] Fix runtime errors
- [ ] Fix up humanoid profile editor
- [ ] Test everything
---
# Changelog
🆑
- add: Merged 400 WizDen PRs. Happy testing!
---------
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com>
Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com>
Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com>
Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com>
Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com>
Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Jezithyr <jezithyr@gmail.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: Ciac32 <aknoxlor@gmail.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: nao fujiwara <awkwarddryad@gmail.com>
Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com>
Co-authored-by: Vasilis <vasilis@pikachu.systems>
Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com>
Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com>
Co-authored-by: exincore <me@exin.xyz>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com>
Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com>
Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com>
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com>
Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com>
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com>
Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com>
Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com>
Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com>
Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com>
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com>
Co-authored-by: ike709 <ike709@users.noreply.github.com>
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com>
Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
# Conflicts:
# Content.Client/Input/ContentContexts.cs
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Alert/AlertType.cs
# Content.Shared/Input/ContentKeyFunctions.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
# Resources/ConfigPresets/EinsteinEngines/default.toml
# Resources/Prototypes/Alerts/alerts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/keybinds.yml
|
2024-10-19 14:53:37 +07:00 |
|
VMSolidus
|
30fa1207b2
|
Update Submodule to 219.2.0 (#536)
Uses the following Cherry-Picks:
https://github.com/space-wizards/space-station-14/pull/26994
https://github.com/space-wizards/space-station-14/pull/26518
https://github.com/space-wizards/space-station-14/pull/26279
https://github.com/space-wizards/space-station-14/pull/24946
https://github.com/space-wizards/space-station-14/pull/27188
Requires:
https://github.com/Simple-Station/Einstein-Engines/pull/535
https://github.com/Simple-Station/Einstein-Engines/pull/534
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Jake Huxell <JakeHuxell@pm.me>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: DEATHB4DEFEAT <zachcaffee@outlook.com>
|
2024-07-11 17:40:02 -07:00 |
|
Errant
|
29230db5c3
|
Remove doafter from toggling your own internals (#25781)
remove doafter from toggling your own internals
(cherry picked from commit 759b6229c2ff3ae4f0808dbda3a17ac603e23928)
|
2024-03-07 01:21:53 +01:00 |
|
Leon Friedrich
|
485d658bd1
|
Inventory slot enumerator rejig (#21788)
|
2023-12-16 19:30:03 +01:00 |
|
Nemanja
|
23cbc4245e
|
A return to foam (foam rework) (#20831)
|
2023-10-31 18:54:02 +01:00 |
|
DrSmugleaf
|
9cc8a7fc81
|
Remove 700 usages of Component.Owner (#21100)
|
2023-10-20 15:31:13 +02:00 |
|
metalgearsloth
|
c9648da984
|
Content update for NetEntities (#18935)
|
2023-09-27 21:59:12 +02:00 |
|
DrSmugleaf
|
30222a9f3b
|
Add doafter when disconnecting someone else's internals (#19148)
|
2023-08-14 18:25:58 -06:00 |
|
metalgearsloth
|
ae01618874
|
Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566)
|
2023-04-20 20:16:01 +10:00 |
|
metalgearsloth
|
acf79a8209
|
Revert "Replace ResourcePath with ResPath (#15308)" (#15551)
|
2023-04-20 11:43:54 +10:00 |
|
Ygg01
|
71f358a027
|
Replace ResourcePath with ResPath (#15308)
|
2023-04-19 23:39:17 +10: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 |
|
metalgearsloth
|
44fb8a9e2d
|
Fix rsi sprite access for verbs (#14284)
|
2023-02-26 18:48:57 +11:00 |
|
keronshb
|
9ebb452a3c
|
DoAfter Refactor (#13225)
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
|
2023-02-25 01:01:25 +01:00 |
|
Visne
|
c6d3e4f3bd
|
Fix warnings and code cleanup/fixes (#13570)
|
2023-01-19 13:56:45 +11:00 |
|
keronshb
|
f6e1dc15ac
|
Adds delay to internals alert (#13195)
closes https://github.com/space-wizards/space-station-14/issues/12721
|
2023-01-01 16:03:19 -08:00 |
|
Leon Friedrich
|
881a2b2ece
|
PopupSystem public methods rejig (#12830)
|
2022-12-19 08:41:47 +11:00 |
|
Justin Trotter
|
ef5b2a19fa
|
toggle internals icon uses back internals (#12478)
|
2022-12-06 15:14:08 -08:00 |
|
metalgearsloth
|
32ba8e4f9d
|
Cleanup internals (#12719)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
|
2022-11-23 19:26:51 +11:00 |
|
Bright0
|
ecc969d8f4
|
Internals alert fix and adjustment (#12517)
* add low pressure data field
* resolve CheckSeverity bug, replace logic
* add configurable low pressure threshhold
|
2022-11-09 19:02:14 -06:00 |
|
Justin Trotter
|
8c0b113fcf
|
Pet internals (#12376)
* toggle other crew and pet internals
* oops
|
2022-11-08 15:04:06 -06:00 |
|
corentt
|
37997d4dda
|
Stop reducing output pressure of gastank when low pressure (#11818)
* stop reducing output of gastank when low pressure
* fix display internal alert
* rephrase moles quantity check
|
2022-11-08 14:23:41 -06:00 |
|
Kognise
|
aba2462a97
|
Internals improvements (#11677)
|
2022-10-03 18:01:20 -07:00 |
|
Leon Friedrich
|
55665766cf
|
Fix gas tank bug (#10197)
* Fix gas tank bug
* avoid partial connects
* Revert "avoid partial connects"
This reverts commit 598a871442b74bfe05948e3df8ed47722315722d.
|
2022-08-01 17:43:20 +10:00 |
|
metalgearsloth
|
40a7584c2f
|
Gas tank internals alerts (#9567)
|
2022-07-25 14:42:25 +10:00 |
|
wrexbe
|
bc68ac96dd
|
Cleanup the namespaces (#8132)
|
2022-05-13 17:59:03 +10:00 |
|
mirrorcult
|
ec4d4688c7
|
Seal/abstract/virtual everything (#6739)
|
2022-02-16 18:23:23 +11:00 |
|
Leon Friedrich
|
706ac6af40
|
Revert "Revert "epic Respiration Rework"" (#6527)
|
2022-02-09 21:53:10 -07:00 |
|
Leon Friedrich
|
6e8c92d13e
|
Revert "epic Respiration Rework" (#6524)
|
2022-02-07 18:13:14 +11:00 |
|
mirrorcult
|
4ae1c4e332
|
epic Respiration Rework (#6022)
|
2022-02-06 21:48:15 -07:00 |
|