Corvax-Frontier · Mor-Dast · Apr 30, 2024 · Apr 30, 2024 · Apr 30, 2024 · Apr 30, 2024
diff --git a/.github/mapchecker/mapchecker.py b/.github/mapchecker/mapchecker.py
diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge
diff --git a/BuildFiles/Mac/Space Station 14.app/Contents/MacOS/SS14 b/BuildFiles/Mac/Space Station 14.app/Contents/MacOS/SS14
diff --git a/Content.Server.Database/add-migration.ps1 b/Content.Server.Database/add-migration.ps1
diff --git a/Content.Server.Database/add-migration.sh b/Content.Server.Database/add-migration.sh
diff --git a/Content.Tools/test/run.sh b/Content.Tools/test/run.sh
diff --git a/RUN_THIS.py b/RUN_THIS.py
diff --git a/Resources/Audio/Backmen/Adminbuse/AI_announce.ogg b/Resources/Audio/Backmen/Adminbuse/AI_announce.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/AI_malf_1.ogg b/Resources/Audio/Backmen/Adminbuse/AI_malf_1.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/AI_malf_2.ogg b/Resources/Audio/Backmen/Adminbuse/AI_malf_2.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/AI_malf_3.ogg b/Resources/Audio/Backmen/Adminbuse/AI_malf_3.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/AI_malf_4.ogg b/Resources/Audio/Backmen/Adminbuse/AI_malf_4.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/AI_malf_5.ogg b/Resources/Audio/Backmen/Adminbuse/AI_malf_5.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/AI_syndicate.ogg b/Resources/Audio/Backmen/Adminbuse/AI_syndicate.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Artillery.ogg b/Resources/Audio/Backmen/Adminbuse/Artillery.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Broken_communications.ogg b/Resources/Audio/Backmen/Adminbuse/Broken_communications.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Broken_droid.ogg b/Resources/Audio/Backmen/Adminbuse/Broken_droid.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Broken_gateway.ogg b/Resources/Audio/Backmen/Adminbuse/Broken_gateway.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Broken_prison.ogg b/Resources/Audio/Backmen/Adminbuse/Broken_prison.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Cap_gone.ogg b/Resources/Audio/Backmen/Adminbuse/Cap_gone.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Capitan_FUN.ogg b/Resources/Audio/Backmen/Adminbuse/Capitan_FUN.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Centcom_question.ogg b/Resources/Audio/Backmen/Adminbuse/Centcom_question.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Hos_gone.ogg b/Resources/Audio/Backmen/Adminbuse/Hos_gone.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Ionstorm.ogg b/Resources/Audio/Backmen/Adminbuse/Ionstorm.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Ionstorm_sound.ogg b/Resources/Audio/Backmen/Adminbuse/Ionstorm_sound.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Johnny_silverhand_theme.ogg b/Resources/Audio/Backmen/Adminbuse/Johnny_silverhand_theme.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Mushrooms.ogg b/Resources/Audio/Backmen/Adminbuse/Mushrooms.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Noert.ogg b/Resources/Audio/Backmen/Adminbuse/Noert.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Outbreak5.ogg b/Resources/Audio/Backmen/Adminbuse/Outbreak5.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Portal.ogg b/Resources/Audio/Backmen/Adminbuse/Portal.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/PurgeAlert.ogg b/Resources/Audio/Backmen/Adminbuse/PurgeAlert.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Storming_The_Arasaka_Tower.ogg b/Resources/Audio/Backmen/Adminbuse/Storming_The_Arasaka_Tower.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/The_heist_cyberpunk.ogg b/Resources/Audio/Backmen/Adminbuse/The_heist_cyberpunk.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Trouble_find_trouble_cyberpunk.ogg b/Resources/Audio/Backmen/Adminbuse/Trouble_find_trouble_cyberpunk.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/UnknownLifeForm.ogg b/Resources/Audio/Backmen/Adminbuse/UnknownLifeForm.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/V_CyberPunk.ogg b/Resources/Audio/Backmen/Adminbuse/V_CyberPunk.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Vox_arrival.ogg b/Resources/Audio/Backmen/Adminbuse/Vox_arrival.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Vox_returns.ogg b/Resources/Audio/Backmen/Adminbuse/Vox_returns.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Xeno_crew_win.ogg b/Resources/Audio/Backmen/Adminbuse/Xeno_crew_win.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Xeno_first_help.ogg b/Resources/Audio/Backmen/Adminbuse/Xeno_first_help.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Xeno_first_help_fail.ogg b/Resources/Audio/Backmen/Adminbuse/Xeno_first_help_fail.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Xeno_second_help.ogg b/Resources/Audio/Backmen/Adminbuse/Xeno_second_help.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Xeno_second_help_fail.ogg b/Resources/Audio/Backmen/Adminbuse/Xeno_second_help_fail.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/Yesert.ogg b/Resources/Audio/Backmen/Adminbuse/Yesert.ogg
diff --git a/Resources/Audio/Backmen/Adminbuse/licenses.txt b/Resources/Audio/Backmen/Adminbuse/licenses.txt
@@ -0,0 +1,6 @@
+All sounds in directory except Storming_The_Alaska_Tower.ogg are taken from TauCeti github (licensed under CC-BY-SA by 3.0) at commit https://github.com/TauCetiStation/TauCetiClassic/commit/92d2767dbb39f28540f78d5055e7be1eb7acee98
+Storming_The_Alaska_Tower.ogg was taken from https://soundcloud.com/frutl/cyberpunk-2077-storming-the-arasaka-tower
+Johnny_silverhand_theme.ogg was taken from https://www.youtube.com/watch?v=xuxWlWkxLDQ
+V_CyberPunk.ogg was taken from https://www.youtube.com/watch?v=bG9ahw-5tj8
+Trouble_find_trouble_cyberpunk.ogg was taken from https://www.youtube.com/watch?v=QQk9XjiJVtg
+The_heist_cyberpunk.ogg was taken from https://www.youtube.com/watch?v=8G-Vu90wEcI&list=PLDisKgcnAC4SqX0mi1J5_gd7-hrIS5yJp&index=24
diff --git a/Resources/Audio/Backmen/Ambience/Antag/attributions.yml b/Resources/Audio/Backmen/Ambience/Antag/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["vampier_start.ogg", "blob_start.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TG bot silero"
+  source: "https://t.me/silero_voice_bot"
diff --git a/Resources/Audio/Backmen/Ambience/Antag/blob_start.ogg b/Resources/Audio/Backmen/Ambience/Antag/blob_start.ogg
diff --git a/Resources/Audio/Backmen/Ambience/Antag/vampier_start.ogg b/Resources/Audio/Backmen/Ambience/Antag/vampier_start.ogg
diff --git a/Resources/Audio/Backmen/CSH/CSH_coffee.ogg b/Resources/Audio/Backmen/CSH/CSH_coffee.ogg
diff --git a/Resources/Audio/Backmen/CSH/CameraCheck_MOG11.ogg b/Resources/Audio/Backmen/CSH/CameraCheck_MOG11.ogg
diff --git a/Resources/Audio/Backmen/CSH/EHO-10_survivors.ogg b/Resources/Audio/Backmen/CSH/EHO-10_survivors.ogg
diff --git a/Resources/Audio/Backmen/CSH/Intercom_Remember_security_is_good.ogg b/Resources/Audio/Backmen/CSH/Intercom_Remember_security_is_good.ogg
diff --git a/Resources/Audio/Backmen/CSH/MOG-Epsilon11.ogg b/Resources/Audio/Backmen/CSH/MOG-Epsilon11.ogg
diff --git a/Resources/Audio/Backmen/CSH/SCP_173_contained.ogg b/Resources/Audio/Backmen/CSH/SCP_173_contained.ogg
diff --git a/Resources/Audio/Backmen/CSH/alert_again.ogg b/Resources/Audio/Backmen/CSH/alert_again.ogg
diff --git a/Resources/Audio/Backmen/CSH/alert_one.ogg b/Resources/Audio/Backmen/CSH/alert_one.ogg
diff --git a/Resources/Audio/Backmen/CSH/class_d_go_to_sec1.ogg b/Resources/Audio/Backmen/CSH/class_d_go_to_sec1.ogg
diff --git a/Resources/Audio/Backmen/CSH/dont_forget_tell_your_leader.ogg b/Resources/Audio/Backmen/CSH/dont_forget_tell_your_leader.ogg
diff --git a/Resources/Audio/Backmen/CSH/nocamera_MOG11.ogg b/Resources/Audio/Backmen/CSH/nocamera_MOG11.ogg
diff --git a/Resources/Audio/Backmen/CSH/pizza_day.ogg b/Resources/Audio/Backmen/CSH/pizza_day.ogg
diff --git a/Resources/Audio/Backmen/CSH/subject_d_go_to_mtf1.ogg b/Resources/Audio/Backmen/CSH/subject_d_go_to_mtf1.ogg
diff --git a/Resources/Audio/Backmen/CSH/terminated_class_d.ogg b/Resources/Audio/Backmen/CSH/terminated_class_d.ogg
diff --git a/Resources/Audio/Backmen/CSH/tesla_has_been_off_1.ogg b/Resources/Audio/Backmen/CSH/tesla_has_been_off_1.ogg
diff --git a/Resources/Audio/Backmen/CSH/tesla_off2.ogg b/Resources/Audio/Backmen/CSH/tesla_off2.ogg
diff --git a/Resources/Audio/Backmen/CSH/tesla_off3.ogg b/Resources/Audio/Backmen/CSH/tesla_off3.ogg
diff --git a/Resources/Audio/Backmen/CSH/yescamera_MOG11.ogg b/Resources/Audio/Backmen/CSH/yescamera_MOG11.ogg
diff --git a/Resources/Audio/Backmen/Effects/Shadowkin/Powers/darkswapoff.ogg b/Resources/Audio/Backmen/Effects/Shadowkin/Powers/darkswapoff.ogg
diff --git a/Resources/Audio/Backmen/Effects/Shadowkin/Powers/darkswapon.ogg b/Resources/Audio/Backmen/Effects/Shadowkin/Powers/darkswapon.ogg
diff --git a/Resources/Audio/Backmen/Effects/Shadowkin/Powers/futuristic-teleport.ogg b/Resources/Audio/Backmen/Effects/Shadowkin/Powers/futuristic-teleport.ogg
diff --git a/Resources/Audio/Backmen/Effects/Shadowkin/Powers/license.txt b/Resources/Audio/Backmen/Effects/Shadowkin/Powers/license.txt
@@ -0,0 +1,4 @@
+darkswapon.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
+darkswapoff.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
+futuristic-teleport.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
+teleport.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
diff --git a/Resources/Audio/Backmen/Effects/Shadowkin/Powers/teleport.ogg b/Resources/Audio/Backmen/Effects/Shadowkin/Powers/teleport.ogg
diff --git a/Resources/Audio/Backmen/Effects/Species/hairball.ogg b/Resources/Audio/Backmen/Effects/Species/hairball.ogg
diff --git a/Resources/Audio/Backmen/Effects/Species/license.txt b/Resources/Audio/Backmen/Effects/Species/license.txt
@@ -0,0 +1 @@
+hairball.ogg taken from https://en.wikipedia.org/wiki/File:Common_house_cat_coughing_hairball.ogv CC-BY-SA-3.0
diff --git a/Resources/Audio/Backmen/Effects/closet_close.ogg b/Resources/Audio/Backmen/Effects/closet_close.ogg
diff --git a/Resources/Audio/Backmen/Effects/closet_open.ogg b/Resources/Audio/Backmen/Effects/closet_open.ogg
diff --git a/Resources/Audio/Backmen/Effects/phasein.ogg b/Resources/Audio/Backmen/Effects/phasein.ogg
diff --git a/Resources/Audio/Backmen/Effects/podwoosh.ogg b/Resources/Audio/Backmen/Effects/podwoosh.ogg
diff --git a/Resources/Audio/Backmen/Effects/toggleoffcombat.ogg b/Resources/Audio/Backmen/Effects/toggleoffcombat.ogg
diff --git a/Resources/Audio/Backmen/Effects/toggleoncombat.ogg b/Resources/Audio/Backmen/Effects/toggleoncombat.ogg
diff --git a/Resources/Audio/Backmen/Items/Toys/khryu.ogg b/Resources/Audio/Backmen/Items/Toys/khryu.ogg
diff --git a/Resources/Audio/Backmen/Machines/buzz-sigh.ogg b/Resources/Audio/Backmen/Machines/buzz-sigh.ogg
diff --git a/Resources/Audio/Backmen/Machines/buzz-two.ogg b/Resources/Audio/Backmen/Machines/buzz-two.ogg
diff --git a/Resources/Audio/Backmen/Machines/chime.ogg b/Resources/Audio/Backmen/Machines/chime.ogg
diff --git a/Resources/Audio/Backmen/Machines/license.txt b/Resources/Audio/Backmen/Machines/license.txt
@@ -0,0 +1,6 @@
+buzz-sigh.ogg taken from: https://github.com/Baystation12/Baystation12 at commit 662c08272acd7be79531550919f56f846726eabb
+buzz-two.ogg taken from: https://github.com/Baystation12/Baystation12 at commit 662c08272acd7be79531550919f56f846726eabb
+chime.ogg taken from: https://github.com/Baystation12/Baystation12 at commit 662c08272acd7be79531550919f56f846726eabb
+polaroid1.ogg taken from: https://github.com/Baystation12/Baystation12 at commit 662c08272acd7be79531550919f56f846726eabb and edited (stereo to mono)
+polaroid2.ogg taken from: https://github.com/Baystation12/Baystation12 at commit 662c08272acd7be79531550919f56f846726eabb and edited (stereo to mono)
+twobeep.ogg taken from: https://github.com/Baystation12/Baystation12 at commit 662c08272acd7be79531550919f56f846726eabb
diff --git a/Resources/Audio/Backmen/Machines/polaroid1.ogg b/Resources/Audio/Backmen/Machines/polaroid1.ogg
diff --git a/Resources/Audio/Backmen/Machines/polaroid2.ogg b/Resources/Audio/Backmen/Machines/polaroid2.ogg
diff --git a/Resources/Audio/Backmen/Machines/twobeep.ogg b/Resources/Audio/Backmen/Machines/twobeep.ogg
diff --git a/Resources/Audio/Backmen/Misc/empty_alarm.ogg b/Resources/Audio/Backmen/Misc/empty_alarm.ogg
diff --git a/Resources/Audio/Backmen/Misc/error.ogg b/Resources/Audio/Backmen/Misc/error.ogg
diff --git a/Resources/Audio/Backmen/Misc/none.ogg b/Resources/Audio/Backmen/Misc/none.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/attributions.yml b/Resources/Audio/Backmen/Voice/Felinid/attributions.yml
@@ -0,0 +1,24 @@
+- files: ["cat_hiss1.ogg", "cat_hiss2.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Original sound by https://freesound.org/people/secondbody/ - cut out two clips of cat hissing, cleaned up, and converted to ogg."
+  source: "https://freesound.org/people/secondbody/sounds/50357/"
+
+- files: ["cat_meow1.ogg", "cat_meow2.ogg", "cat_meow3.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Original sound by https://freesound.org/people/ignotus/ - cut out three clips of cat meowing, cleaned up, and converted to ogg."
+  source: "https://freesound.org/people/ignotus/sounds/26104/"
+
+- files: ["cat_mew1.ogg", "cat_mew2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://freesound.org/people/videog/ - cut out two clips of kittens mewing, cleaned up, and converted to ogg."
+  source: "https://freesound.org/people/videog/sounds/149191/"
+
+- files: ["cat_purr1.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Original sound by https://freesound.org/people/klangstrand/ - cut out short clip, fade in and out, converted to ogg."
+  source: "https://freesound.org/people/klangstrand/sounds/213951/"
+
+- files: ["cat_growl1.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://freesound.org/people/Zabuhailo/ - fade in and out, converted to ogg."
+  source: "https://freesound.org/people/Zabuhailo/sounds/146968/"
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_growl1.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_growl1.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_hiss1.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_hiss1.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_hiss2.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_hiss2.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_meow1.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_meow1.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_meow2.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_meow2.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_meow3.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_meow3.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_mew1.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_mew1.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_mew2.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_mew2.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_purr1.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_purr1.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_scream1.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_scream1.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_scream2.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_scream2.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_scream3.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_scream3.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/cat_wilhelm.ogg b/Resources/Audio/Backmen/Voice/Felinid/cat_wilhelm.ogg
diff --git a/Resources/Audio/Backmen/Voice/Felinid/license.txt b/Resources/Audio/Backmen/Voice/Felinid/license.txt
@@ -0,0 +1,4 @@
+cat_scream1.ogg licensed under CC0 1.0 taken from Queen_Westeros at https://freesound.org/people/queen_westeros/sounds/222590/
+cat_scream2.ogg licensed under CC4.0 taken from InspectorJ at https://freesound.org/people/InspectorJ/sounds/415209/
+cat_scream3.ogg licensed under CC sampling plus 1.0 taken from Hamface at https://freesound.org/people/Hamface/sounds/98669/
+cat_wilhelm.ogg used with apologies to type moon
diff --git a/Resources/Audio/Backmen/Voice/Harpy/attributions.yml b/Resources/Audio/Backmen/Voice/Harpy/attributions.yml
@@ -0,0 +1,9 @@
+- files: ["caw1.ogg"]
+  license: "CC-BY-SA-4.0"
+  copyright: "Original sound by https://xeno-canto.org/756861"
+  source: "https://xeno-canto.org/756861"
+
+  files: ["chirp1.ogg"]
+  license: "CC-BY-SA-4.0"
+  copyright: "Original sound by https://xeno-canto.org/797998"
+  source: "https://xeno-canto.org/797998"
diff --git a/Resources/Audio/Backmen/Voice/Harpy/caw1.ogg b/Resources/Audio/Backmen/Voice/Harpy/caw1.ogg
diff --git a/Resources/Audio/Backmen/Voice/Harpy/chirp1.ogg b/Resources/Audio/Backmen/Voice/Harpy/chirp1.ogg
diff --git a/Resources/Audio/Backmen/Voice/Harpy/license.txt b/Resources/Audio/Backmen/Voice/Harpy/license.txt
@@ -0,0 +1,2 @@
+caw1.ogg licensed under CC-BY-SA-4.0 taken from https://xeno-canto.org/756861
+chirp1.ogg licensed under CC-BY-SA-4.0 taken from https://xeno-canto.org/797998
diff --git a/Resources/Audio/Backmen/Weapons/Melee/Chainsword/ChainSword-off.ogg b/Resources/Audio/Backmen/Weapons/Melee/Chainsword/ChainSword-off.ogg
diff --git a/Resources/Audio/Backmen/Weapons/Melee/Chainsword/ChainSword-on.ogg b/Resources/Audio/Backmen/Weapons/Melee/Chainsword/ChainSword-on.ogg
diff --git a/Resources/Audio/Backmen/Weapons/Melee/Chainsword/chainsword_hit.ogg b/Resources/Audio/Backmen/Weapons/Melee/Chainsword/chainsword_hit.ogg
diff --git a/Resources/Audio/Backmen/Weapons/Melee/Chainsword/chainsword_loop.ogg b/Resources/Audio/Backmen/Weapons/Melee/Chainsword/chainsword_loop.ogg
diff --git a/Resources/Audio/Backmen/Weapons/Melee/bogomol/hit.ogg b/Resources/Audio/Backmen/Weapons/Melee/bogomol/hit.ogg
diff --git a/Resources/Audio/Backmen/Weapons/Melee/bogomol/miss.ogg b/Resources/Audio/Backmen/Weapons/Melee/bogomol/miss.ogg
diff --git a/Resources/Audio/Backmen/Weapons/Melee/bogomol/off.ogg b/Resources/Audio/Backmen/Weapons/Melee/bogomol/off.ogg
diff --git a/Resources/Audio/Backmen/Weapons/Melee/bogomol/on.ogg b/Resources/Audio/Backmen/Weapons/Melee/bogomol/on.ogg
diff --git a/Resources/Audio/Backmen/Weapons/ShotgunShell/shotgun_shell1.ogg b/Resources/Audio/Backmen/Weapons/ShotgunShell/shotgun_shell1.ogg
diff --git a/Resources/Audio/Backmen/Weapons/ShotgunShell/shotgun_shell2.ogg b/Resources/Audio/Backmen/Weapons/ShotgunShell/shotgun_shell2.ogg
diff --git a/Resources/Audio/Backmen/Weapons/ShotgunShell/shotgun_shell3.ogg b/Resources/Audio/Backmen/Weapons/ShotgunShell/shotgun_shell3.ogg
diff --git a/Resources/Audio/_KD/Modsuits/ballin.ogg b/Resources/Audio/_KD/Modsuits/ballin.ogg
diff --git a/Resources/Audio/_KD/Modsuits/ballout.ogg b/Resources/Audio/_KD/Modsuits/ballout.ogg
diff --git a/Resources/Locale/ru-RU/_KD/all.ftl b/Resources/Locale/ru-RU/_KD/all.ftl
@@ -0,0 +1,4 @@
+#bla = бла
+
+job-name-senior-officer = Сержант
+job-description-senior-officer = Помогай и обучай новичков
diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl
@@ -33,7 +33,7 @@ job-description-lawyer = Добейтесь справедливого след
 job-description-librarian = Заведуйте библиотекой, делитесь знаниями с всеми, кто их ищет, и сообщайте о событиях на борту станции.
 job-description-mime = Развлекайте экипаж беззвучными методами, устройте лёгкое соперничество с клоуном.
 job-description-musician = Развлекайте экипаж своими уникальными музыкальными талантами и обзаводитесь новыми инструментами.
-job-description-passenger = Наслаждайтесь пребыванием на борту станции без обязательств!
+job-description-passenger = Исследуй, воруй, зарабатывай!
 job-description-psychologist = Оказывайте эмоциональную поддержку психологически травмированному экипажу. Эта должность доступна на станциях Box, Marathon, Origin, Avrite и Delta.
 job-description-qm = Руководите отделом снабжения станции, контролируйте работу утилизаторов, следите за выполнением всех заказов и обеспечивайте поступление денег.
 job-description-rd = Руководите научным отделом, открывайте новые технологии, получайте и исследуйте артефакты, и проводите эксперименты.

diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -31,7 +31,7 @@ job-name-janitor = уборщик
 job-name-chaplain = священник
 job-name-botanist = ботаник
 job-name-bartender = бармен
-job-name-passenger = пассажир
+job-name-passenger = контрабандист
 job-name-salvagespec = утилизатор
 job-name-qm = квартирмейстер
 job-name-cargotech = грузчик

diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -24,6 +24,8 @@
   - type: Tag
     tags:
       - Meat
+  - type: StaticPrice
+    price: 1000
 
 - type: entity
   id: OrganArachnidStomach

diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
@@ -24,6 +24,8 @@
   - type: FlavorProfile
     flavors:
       - people
+  - type: StaticPrice
+    price: 1000
 
 - type: entity
   id: OrganDionaBrain

diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
@@ -27,6 +27,8 @@
   - type: Tag
     tags:
       - Meat
+  - type: StaticPrice
+    price: 1000
 
 - type: entity
   id: BaseHumanOrgan
@@ -68,6 +70,8 @@
   - type: FlavorProfile
     flavors:
       - people
+  - type: StaticPrice
+    price: 2000
 
 - type: entity
   id: OrganHumanEyes

diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml
@@ -24,3 +24,5 @@
     groups:
       - id: Food
       - id: Drink
+  - type: StaticPrice
+    price: 5000
diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml
@@ -21,3 +21,5 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
+  - type: StaticPrice
+    price: 5000
diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml
@@ -70,3 +70,5 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
+  - type: StaticPrice
+    price: 3000
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -469,6 +469,9 @@
           Quantity: 82
   - type: Extractable
     grindableSolutionName: food
+  - type: StaticPrice
+    price: 301
+
 
 - type: entity
   name: cheese wheel

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
@@ -28,6 +28,9 @@
         reagents:
           - ReagentId: THC
             Quantity: 20
+  - type: StaticPrice
+    price: 50
+
 
 - type: entity
   id: Blunt
@@ -59,3 +62,6 @@
         reagents:
           - ReagentId: THC
             Quantity: 20
+  - type: StaticPrice
+    price: 50
+
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -17,7 +17,8 @@
         reagents:
         - ReagentId: THC
           Quantity: 15
-
+  - type: StaticPrice
+    price: 35
 
 - type: entity
   name: dried cannabis leaves
@@ -37,6 +38,8 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/tobacco.rsi
     state: dried
+  - type: StaticPrice
+    price: 25
 
 - type: entity
   name: ground cannabis
@@ -65,7 +68,8 @@
       - Smokable
   - type: Item
     size: Tiny
-
+  - type: StaticPrice
+    price: 40
 
 - type: entity
   name: tobacco leaves
@@ -77,6 +81,8 @@
     sprite: Objects/Specific/Hydroponics/tobacco.rsi
   - type: Produce
     seedId: tobacco
+  - type: StaticPrice
+    price: 15
 
 - type: entity
   name: dried tobacco leaves
@@ -96,6 +102,8 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/tobacco.rsi
     state: dried
+  - type: StaticPrice
+    price: 15
 
 - type: entity
   name: ground tobacco
@@ -124,3 +132,6 @@
       - Smokable
   - type: Item
     size: Tiny
+  - type: StaticPrice
+    price: 20
+
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
@@ -12,10 +12,11 @@
 - type: startingGear
   id: PassengerGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitColorGrey
+    jumpsuit: ClothingUniformJumpsuitLoungewear
     back: ClothingBackpackFilled
-    shoes: ClothingShoesColorBlack
+    shoes: ClothingShoesBootsWork
     id: PassengerPDA
+    outerClothing: ClothingOuterWinterCoat
     ears: ClothingHeadsetGrey
   innerClothingSkirt: ClothingUniformJumpskirtColorGrey
   satchel: ClothingBackpackSatchelFilled
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		hairball.ogg taken from https://en.wikipedia.org/wiki/File:Common_house_cat_coughing_hairball.ogv CC-BY-SA-3.0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		caw1.ogg licensed under CC-BY-SA-4.0 taken from https://xeno-canto.org/756861
		chirp1.ogg licensed under CC-BY-SA-4.0 taken from https://xeno-canto.org/797998