252e81c728
# Conflicts: # Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Mindshield/MindShieldSystem.cs # Content.Shared/Gravity/SharedGravitySystem.cs # Content.Shared/Implants/SharedSubdermalImplantSystem.cs # Resources/Locale/en-US/_strings/traits/traits.ftl # Resources/Prototypes/Entities/Clothing/Shoes/misc.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml # Resources/Prototypes/Entities/Objects/Misc/implanters.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml # Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json |
||
|---|---|---|
| .. | ||
| alien_claw.yml | ||
| announcements.yml | ||
| anomaly.yml | ||
| arcade.yml | ||
| artifact.yml | ||
| atmospherics.yml | ||
| bible.yml | ||
| bike_horn.yml | ||
| body_fall.yml | ||
| broken_device.yml | ||
| bureaucracy.yml | ||
| changeling.yml | ||
| church_bell.yml | ||
| clownrecorder.yml | ||
| deathgasp.yml | ||
| deliveries.yml | ||
| desceration.yml | ||
| destruction.yml | ||
| dice.yml | ||
| disease.yml | ||
| drink_close_sounds.yml | ||
| drink_open_sounds.yml | ||
| emotes.yml | ||
| expeditions.yml | ||
| explosion.yml | ||
| eyes.yml | ||
| fence_rattle.yml | ||
| food.yml | ||
| footsteps.yml | ||
| fox.yml | ||
| gasp.yml | ||
| generator.yml | ||
| generic_hit.yml | ||
| gib.yml | ||
| gun_impacts.yml | ||
| gun_sounds.yml | ||
| hit_impacts.yml | ||
| ian_bark.yml | ||
| keyboard.yml | ||
| kitchenspike.yml | ||
| lighter_sounds.yml | ||
| lobby.yml | ||
| machines.yml | ||
| NukeMusic.yml | ||
| punching.yml | ||
| radiation.yml | ||
| rubber_chicken.yml | ||
| sadtrombone.yml | ||
| screams.yml | ||
| scurret.yml | ||
| shuttle.yml | ||
| skub.yml | ||
| sparks.yml | ||
| storage_rustle.yml | ||
| tools.yml | ||
| toy_squeak.yml | ||
| traits.yml | ||
| tray.yml | ||
| troll.yml | ||
| whistle.yml | ||