diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 170d6949271..50ddb565ad1 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -49,7 +49,7 @@ if ((O.client && !( O.blinded ))) O.show_message(text("[] [failed ? "tried to tackle" : "has tackled"] down []!", src, T), 1) -/mob/living/carbon/human/proc/leap(mob/living/T as mob in view(4)) +/mob/living/carbon/human/proc/leap(mob/living/T as mob in oview(4)) set category = "Abilities" set name = "Leap" set desc = "Leap at a target and grab them aggressively." diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index cf501d90e12..9eb6187f3f1 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -126,7 +126,6 @@ else M << "The floor lurches beneath you!" shake_camera(M, 10, 1) - M.playsound_local(M.loc, 'sound/effects/shuttlelaunch.ogg', 100, 1, 0.5) if(istype(M, /mob/living/carbon)) if(!M.buckled) M.Weaken(3) diff --git a/html/changelogs/printer16-Shuttle.yml b/html/changelogs/printer16-Shuttle.yml new file mode 100644 index 00000000000..2dbd93e3933 --- /dev/null +++ b/html/changelogs/printer16-Shuttle.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Printer16 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Shuttle sound removed." diff --git a/sound/effects/shuttlelaunch.ogg b/sound/effects/shuttlelaunch.ogg deleted file mode 100644 index 3be5ba46489..00000000000 Binary files a/sound/effects/shuttlelaunch.ogg and /dev/null differ