diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 1be5b49c5a1..f9e4bef38fb 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -249,8 +249,14 @@ GLOBAL_LIST_EMPTY(safes) var/canhear = FALSE if(ishuman(usr)) var/mob/living/carbon/human/H = usr - if(H.can_hear() && H.is_in_hands(/obj/item/clothing/accessory/stethoscope)) - canhear = TRUE + var/list/accessories = H.w_uniform?.accessories + if(H.can_hear()) // This is cursed but is_type_in_list somehow fails + if(H.is_in_hands(/obj/item/clothing/accessory/stethoscope)) + canhear = TRUE + else + for(var/obj/item/clothing/accessory/stethoscope/S in accessories) + canhear = TRUE + break . = TRUE switch(action) @@ -276,7 +282,7 @@ GLOBAL_LIST_EMPTY(safes) current_tumbler_index = 1 if(!invalid_turn && dial == tumblers[current_tumbler_index]) - notify_user(usr, canhear, list("tink", "krink", "plink"), ticks, i) + notify_user(usr, canhear, list("tink", "krink", "plink"), ticks, i, TRUE) current_tumbler_index++ else notify_user(usr, canhear, list("clack", "scrape", "clank"), ticks, i) @@ -296,7 +302,7 @@ GLOBAL_LIST_EMPTY(safes) current_tumbler_index = 1 if(!invalid_turn && dial == tumblers[current_tumbler_index]) - notify_user(usr, canhear, list("tonk", "krunk", "plunk"), ticks, i) + notify_user(usr, canhear, list("tonk", "krunk", "plunk"), ticks, i, TRUE) current_tumbler_index++ else notify_user(usr, canhear, list("click", "chink", "clink"), ticks, i) @@ -330,14 +336,14 @@ GLOBAL_LIST_EMPTY(safes) /** * Called every dial turn to provide feedback if possible. */ -/obj/structure/safe/proc/notify_user(user, canhear, sounds, total_ticks, current_tick) +/obj/structure/safe/proc/notify_user(user, canhear, sounds, total_ticks, current_tick, correct_sound) if(!canhear) return if(current_tick == 2) to_chat(user, "The sounds from [src] are too fast and blend together.") if(total_ticks == 1 || prob(SOUND_CHANCE)) - to_chat(user, "You hear a [pick(sounds)] from [src].") + to_chat(user, "You hear a [pick(sounds)] from [src].") /** * Returns the combination to unlock the safe as text. diff --git a/goon/browserassets/css/browserOutput-dark.css b/goon/browserassets/css/browserOutput-dark.css index 1df180fed19..3ad6fe6777c 100644 --- a/goon/browserassets/css/browserOutput-dark.css +++ b/goon/browserassets/css/browserOutput-dark.css @@ -433,3 +433,5 @@ span.body .coderesponses {color: #FF3333;} .announcement.minor h1 { font-size: 180%; } .announcement.minor h2 { font-size: 170%; } .announcement.sec h1 { color: #f00; font-size: 180%; font-family: Verdana, sans-serif; } + +.bolditalics {font-style: italic; font-weight: bold;} diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index 3dfe8f331db..3a18b7c8b2e 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -433,3 +433,5 @@ span.body .coderesponses {color: #FF0000;} .announcement.minor h1 { font-size: 180%; } .announcement.minor h2 { font-size: 170%; } .announcement.sec h1 { color: #f00; font-size: 180%; font-family: Verdana, sans-serif; } + +.bolditalics {font-style: italic; font-weight: bold;}