Vigers Ray
f84969630d
Диверсионный отряд ( #985 )
...
* Диверсионный отряд
* фиксы
* фиксы линтера
* Спрайт терминала икаруса
* фикс пинпоинтера
* Доработки ДО
* Фиксы удалённого управления шаттлом
* Не запускать ДО если на может быть меньше 3 глав
2025-01-01 07:53:31 +03:00
Vigers Ray
925ade605b
Фикс эвака
2024-12-11 18:53:41 +03:00
Vigers Ray
e99ff5dc82
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
# Resources/migration.yml
2024-12-01 18:21:33 +03:00
Gansu
9236e9e5b9
Fix for arrivals deleting nuke ( #33659 )
...
Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing
Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked
Co-authored-by: aa5g21 <aa5g21@soton.ac.uk>
2024-11-30 13:48:04 +11:00
Vigers Ray
0c1e15e516
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Info/LinkBanner.cs
# Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl
# Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
2024-11-26 17:50:59 +03:00
MilenVolf
aa80a88cc4
Allow shuttles on planets to make FTL jump ( #33507 )
...
This check conflicts with an attempt to FTL from the planet before expedition ends
2024-11-24 11:11:47 +03:00
Vigers Ray
8d0ab85920
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Resources/Locale/en-US/_strings/clothing/components/magboots-component.ftl
# Resources/Locale/en-US/_strings/singularity/components/generator-component.ftl
# Resources/Prototypes/Datasets/Names/borer.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/migration.yml
2024-11-20 17:50:33 +03:00
DrSmugleaf
f5d0e955e3
Fix imports
2024-11-19 21:16:49 -08:00
MilenVolf
2002de9bb0
Localize planet dataset names ( #33398 )
...
* Localize planet names (borer)
* DatasetPrototype -> LocalizedDatasetPrototype
* Apply requested changes
2024-11-20 11:57:43 +11:00
haiwwkes
b8032baa9d
tweaks. ( #465 )
...
* tweaks.
* aaaaaa
* aaaaa
* Revert "aaaaa"
This reverts commit d95c6d6cedeac70d9c882533f115c229a69ee38a.
* yes
* AlwaysPoweredMap, remove biomes.
* forget..
* sky
* Updated map
* Update PlanetPrisonStationSystem.cs
* Update EmergencyShuttleSystem.cs
---------
Co-authored-by: SplikZerys <tronezero700@yandex.ru>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-07 08:45:23 +03:00
VigersRay
461a4d84a2
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/workflows/publish.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/migration.yml
2024-10-07 01:09:20 +03:00
Plykiya
295e63193c
Two additional checks to prevent FTLing stations ( #32558 )
...
Add two additional checks to prevent FTLing
2024-10-04 12:55:36 +10:00
VigersRay
5a679bd004
УУУУУУУ СУУУУКААААААА
2024-10-03 17:30:02 +03:00
haiwwkes
5efc51b304
tweaks ( #451 )
...
* tweak: add RestrictedRange to prison and transit hub.
* tweak: make laydown better
* ay lmaoo
2024-10-03 17:23:41 +03:00
VigersRay
47cdabdaed
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/StatusEffect/StatusEffectsSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 16:09:00 +03:00
Leon Friedrich
974c08596b
Fix AudioSystem nullability checks for engine PR ( #32233 )
2024-09-18 11:43:30 +10:00
Rinary
64f1aed90c
Большие изменения ( #345 )
...
* init
* мать масштаба тарабанил
* fix
* upd
* upd
* upd
* upd
* upd
* console spam fix
* hohohohohohohooooonkeeeeeeeeeeeeeerrrrrrrrrrrsssssssss........
* fix
* fix
* upd
* upd
* some fixes
* fix
* upd
* upd translation for steal obj
* teg translate
* upd
* fix locale + add advertisements
* translate configurator
* Fully translate
* upd
* Я манал это переводить, позже переведу
* upd en-US
* fix Linter
* upd
* fix
* upd
* fix
* fix
* fix
* Возврат ПНТ
* remove agent non silent equipment
* add acid to uplink
* carrySystem new popups
* fix
* fix
* fix disease locale
* add Disease Guide
* upd locale
* upd
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4130d241fc47fb80924c0dd3b9c9a2db85af8a25, reversing
changes made to 30abf7341ecce404f61f64e2000ad327964fcb00.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4e5a50d21c29be8482f31e49db253b1ed17a0ae4, reversing
changes made to 449cd7bfd50f29eb653e68ba60e3f0b9310f0443.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit a4679665ef441d4b63a92dc3c4e217e2cdedbc16, reversing
changes made to a80ef96cfbbc3cc737045e41a2f063a0910bf1ce.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 94f585756bb27d10a1be7fab1f340d79b7c0a213, reversing
changes made to 906d18a3f66eaed73f3a894d70971872904fad4e.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit d0a7c6436ba5c175b0e00d69f495ba51f9aac645, reversing
changes made to e7933332274b336af1fc2a960264bc546c95d208.
# Conflicts:
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
* fix
* upd
* upd
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 042a3f112bbc32a622108475ac28081eb0bbbf9f.
# Conflicts:
# Content.Server/Dragon/DragonRiftSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
# Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs
# Resources/Changelog/Changelog.yml
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/Prototypes/Store/categories.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/migration.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 2860e1d217a71be0c29684e020b2278c3f08685f.
# Conflicts:
# Resources/Changelog/Changelog.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 0dc7ea17e23d844ce93118db7812b844e36dda4f.
# Conflicts:
# Resources/Changelog/Changelog.yml
# Resources/Prototypes/Hydroponics/randomMutations.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 439926b3c60e95cc2e701d84a032b17471a7c18e.
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 14160ab99909bf6b6f996f415d9dcfd5d4addbba.
# Conflicts:
# Resources/Changelog/Changelog.yml
* fix
* upd
* upd uplink
* upd
* fix linter
2024-09-16 19:05:38 +03:00
VigersRay
3bbae85466
фиксы апстрима
2024-09-16 13:13:35 +03:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
metalgearsloth
2a58fa1ef8
Reapply "FTL + AI fixes ( #31952 )" ( #31968 ) ( #32094 )
...
* Reapply "FTL + AI fixes (#31952 )" (#31968 )
This reverts commit c46a4ab876
2024-09-12 14:08:54 +10:00
metalgearsloth
8401b94b70
Fix latejoins ( #32093 )
...
For realsies :)
2024-09-12 14:04:48 +10:00
metalgearsloth
635e800220
Reapply "Fix spawnpref" ( #32018 ) ( #32058 )
...
This reverts commit 119dd610fa
2024-09-10 22:23:24 -06:00
Emisse
119dd610fa
Revert "Fix spawnpref" ( #32018 )
2024-09-09 23:58:20 +02:00
metalgearsloth
1088113bf8
Fix spawnpref ( #31892 )
2024-09-09 13:39:15 -06:00
Pieter-Jan Briers
5a6a3371dc
Extend shuttle dock time if the shuttle doesn't dock at evac. ( #31496 )
...
* Extend shuttle dock time if the shuttle doesn't dock at evac.
If the shuttle can't dock at evac for *some reason*, it will instead try to dock at another port on the station. And if that fails it goes somewhere random on the station.
Because of the chaos and confusion caused by this, many people will frequently not get to the shuttle in time under these circumstances. This sucks for everybody.
To alleviate this, the shuttle launch timer will now be extended if the station doesn't dock at its ideal spot. The default values (controlled via CVar) are 1.667x and 2x respectively for "wrong dock" and "no dock at all" scenarios.
The code around here was a mess, so I fixed that too. "CallEmergencyShuttle" has been renamed to "DockEmergencyShuttle", the overload that did the actual docking has been renamed to DockSingleEmergencyShuttle. Code has been split into separate dock -> announce methods so we can calculate shuttle delay in between the case of multiple stations.
Also made the "shuttle couldn't find a dock" text announce the time until it launches and fix the shuttle timers not triggering for it.
* Minor review
---------
2024-09-09 20:10:28 +02:00
slarticodefast
c46a4ab876
Revert "FTL + AI fixes ( #31952 )" ( #31968 )
2024-09-08 17:50:23 +02:00
metalgearsloth
f7a87b5f32
FTL + AI fixes ( #31952 )
2024-09-08 18:12:23 +10:00
Mervill
3414abb970
Remove unused IoC dependency references. ( #31704 )
...
Remove unused IoC dependencies
2024-09-01 23:22:50 +02:00
Julian Giebel
417d3a87a2
Station Anchor ( #26098 )
...
* Work on abstracting out chargeup functionality/ui from grav gen
* Work on station anchor
* Finish implementing station anchors
* uhh yeah
* ok.
* fix tests
* whoops
* Get the last extraneous yaml fail
* PJB review
* beast mode... ACTIVATE!
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2024-08-31 10:40:28 -04:00
VigersRay
c705713fb0
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
2024-08-29 16:01:10 +03:00
metalgearsloth
f0615ec3c8
Fixup playerspawn stuff ( #31546 )
...
* Fixup playerspawn stuff
- Also removed arrivals forcing, this should just turn containerspawnpoint off.
* fix this one
* test fix
* really fix
2024-08-29 15:27:47 +10:00
VigersRay
6b134a0888
Фиксы апстрима
2024-08-28 20:17:03 +03:00
VigersRay
9328f4d9cb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/UserInterface/ActivatableUIComponent.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# SpaceStation14.sln
2024-08-28 19:12:01 +03:00
PopGamer46
c2ccf2bc0f
Fixes shuttles not being able to FTL onto/near station ( #31569 )
...
fixes FTL
2024-08-28 23:22:21 +10:00
Thomas
d304123ef7
Disable Arrivals message for Cryosleep ( #30888 )
...
* Disable arrivals message for cryosleep late arrivals
* Provide silent to PlayerSpawnCompleteEvent
* Fix typo
* Move message to event and into arrivals system
2024-08-27 17:02:21 +02:00
IProduceWidgets
af65af836a
Centcom & FTLDestination cleanup ( #30226 )
...
* centcomm name and ftlcomp
* networking microopstimization
* go sleep.
* map names and arrivals
2024-08-27 13:28:26 +02:00
Mervill
c6d291968f
Replace obsolete code in shuttle systems. ( #31408 )
...
* Format DockingSystem.Shuttle
* arrivals system
* docking system
* shuttle console system
* emergency shuttle system
* shuttle system
* thruster system
* Fix compile error
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-08-26 17:48:37 +02:00
metalgearsloth
a89d4c750b
Power stuff ( #31314 )
...
* Power stuff
- Add shared IsPowered
- Add shared ResolveApc
- Move PowerChangedEvent to shared for now
- Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it.
* big update
* boing
2024-08-25 22:18:42 +10:00
metalgearsloth
60b34b57f3
Fix dungeon spawn + ftl overlap ( #31413 )
...
* Fix dungeon spawn + ftl overlap
* Better fixes
2024-08-25 14:48:29 +10:00
VigersRay
0441b8b814
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Launcher/LauncherConnecting.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/StationEvents/Events/RandomSentienceRule.cs
# Content.Shared/Interaction/Components/BlockMovementComponent.cs
# Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Objectives/stealTargetGroups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/migration.yml
2024-08-22 06:50:04 +03:00
Nemanja
65c0b699f2
fix and buff the handheld mass scanner ( #31284 )
2024-08-21 12:33:01 -06:00
VigersRay
a33b949c98
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Maps/train.yml
2024-08-07 22:57:31 +03:00
Nemanja
ce97225c2d
Replace IClickAlert with events ( #30728 )
...
* Replace IAlertClick with events
* whoop
* eek!
2024-08-07 15:15:35 +10:00
VigersRay
c0ee7e3cc9
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Lobby/LobbyUIController.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
# Content.Shared/Roles/JobRequirements.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
# Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
# Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
# Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
# Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Recipes/Lathes/medical.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/Engineering/chief_engineer.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/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-05 17:22:05 +03:00
Simon
0ef5f668e2
Fix warnings in ShuttleSystem.GridFill.cs ( #30253 )
...
* Fix warnings in ShuttleSystem.GridFill.cs
* remove the thingie
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-08-05 14:09:42 +10:00
Mervill
4179821ffa
Show the player a server message when they get booted from the arrivals shuttle ( #30519 )
...
show the player a server message when they get booted from the arrivals shuttle
2024-08-02 15:42:02 +10:00
VigersRay
31b2d24e30
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/MagicMirror/MagicMirrorComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/migration.yml
2024-07-31 03:54:09 +03:00
IProduceWidgets
925d1e3ac8
Prevent gridfill from leaking ( #30395 )
...
dont forget to set the airtights when the tights are aired
2024-07-28 13:20:29 +10:00
metalgearsloth
093054f7e3
Move vgroid much closer ( #29943 )
...
* Move vgroid much closer
General feedback is map spam + it takes too long to get to. This is somewhat "close" (considering 1/4 of the distance is the vgroid itself) but without a jetpack / shuttle it's going to be an endeavour.
* Decrease max
* Tweaks
* godzilla
* Update Content.Server/Shuttles/Components/GridSpawnComponent.cs
2024-07-28 13:14:18 +10:00
VigersRay
81ae9435a3
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
2024-07-27 10:30:01 +03:00
