Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor sound changes and clarity. #5088

Merged
merged 19 commits into from
Dec 8, 2023
Merged

Minor sound changes and clarity. #5088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c3ecda9
Update marine_shoes.dm
zzzmike Dec 1, 2023
31eaf86
Update marine_uniform.dm
zzzmike Dec 1, 2023
6404aa2
Update backpack.dm
zzzmike Dec 1, 2023
e9e1eb0
Update human_attackhand.dm
zzzmike Dec 1, 2023
758da0f
Update tables_racks.dm
zzzmike Dec 1, 2023
734b7c1
actually tablehit1.ogg for tableslam seems fine
zzzmike Dec 1, 2023
678e136
tablestun message bolded, like disarms are
zzzmike Dec 1, 2023
71f5093
matching previous change
zzzmike Dec 1, 2023
de643b8
consistency
zzzmike Dec 1, 2023
5e3398d
differentiate aggressive grab sound from passive...
zzzmike Dec 1, 2023
f23b8bf
woops - bird review
zzzmike Dec 5, 2023
0a6a766
Merge branch 'master' into patch-3
zzzmike Dec 5, 2023
efdb7b6
already used for a damaging attack, so thud instead
zzzmike Dec 7, 2023
e757d99
drulikar review - thanks
zzzmike Dec 7, 2023
7af1940
per feedback
zzzmike Dec 7, 2023
3cd8824
per feedback
zzzmike Dec 7, 2023
985e4b3
Merge branch 'master' into patch-3
zzzmike Dec 7, 2023
17f944b
per the other changes
zzzmike Dec 7, 2023
01a1709
Merge branch 'master' into patch-3
zzzmike Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/game/objects/items/storage/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/obj/item/storage/firstaid = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC),
/obj/item/storage/toolkit = list(SKILL_ENGINEER, SKILL_ENGINEER_ENGI),
)
drop_sound = "armorequip"
var/worn_accessible = FALSE //whether you can access its content while worn on the back
var/obj/item/card/id/locking_id = null
var/is_id_lockable = FALSE
Expand Down
9 changes: 5 additions & 4 deletions code/game/objects/structures/tables_racks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,17 +276,18 @@
if(user.grab_level > GRAB_AGGRESSIVE)
if (prob(15)) M.apply_effect(5, WEAKEN)
M.apply_damage(8, def_zone = "head")
user.visible_message(SPAN_DANGER("[user] slams [M]'s face against [src]!"),
SPAN_DANGER("You slam [M]'s face against [src]!"))
user.visible_message(SPAN_DANGER("<B>[user] slams [M]'s face against [src]!</B>"),
SPAN_DANGER("<B>You slam [M]'s face against [src]!</B>"))
playsound(src.loc, 'sound/weapons/tablehit1.ogg', 25, 1)
else
to_chat(user, SPAN_WARNING("You need a better grip to do that!"))
return
else if(user.grab_level >= GRAB_AGGRESSIVE)
M.forceMove(loc)
M.apply_effect(5, WEAKEN)
user.visible_message(SPAN_DANGER("[user] throws [M] on [src]."),
SPAN_DANGER("You throw [M] on [src]."))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7)
user.visible_message(SPAN_DANGER("<B>[user] throws [M] on [src], stunning them!</B>"),
SPAN_DANGER("<B>You throw [M] on [src], stunning them!</B>"))
return

if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH) && !(user.a_intent == INTENT_HELP))
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/shoes/marine_shoes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
var/armor_stage = 0
items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol, /obj/item/tool/screwdriver, /obj/item/tool/surgery/scalpel, /obj/item/weapon/straight_razor)
var/knife_type
drop_sound = "armorequip"

/obj/item/clothing/shoes/marine/Initialize(mapload, ...)
. = ..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/under/marine_uniform.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_LOW
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
drop_sound = "armorequip"
///Makes it so that we can see the right name in the vendor.
var/specialty = "USCM"
///List of map variants that use sleeve rolling on something else, like snow uniforms rolling the collar, and therefore shouldn't hide patches etc when rolled.
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human_attackhand.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
else
drop_held_item()
visible_message(SPAN_DANGER("<B>[attacking_mob] has disarmed [src]!</B>"), null, null, 5)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, 7)
return

playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, 7)
Expand Down