Vigers Ray
e2aab392db
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/PDA/PdaSystem.cs
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Roles/Jobs/Civilian/chef.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/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.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/borg_types.yml
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png
2025-04-20 02:52:59 +03:00
Milon
6138fcdce9
Predict and cleanup RingerComponent ( #35907 )
...
* clean up most stuff
* move to shared
* works
* shuffle shit around
* oops! access
* fixes
* todo: everything
* SUFFERING
* curse you
2025-04-19 15:55:05 +02:00
Vigers Ray
f84969630d
Диверсионный отряд ( #985 )
...
* Диверсионный отряд
* фиксы
* фиксы линтера
* Спрайт терминала икаруса
* фикс пинпоинтера
* Доработки ДО
* Фиксы удалённого управления шаттлом
* Не запускать ДО если на может быть меньше 3 глав
2025-01-01 07:53:31 +03:00
VMSolidus
84a2356831
Adding PAI Slot to PDA ( #21086 )
...
* Adding PAI Slot to PDA
* Update PdaComponent.cs
* Update pda.yml
* Update tags.yml
Sorting it alphabetically
* Adding PDA UI Elements.
* Addressing reviews
* Update PdaComponent.cs
* Update Content.Shared/PDA/SharedPdaSystem.cs
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* Update Content.Shared/PDA/SharedPdaSystem.cs
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* Update Resources/Prototypes/Entities/Objects/Devices/pda.yml
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* Update PdaComponent.cs
* Update PdaComponent.cs
---------
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2024-01-04 05:56:14 -07:00
Nemanja
7ddee71379
More borg tweaks ( #19143 )
...
* borg tweaks but i'm gonna go code fun stuff first
* werkin' on it
* a ton of tweaks
* fuck everyone and then myself
2023-08-14 18:34:23 -05:00
TemporalOroboros
df1dcb74ac
Dewarns access ( #16666 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-07-23 14:19:51 +10:00
0x6273
247c7a1d4d
Fix PDA capitalization to be PascalCase ( #17335 )
2023-06-15 11:44:28 +10:00
