diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 044ee2ae0a8..97edf465885 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -348,24 +348,22 @@ if(W.iswelder()) var/obj/item/weldingtool/WT = W if (!WT.welding) - to_chat(user, "\The [WT] must be turned on!") + to_chat(user, span("danger", "\The [WT] must be turned on!")) else if (WT.remove_fuel(0,user)) - to_chat(user, "Now welding the vent.") + to_chat(user, span("notice", "Now welding the vent.")) if(do_after(user, 30/W.toolspeed)) - if(!src || !WT.isOn()) return - playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) - if(!welded) - user.visible_message("\The [user] welds \the [src] shut.", "You weld \the [src] shut.", "You hear welding.") - welded = 1 - update_icon() - else - user.visible_message("[user] unwelds \the [src].", "You unweld \the [src].", "You hear welding.") - welded = 0 - update_icon() + if(!src || !WT.isOn()) + return + welded = !welded + update_icon() + playsound(src, 'sound/items/Welder2.ogg', 50, 1) + user.visible_message(span("notice", "\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \ + span("notice", "You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \ + "You hear welding.") else - to_chat(user, "You fail to complete the welding.") + to_chat(user, span("notice", "You fail to complete the welding.")) else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span("warning", "You need more welding fuel to complete this task.")) return 1 else ..() @@ -388,24 +386,24 @@ if (!W.iswrench()) return ..() if (!(stat & NOPOWER) && use_power) - to_chat(user, "You cannot unwrench \the [src], turn it off first.") + to_chat(user, span("warning", "You cannot unwrench \the [src], turn it off first.")) return 1 var/turf/T = src.loc if (node && node.level==1 && isturf(T) && !T.is_plating()) - to_chat(user, "You must remove the plating first.") + to_chat(user, span("warning", "You must remove the plating first.")) return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - to_chat(user, "You cannot unwrench \the [src], it is too exerted due to internal pressure.") + to_chat(user, span("warning", "You cannot unwrench \the [src], it is too exerted due to internal pressure.")) add_fingerprint(user) return 1 playsound(src.loc, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span("notice", "You begin to unfasten \the [src]...")) if (do_after(user, 40/W.toolspeed)) user.visible_message( \ - "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span("notice", "\The [user] unfastens \the [src]."), \ + span("notice", "You have unfastened \the [src]."), \ "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 0094ef4e735..b4d316c60aa 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -259,24 +259,24 @@ /obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/W as obj, var/mob/user as mob) if (W.iswrench()) if (!(stat & NOPOWER) && use_power) - to_chat(user, "You cannot unwrench \the [src], turn it off first.") + to_chat(user, span("warning", "You cannot unwrench \the [src], turn it off first.")) return 1 var/turf/T = src.loc if (node && node.level==1 && isturf(T) && !T.is_plating()) - to_chat(user, "You must remove the plating first.") + to_chat(user, span("warning", "You must remove the plating first.")) return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - to_chat(user, "You cannot unwrench \the [src], it is too exerted due to internal pressure.") + to_chat(user, span("warning", "You cannot unwrench \the [src], it is too exerted due to internal pressure.")) add_fingerprint(user) return 1 playsound(src.loc, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span("notice", "You begin to unfasten \the [src]...")) if (do_after(user, 40/W.toolspeed, act_target = src)) user.visible_message( \ - "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span("notice", "\The [user] unfastens \the [src]."), \ + span("notice", "You have unfastened \the [src]."), \ "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) @@ -285,24 +285,23 @@ if(W.iswelder()) var/obj/item/weldingtool/WT = W if (!WT.welding) - to_chat(user, "\The [WT] must be turned on!") + to_chat(user, span("danger", "\The [WT] must be turned on!")) else if (WT.remove_fuel(0,user)) - to_chat(user, "Now welding \the [src].") + to_chat(user, span("notice", "Now welding \the [src].")) + playsound(src, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20/W.toolspeed, act_target = src)) - if(!src || !WT.isOn()) return - playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) - if(!welded) - user.visible_message("\The [user] welds \the [src] shut.", "You weld \the [src] shut.", "You hear welding.") - welded = 1 - update_icon() - else - user.visible_message("[user] unwelds \the [src].", "You unweld \the [src].", "You hear welding.") - welded = 0 - update_icon() + if(!src || !WT.isOn()) + return + welded = !welded + update_icon() + playsound(src, 'sound/items/Welder2.ogg', 50, 1) + user.visible_message(span("notice", "\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \ + span("notice", "You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \ + "You hear welding.") else - to_chat(user, "You fail to complete the welding.") + to_chat(user, span("notice", "You fail to complete the welding.")) else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span("warning", "You need more welding fuel to complete this task.")) return 1 return ..() diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 3e2edeb6716..56629989b3d 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -53,13 +53,14 @@ #define CHAT_GHOSTRADIO 0x2000 #define SHOW_TYPING 0x4000 #define CHAT_NOICONS 0x8000 +#define CHAT_AOOC 0x10000 #define PARALLAX_SPACE 0x1 #define PARALLAX_DUST 0x2 #define PROGRESS_BARS 0x4 #define PARALLAX_IS_STATIC 0x8 -#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC) +#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|CHAT_AOOC) //Sound effects toggles #define ASFX_AMBIENCE 1 diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 8f39a3efb58..65a7f4db563 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -490,7 +490,7 @@ else if (user && !ranged) to_chat(user, "You hit the pylon!") - playsound(get_turf(src), 'sound/effects/Glasshit.ogg', 75, 1) + playsound(get_turf(src), 'sound/effects/glass_hit.ogg', 75, 1) else if(prob(damagetaken)) if (user) @@ -498,7 +498,7 @@ qdel(src) else if (user && !ranged) to_chat(user, "You hit the pylon!") - playsound(get_turf(src), 'sound/effects/Glasshit.ogg', 75, 1) + playsound(get_turf(src), 'sound/effects/glass_hit.ogg', 75, 1) start_process() @@ -507,7 +507,7 @@ "The pylon shatters into shards of crystal!", "You hear a tinkle of crystal shards" ) - playsound(get_turf(src), 'sound/effects/Glassbr3.ogg', 75, 1) + playsound(get_turf(src), "shatter", 75, 1) isbroken = 1 if (pylonmode == 2) //If the pylon had a soul in it then it plays a creepy evil sound as the soul is released diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 7dd7f38a85e..13b09e50949 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -30,7 +30,7 @@ /obj/machinery/optable/examine(var/mob/user) . = ..() - to_chat(user, "The neural suppressors are switched [suppressing ? "on" : "off"].") + to_chat(user, span("notice", "The neural suppressors are switched [suppressing ? "on" : "off"].")) /obj/machinery/optable/ex_act(severity) @@ -50,26 +50,27 @@ else return -/obj/machinery/optable/attack_hand(mob/user as mob) - if (HULK in usr.mutations) - visible_message("\The [usr] destroys \the [src]!") +/obj/machinery/optable/attack_hand(mob/user) + if (HULK in user.mutations) + visible_message(span("danger", "\The [user] destroys \the [src]!")) src.density = 0 qdel(src) return if(!victim) - to_chat(user, "There is nobody on \the [src]. It would be pointless to turn the suppressor on.") + to_chat(user, span("warning", "There is nobody on \the [src]. It would be pointless to turn the suppressor on.")) return TRUE if(user != victim && !use_check_and_message(user)) // Skip checks if you're doing it to yourself or turning it off, this is an anti-griefing mechanic more than anything. - user.visible_message("\The [user] begins switching [suppressing ? "off" : "on"] \the [src]'s neural suppressor.") + user.visible_message(span("warning", "\The [user] begins switching [suppressing ? "off" : "on"] \the [src]'s neural suppressor.")) if(!do_after(user, 30, src)) return if(!victim) - to_chat(user, "There is nobody on \the [src]. It would be pointless to turn the suppressor on.") + to_chat(user, span("warning", "There is nobody on \the [src]. It would be pointless to turn the suppressor on.")) suppressing = !suppressing - user.visible_message("\The [user] switches [suppressing ? "on" : "off"] \the [src]'s neural suppressor.") + user.visible_message(span("notice", "\The [user] switches [suppressing ? "on" : "off"] \the [src]'s neural suppressor.")) + playsound(src.loc, "switchsounds", 50, 1) /obj/machinery/optable/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(air_group || (height==0)) return 1 @@ -110,7 +111,7 @@ if (C == user) user.visible_message("[user] climbs on \the [src].","You climb on \the [src].") else - visible_message("\The [C] has been laid on \the [src] by [user].") + visible_message(span("notice", "\The [C] has been laid on \the [src] by [user].")) if (C.client) C.client.perspective = EYE_PERSPECTIVE C.client.eye = src @@ -139,9 +140,9 @@ if(L == user) - user.visible_message("[user] starts climbing onto [src].", "You start climbing onto [src].", range = 3) + user.visible_message(span("notice", "[user] starts climbing onto [src]."), span("notice", "You start climbing onto [src]."), range = 3) else - user.visible_message("[user] starts putting [L] onto [src].", "You start putting [L] onto [src].", range = 3) + user.visible_message(span("notice", "[user] starts putting [L] onto [src]."), span("notice", "You start putting [L] onto [src]."), range = 3) if (do_mob(user, L, 10, needhand = 0)) if (bucklestatus == 2) var/obj/structure/LB = L.buckled @@ -164,7 +165,7 @@ if (istype(W, /obj/item/grab)) var/obj/item/grab/G = W if (src.victim) - to_chat(usr, "The table is already occupied!") + to_chat(usr, span("notice", "The table is already occupied!")) return 0 var/mob/living/L = G.affecting @@ -175,9 +176,9 @@ if(L == user) - user.visible_message("[user] starts climbing onto [src].", "You start climbing onto [src].", range = 3) + user.visible_message(span("notice", "[user] starts climbing onto [src]."), span("notice", "You start climbing onto [src]."), range = 3) else - user.visible_message("[user] starts putting [L] onto [src].", "You start putting [L] onto [src].", range = 3) + user.visible_message(span("notice", "[user] starts putting [L] onto [src]."), span("notice", "You start putting [L] onto [src]."), range = 3) if (do_mob(user, L, 10, needhand = 0)) if (bucklestatus == 2) var/obj/structure/LB = L.buckled @@ -195,9 +196,9 @@ /obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob) check_victim() if(src.victim && get_turf(victim) == get_turf(src) && victim.lying) - to_chat(usr, "\The [src] is already occupied!") + to_chat(usr, span("warning", "\The [src] is already occupied!")) return 0 if(patient.buckled) - to_chat(usr, "Unbuckle \the [patient] first!") + to_chat(usr, span("notice", "Unbuckle \the [patient] first!")) return 0 return 1 diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 10cc889dda5..bc27fb9f95a 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -333,7 +333,7 @@ /obj/machinery/biogenerator/emag_act(var/remaining_charges, var/mob/user) if(!emagged) emagged = 1 - visible_message("\The [src] makes a fizzling sound.") + visible_message(span("danger", "\The [src] makes a fizzling sound.")) return 1 /obj/machinery/biogenerator/Initialize() @@ -364,47 +364,47 @@ return if(istype(O, /obj/item/reagent_containers/glass)) if(beaker) - to_chat(user, "]The [src] is already loaded.") + to_chat(user, span("notice", "\The [src] is already loaded.")) else user.remove_from_mob(O) O.forceMove(src) beaker = O updateUsrDialog() else if(processing) - to_chat(user, "\The [src] is currently processing.") + to_chat(user, span("notice", "\The [src] is currently processing.")) else if(istype(O, /obj/item/storage/bag/plants)) var/i = 0 var/obj/item/storage/bag/P = O for(var/obj/item/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= capacity) - to_chat(user, "\The [src] is already full! Activate it.") + to_chat(user, span("notice", "\The [src] is already full! Activate it.")) else for(var/obj/item/reagent_containers/food/snacks/grown/G in P.contents) P.remove_from_storage(G,src) i++ if(i >= capacity) - to_chat(user, "You fill \the [src] to its capacity.") + to_chat(user, span("notice", "You fill \the [src] to its capacity.")) break CHECK_TICK if(i < capacity) - to_chat(user, "You empty \the [O] into \the [src].") + to_chat(user, span("notice", "You empty \the [O] into \the [src].")) else if(!istype(O, /obj/item/reagent_containers/food/snacks/grown)) - to_chat(user, "You cannot put this in \the [src].") + to_chat(user, span("notice", "You cannot put this in \the [src].")) else var/i = 0 for(var/obj/item/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= capacity) - to_chat(user, "\The [src] is full! Activate it.") + to_chat(user, span("notice", "\The [src] is full! Activate it.")) else user.remove_from_mob(O) O.forceMove(src) - to_chat(user, "You put \the [O] in \the [src]") + to_chat(user, span("notice", "You put \the [O] in \the [src]")) update_icon() return @@ -482,7 +482,7 @@ if (stat) //NOPOWER etc return if(processing) - to_chat(usr, "The biogenerator is in the process of working.") + to_chat(usr, span("notice", "The biogenerator is in the process of working.")) return var/S = 0 for(var/obj/item/reagent_containers/food/snacks/grown/I in contents) @@ -532,7 +532,7 @@ points -= totake use_power(totake * 0.25) sleep( delay ) - playsound(src.loc, 'sound/machines/switch3.ogg', 50, 1) + playsound(src.loc, "switchsounds", 50, 1) var/new_object = recipie_data["object"] new new_object(loc) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 18f3cd0fff4..8ea14d17690 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -63,13 +63,13 @@ if(stat & (BROKEN|NOPOWER)) if(damage >= 10) if(src.density) - visible_message("\The [user] forces \the [src] open!") + visible_message(span("danger", "\The [user] forces \the [src] open!")) open(1) else - visible_message("\The [user] forces \the [src] closed!") + visible_message(span("danger", "\The [user] forces \the [src] closed!")) close(1) else - visible_message("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].") + visible_message(span("notice", "\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].")) return ..() @@ -141,7 +141,7 @@ /obj/machinery/door/airlock/glass name = "Glass Airlock" icon = 'icons/obj/doors/Doorglass.dmi' - hitsound = 'sound/effects/Glasshit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' open_sound_powered = 'sound/machines/windowdoor.ogg' close_sound_powered = 'sound/machines/windowdoor.ogg' maxhealth = 300 @@ -250,7 +250,7 @@ /obj/machinery/door/airlock/glass_command name = "Glass Airlock" icon = 'icons/obj/doors/Doorcomglass.dmi' - hitsound = 'sound/effects/Glasshit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -261,7 +261,7 @@ /obj/machinery/door/airlock/glass_engineering name = "Glass Airlock" icon = 'icons/obj/doors/Doorengglass.dmi' - hitsound = 'sound/effects/Glasshit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -272,7 +272,7 @@ /obj/machinery/door/airlock/glass_security name = "Glass Airlock" icon = 'icons/obj/doors/Doorsecglass.dmi' - hitsound = 'sound/effects/Glasshit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -283,7 +283,7 @@ /obj/machinery/door/airlock/glass_medical name = "Glass Airlock" icon = 'icons/obj/doors/Doormedglass.dmi' - hitsound = 'sound/effects/Glasshit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -312,7 +312,7 @@ /obj/machinery/door/airlock/glass_research name = "Glass Airlock" icon = 'icons/obj/doors/Doorresearchglass.dmi' - hitsound = 'sound/effects/Glasshit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -324,7 +324,7 @@ /obj/machinery/door/airlock/glass_mining name = "Glass Airlock" icon = 'icons/obj/doors/Doorminingglass.dmi' - hitsound = 'sound/effects/Glasshit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -335,7 +335,7 @@ /obj/machinery/door/airlock/glass_atmos name = "Glass Airlock" icon = 'icons/obj/doors/Dooratmoglass.dmi' - hitsound = 'sound/effects/Glasshit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -462,7 +462,7 @@ About the new airlock wires panel: else /*if(src.justzap)*/ return else if(user.hallucination > 50 && prob(10) && src.operating == 0 && !user.is_diona() && !user.isSynthetic()) - to_chat(user, "You feel a powerful shock course through your body!") + to_chat(user, span("danger", "You feel a powerful shock course through your body!")) user.adjustHalLoss(10) user.stunned += 10 return @@ -787,14 +787,14 @@ About the new airlock wires panel: if(prob(40) && src.density) playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) if(!istype(H.head, /obj/item/clothing/head/helmet)) - user.visible_message("[user] headbutts the airlock.") + user.visible_message(span("warning", "[user] headbutts the airlock.")) var/obj/item/organ/external/affecting = H.get_organ(BP_HEAD) H.Stun(8) H.Weaken(5) if(affecting.take_damage(10, 0)) H.UpdateDamageIcon() else - user.visible_message("[user] headbutts the airlock. Good thing they're wearing a helmet.") + user.visible_message(span("warning", "[user] headbutts the airlock. Good thing they're wearing a helmet.")) return if(H.species.can_shred(H)) @@ -906,16 +906,16 @@ About the new airlock wires panel: /obj/machinery/door/airlock/CanUseTopic(var/mob/user) if(operating < 0) //emagged - to_chat(user, "Unable to interface: Internal error.") + to_chat(user, span("warning", "Unable to interface: Internal error.")) return STATUS_CLOSE if(issilicon(user) && !src.canAIControl()) if(src.canAIHack(user)) src.hack(user) else if (src.isAllPowerLoss()) //don't really like how this gets checked a second time, but not sure how else to do it. - to_chat(user, "Unable to interface: Connection timed out.") + to_chat(user, span("warning", "Unable to interface: Connection timed out.")) else - to_chat(user, "Unable to interface: Connection refused.") + to_chat(user, span("warning", "Unable to interface: Connection refused.")) return STATUS_CLOSE return ..() @@ -1022,7 +1022,7 @@ About the new airlock wires panel: return if (istype(C, /obj/item/device/magnetic_lock)) if (bracer) - to_chat(user, "There is already a [bracer] on [src]!") + to_chat(user, span("notice", "There is already a [bracer] on [src]!")) return var/obj/item/device/magnetic_lock/newbracer = C newbracer.attachto(src, user) @@ -1031,28 +1031,26 @@ About the new airlock wires panel: var/obj/item/weldingtool/WT = C if(WT.isOn()) user.visible_message( - "[user] begins welding [src] [welded ? "open" : "shut"].", - "You begin welding [src] [welded ? "open" : "shut"].", + span("warning", "[user] begins welding [src] [welded ? "open" : "shut"]."), + span("notice", "You begin welding [src] [welded ? "open" : "shut"]."), "You hear a welding torch on metal." ) - playsound(loc, 'sound/items/Welder.ogg', 50, 1) + playsound(src, 'sound/items/Welder.ogg', 50, 1) if (!do_after(user, 2/C.toolspeed SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_open, src.density))) return if(!WT.remove_fuel(0,user)) - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span("notice", "You need more welding fuel to complete this task.")) return - if(!src.welded) - src.welded = 1 - else - src.welded = null - src.update_icon() + playsound(src, 'sound/items/Welder2.ogg', 50, 1) + welded = !welded + update_icon() return else return else if(C.isscrewdriver()) if (src.p_open) if (stat & BROKEN) - to_chat(usr, "The panel is broken and cannot be closed.") + to_chat(usr, span("warning", "The panel is broken and cannot be closed.")) else src.p_open = 0 else @@ -1077,13 +1075,13 @@ About the new airlock wires panel: playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") if(do_after(user,40/C.toolspeed)) - to_chat(user, "You removed the airlock electronics!") + to_chat(user, span("notice", "You removed the airlock electronics!")) CreateAssembly() return else if(arePowerSystemsOn()) - to_chat(user, "The airlock's motors resist your efforts to force it.") + to_chat(user, span("notice", "The airlock's motors resist your efforts to force it.")) else if(locked) - to_chat(user, "The airlock's bolts prevent it from being forced.") + to_chat(user, span("notice", "The airlock's bolts prevent it from being forced.")) else if(density) open(1) @@ -1091,7 +1089,7 @@ About the new airlock wires panel: close(1) else if(istype(C, /obj/item/material/twohanded/fireaxe) && !arePowerSystemsOn()) if(locked && user.a_intent != I_HURT) - to_chat(user, "The airlock's bolts prevent it from being forced.") + to_chat(user, span("notice", "The airlock's bolts prevent it from being forced.")) else if(locked && user.a_intent == I_HURT) ..() else if(!welded && !operating) @@ -1100,16 +1098,16 @@ About the new airlock wires panel: if(F.wielded) open(1) else - to_chat(user, "You need to be wielding \the [C] to do that.") + to_chat(user, span("warning", "You need to be wielding \the [C] to do that.")) else var/obj/item/material/twohanded/fireaxe/F = C if(F.wielded) close(1) else - to_chat(user, "You need to be wielding \the [C] to do that.") + to_chat(user, span("warning", "You need to be wielding \the [C] to do that.")) else if(istype(C, /obj/item/melee/hammer) && !arePowerSystemsOn()) if(locked && user.a_intent != I_HURT) - to_chat(user, "The airlock's bolts prevent it from being forced.") + to_chat(user, span("notice", "The airlock's bolts prevent it from being forced.")) else if(locked && user.a_intent == I_HURT) ..() else if(!welded && !operating) @@ -1120,25 +1118,25 @@ About the new airlock wires panel: else if(density && istype(C, /obj/item/material/twohanded/chainsaw)) var/obj/item/material/twohanded/chainsaw/ChainSawVar = C if(!ChainSawVar.wielded) - to_chat(user, "Cutting the airlock requires the strength of two hands.") + to_chat(user, span("notice", "Cutting the airlock requires the strength of two hands.")) else if(ChainSawVar.cutting) - to_chat(user, "You are already cutting an airlock open.") + to_chat(user, span("notice", "You are already cutting an airlock open.")) else if(!ChainSawVar.powered) - to_chat(user, "The [C] needs to be on in order to open this door.") + to_chat(user, span("notice", "The [C] needs to be on in order to open this door.")) else if(bracer) //Has a magnetic lock - to_chat(user, "The bracer needs to be removed in order to cut through this door.") + to_chat(user, span("notice", "The bracer needs to be removed in order to cut through this door.")) else if(!arePowerSystemsOn()) ChainSawVar.cutting = 1 user.visible_message(\ - "[user.name] starts cutting the control pannel of the airlock with the [C]!",\ - "You start cutting the airlock control panel...",\ - "You hear a loud buzzing sound and metal grinding on metal..."\ + span("danger", "[user.name] starts cutting the control pannel of the airlock with the [C]!"),\ + span("warning", "You start cutting the airlock control panel..."),\ + span("notice", "You hear a loud buzzing sound and metal grinding on metal...")\ ) if(do_after(user, ChainSawVar.opendelay SECONDS, act_target = user, extra_checks = CALLBACK(src, .proc/CanChainsaw, C))) user.visible_message(\ - "[user.name] finishes cutting the control pannel of the airlock with the [C].",\ - "You finish cutting the airlock control panel.",\ - "You hear a metal clank and some sparks."\ + span("warning", "[user.name] finishes cutting the control pannel of the airlock with the [C]."),\ + span("warning", "You finish cutting the airlock control panel."),\ + span("notice", "You hear a metal clank and some sparks.")\ ) set_broken() sleep(1 SECONDS) @@ -1148,15 +1146,15 @@ About the new airlock wires panel: else if(locked) ChainSawVar.cutting = 1 user.visible_message(\ - "[user.name] starts cutting below the airlock with the [C]!",\ - "You start cutting below the airlock...",\ - "You hear a loud buzzing sound and metal grinding on metal..."\ + span("danger", "[user.name] starts cutting below the airlock with the [C]!"),\ + span("warning", "You start cutting below the airlock..."),\ + span("notice", "You hear a loud buzzing sound and metal grinding on metal...")\ ) if(do_after(user, ChainSawVar.opendelay SECONDS, act_target = user, extra_checks = CALLBACK(src, .proc/CanChainsaw, C))) user.visible_message(\ - "[user.name] finishes cutting below the airlock with the [C].",\ - "You finish cutting below the airlock.",\ - "You hear a metal clank and some sparks."\ + span("warning", "[user.name] finishes cutting below the airlock with the [C]."),\ + span("notice", "You finish cutting below the airlock."),\ + span("notice", "You hear a metal clank and some sparks.")\ ) unlock(1) ChainSawVar.cutting = 0 @@ -1164,15 +1162,15 @@ About the new airlock wires panel: else ChainSawVar.cutting = 1 user.visible_message(\ - "[user.name] starts cutting between the airlock with the [C]!",\ - "You start cutting between the airlock...",\ - "You hear a loud buzzing sound and metal grinding on metal..."\ + span("danger", "[user.name] starts cutting between the airlock with the [C]!"),\ + span("warning", "You start cutting between the airlock..."),\ + span("notice", "You hear a loud buzzing sound and metal grinding on metal...")\ ) if(do_after(user, ChainSawVar.opendelay SECONDS, act_target = user, extra_checks = CALLBACK(src, .proc/CanChainsaw, C))) user.visible_message(\ - "[user.name] finishes cutting between the airlock.",\ - "You finish cutting between the airlock.",\ - "You hear a metal clank and some sparks."\ + span("warning", "[user.name] finishes cutting between the airlock."),\ + span("warning", "You finish cutting between the airlock."),\ + span("notice", "You hear a metal clank and some sparks.")\ ) open(1) take_damage(50) @@ -1222,7 +1220,7 @@ About the new airlock wires panel: return 0 if (bracer) do_animate("braced") - visible_message("[src]'s actuators whirr, but the door does not open.") + visible_message(span("warning", "[src]'s actuators whirr, but the door does not open.")) return 0 if(locked || welded) return 0 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 708692abcfa..f99cf85f8d4 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -26,7 +26,7 @@ var/destroy_hits = 10 //How many strong hits it takes to destroy the door var/min_force = 10 //minimum amount of force needed to damage the door with a melee weapon var/hitsound = 'sound/weapons/smash.ogg' //sound door makes when hit with a weapon - var/hitsound_light = 'sound/effects/Glasshit.ogg'//Sound door makes when hit very gently + var/hitsound_light = 'sound/effects/glass_hit.ogg'//Sound door makes when hit very gently var/obj/item/stack/material/steel/repairing var/block_air_zones = 1 //If set, air zones cannot merge across the door even when it is opened. var/open_duration = 150//How long it stays open diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 45d732952fb..b94e4251f4e 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -5,7 +5,7 @@ icon_state = "left" var/base_state = "left" min_force = 4 - hitsound = 'sound/effects/Glasshit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' maxhealth = 150 //If you change this, consiter changing ../door/window/brigdoor/ health at the bottom of this .dm file health = 150 visible = 0.0 @@ -144,7 +144,7 @@ var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1) user.visible_message("[user] smashes against [src].", "You smash against [src]!") take_damage(25) return @@ -214,7 +214,7 @@ if(src.density && istype(I, /obj/item) && !istype(I, /obj/item/card)) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) var/aforce = I.force - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1) visible_message("[src] was hit by [I].") if(I.damtype == BRUTE || I.damtype == BURN) take_damage(aforce) diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index bbe70f0c96a..a03775359d4 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -70,7 +70,7 @@ var/list/floor_light_cache = list() stat |= BROKEN else visible_message("\The [user] attacks \the [src]!") - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1) if(isnull(damaged)) damaged = 0 update_brightness() return diff --git a/code/game/machinery/gumball.dm b/code/game/machinery/gumball.dm index 4e83d5ef6ac..a321f032034 100644 --- a/code/game/machinery/gumball.dm +++ b/code/game/machinery/gumball.dm @@ -97,7 +97,7 @@ /obj/machinery/gumballmachine/proc/smashgumball() icon_state = "[initialicon]_broken" - playsound(get_turf(src), 'sound/effects/Glassbr3.ogg', 75, 1) + playsound(get_turf(src), "shatter", 75, 1) if(amountleft) var/amountleftinside = amountleft for(var/i = 1;i<=amountleftinside,i++) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 8bd3eb1eeca..8da07a2e8b5 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -722,18 +722,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(W.force <15) for (var/mob/O in hearers(5, src.loc)) O.show_message("[user.name] hits the [src.name] with the [W.name] with no visible effect." ) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 100, 1) else src.hitstaken++ if(src.hitstaken==3) for (var/mob/O in hearers(5, src.loc)) O.show_message("[user.name] smashes the [src.name]!" ) src.isbroken=1 - playsound(src.loc, 'sound/effects/Glassbr3.ogg', 100, 1) + playsound(src.loc, "shatter", 100, 1) else for (var/mob/O in hearers(5, src.loc)) O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" ) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 100, 1) else to_chat(user, "This does nothing.") src.update_icon() diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 0f563a2e66a..43f10d0d6bd 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -5,8 +5,8 @@ /obj/item/autopsy_scanner name = "autopsy scanner" desc = "Extracts information on wounds." - icon = 'icons/obj/autopsy_scanner.dmi' - icon_state = "" + icon = 'icons/obj/device.dmi' + icon_state = "autopsy" flags = CONDUCT w_class = 2.0 origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) @@ -150,7 +150,8 @@ scan_data += "
" for(var/mob/O in viewers(usr)) - O.show_message("\The [src] rattles and prints out a sheet of paper.", 1) + O.show_message(span("notice", "\The [src] rattles and prints out a sheet of paper."), 1) + playsound(loc, "sound/bureaucracy/print_short.ogg", 50, 1) sleep(10) @@ -173,19 +174,19 @@ src.wdata = list() src.chemtraces = list() src.timeofdeath = null - to_chat(user, "A new patient has been registered.. Purging data for previous patient.") + to_chat(user, span("notice", "A new patient has been registered. Purging data for previous patient.")) src.timeofdeath = M.timeofdeath var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting) if(!S) - to_chat(usr, "You can't scan this body part.") + to_chat(usr, span("warning", "You can't scan this body part.")) return if(!S.open) - to_chat(usr, "You have to cut the limb open first!") + to_chat(usr, span("warning", "You have to cut the limb open first!")) return for(var/mob/O in viewers(M)) - O.show_message("\The [user] scans the wounds on [M.name]'s [S.name] with \the [src]", 1) + O.show_message(span("notice", "\The [user] scans the wounds on [M.name]'s [S.name] with \the [src]"), 1) src.add_data(S) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 70f2c71205f..075a7d01e57 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -43,7 +43,7 @@ playsound(src, "shatter", 70, 1) update_icon() else - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1) return /obj/structure/displaycase/update_icon() diff --git a/code/game/objects/structures/fireaxe_cabinet.dm b/code/game/objects/structures/fireaxe_cabinet.dm index 27571880df9..f84a008ceb6 100644 --- a/code/game/objects/structures/fireaxe_cabinet.dm +++ b/code/game/objects/structures/fireaxe_cabinet.dm @@ -13,7 +13,7 @@ /obj/structure/fireaxecabinet/attack_generic(var/mob/user, var/damage, var/attack_verb, var/wallbreaker) user.do_attack_animation(src) - playsound(user, 'sound/effects/Glasshit.ogg', 50, 1) + playsound(user, 'sound/effects/glass_hit.ogg', 50, 1) visible_message("[user] [attack_verb] \the [src]!") if(damage_threshold > damage) to_chat(user, "Your strike is deflected by the reinforced glass!") @@ -23,7 +23,7 @@ shattered = 1 unlocked = 1 open = 1 - playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) + playsound(user, "shatter", 100, 1) update_icon() /obj/structure/fireaxecabinet/update_icon() diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index b00b699ad53..19bf5193cec 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -97,7 +97,7 @@ /obj/structure/inflatable/proc/hit(var/damage, var/sound_effect = 1) health = max(0, health - damage) if(sound_effect) - playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(loc, 'sound/effects/glass_hit.ogg', 75, 1) if(health <= 0) deflate(1) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 4d10a969137..e60e2a3ffed 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -51,7 +51,7 @@ shatter() else visible_message("[user] hits [src] with [I]!") - playsound(src.loc, 'sound/effects/Glasshit.ogg', 70, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 70, 1) /obj/structure/mirror/attack_generic(var/mob/user, var/damage) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index bdcfb416991..3e8a1c7b874 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -26,24 +26,24 @@ . = ..(user) if(health == maxhealth) - to_chat(user, "It looks fully intact.") + to_chat(user, span("notice", "It looks fully intact.")) else var/perc = health / maxhealth if(perc > 0.75) - to_chat(user, "It has a few cracks.") + to_chat(user, span("notice", "It has a few cracks.")) else if(perc > 0.5) - to_chat(user, "It looks slightly damaged.") + to_chat(user, span("warning", "It looks slightly damaged.")) else if(perc > 0.25) - to_chat(user, "It looks moderately damaged.") + to_chat(user, span("warning", "It looks moderately damaged.")) else - to_chat(user, "It looks heavily damaged.") + to_chat(user, span("danger", "It looks heavily damaged.")) if(silicate) if (silicate < 30) - to_chat(user, "It has a thin layer of silicate.") + to_chat(user, span("notice", "It has a thin layer of silicate.")) else if (silicate < 70) - to_chat(user, "It is covered in silicate.") + to_chat(user, span("notice", "It is covered in silicate.")) else - to_chat(user, "There is a thick layer of silicate covering it.") + to_chat(user, span("notice", "There is a thick layer of silicate covering it.")) /obj/structure/window/proc/take_damage(var/damage = 0, var/sound_effect = 1) var/initialhealth = health @@ -57,13 +57,16 @@ shatter() else if(sound_effect) - playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1) + playsound(loc, 'sound/effects/glass_hit.ogg', 100, 1) if(health < maxhealth / 4 && initialhealth >= maxhealth / 4) - visible_message("[src] looks like it's about to shatter!" ) + visible_message(span("danger", "[src] looks like it's about to shatter!")) + playsound(loc, "glasscrack", 100, 1) else if(health < maxhealth / 2 && initialhealth >= maxhealth / 2) - visible_message("[src] looks seriously damaged!" ) + visible_message(span("warning", "[src] looks seriously damaged!")) + playsound(loc, "glasscrack", 100, 1) else if(health < maxhealth * 3/4 && initialhealth >= maxhealth * 3/4) - visible_message("Cracks begin to appear in [src]!" ) + visible_message(span("warning", "Cracks begin to appear in [src]!")) + playsound(loc, "glasscrack", 100, 1) return /obj/structure/window/proc/apply_silicate(var/amount) @@ -86,7 +89,7 @@ /obj/structure/window/proc/shatter(var/display_message = 1) playsound(src, "shatter", 70, 1) if(display_message) - visible_message("[src] shatters!") + visible_message(span("warning", "\The [src] shatters!")) if(dir == SOUTHWEST) var/index = null index = 0 @@ -154,7 +157,7 @@ /obj/structure/window/hitby(AM as mob|obj) ..() - visible_message("[src] was hit by [AM].") + visible_message(span("danger", "[src] was hit by [AM].")) var/tforce = 0 if(ismob(AM)) tforce = 40 @@ -172,7 +175,7 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(HULK in user.mutations) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) - user.visible_message("[user] smashes through [src]!") + user.visible_message(span("danger", "[user] smashes through [src]!")) user.do_attack_animation(src) shatter() @@ -183,13 +186,13 @@ attack_generic(H,25) return - playsound(src.loc, 'sound/effects/glassknock.ogg', 90, 1) + playsound(src.loc, 'sound/effects/glass_knock.ogg', 90, 1) user.do_attack_animation(src) - user.visible_message("\The [user] bangs against \the [src]!", - "You bang against \the [src]!", + user.visible_message(span("danger", "\The [user] bangs against \the [src]!"), + span("danger", "You bang against \the [src]!"), "You hear a banging sound.") else - playsound(src.loc, 'sound/effects/glassknock.ogg', 60, 1) + playsound(src.loc, 'sound/effects/glass_knock.ogg', 60, 1) user.visible_message("[user] knocks on \the [src.name].", "You knock on \the [src.name].", "You hear a knocking sound.") @@ -198,17 +201,17 @@ /obj/structure/window/attack_generic(var/mob/user, var/damage) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(damage >= 10) - visible_message("[user] smashes into [src]!") + visible_message(span("danger", "[user] smashes into [src]!")) take_damage(damage) else - visible_message("\The [user] bonks \the [src] harmlessly.") - playsound(src.loc, 'sound/effects/Glasshit.ogg', 10, 1, -2) + visible_message(span("notice", "\The [user] bonks \the [src] harmlessly.")) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 10, 1, -2) user.do_attack_animation(src) return 1 /obj/structure/window/do_simple_ranged_interaction(var/mob/user) visible_message(span("notice", "Something knocks on \the [src].")) - playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1) + playsound(loc, 'sound/effects/glass_hit.ogg', 50, 1) return TRUE /obj/structure/window/attackby(obj/item/W as obj, mob/user as mob) @@ -226,26 +229,26 @@ state = 3 - state update_nearby_icons() playsound(loc, W.usesound, 75, 1) - to_chat(user, (state == 1 ? "You have unfastened the window from the frame." : "You have fastened the window to the frame.")) + to_chat(user, (state == 1 ? span("notice", "You have unfastened the window from the frame.") : span("notice", "You have fastened the window to the frame."))) else if(reinf && state == 0) anchored = !anchored update_nearby_icons() playsound(loc, W.usesound, 75, 1) - to_chat(user, (anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.")) + to_chat(user, (anchored ? span("notice", "You have fastened the frame to the floor.") : span("notice", "You have unfastened the frame from the floor."))) else if(!reinf) anchored = !anchored update_nearby_icons() playsound(loc, W.usesound, 75, 1) - to_chat(user, (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.")) + to_chat(user, (anchored ? span("notice", "You have fastened the window to the floor.") : span("notice", "You have unfastened the window."))) else if(W.iscrowbar() && reinf && state <= 1) state = 1 - state playsound(loc, W.usesound, 75, 1) - to_chat(user, (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")) + to_chat(user, (state ? span("notice", "You have pried the window into the frame.") : span("notice", "You have pried the window out of the frame."))) else if(W.iswrench() && !anchored && (!state || !reinf)) if(!glasstype) - to_chat(user, "You're not sure how to dismantle \the [src] properly.") + to_chat(user, span("notice", "You're not sure how to dismantle \the [src] properly.")) else - visible_message("[user] dismantles \the [src].") + visible_message(span("notice", "[user] dismantles \the [src].")) if(dir == SOUTHWEST) var/obj/item/stack/material/mats = new glasstype(loc) mats.amount = is_fulltile() ? 4 : 2 @@ -262,7 +265,7 @@ update_nearby_icons() step(src, get_dir(user, src)) else - playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(loc, 'sound/effects/glass_hit.ogg', 75, 1) ..() return @@ -277,17 +280,17 @@ var/blocked = M.run_armor_check(def_zone, "melee") switch (state) if(1) - M.visible_message("[user] slams [M] against \the [src]!") + M.visible_message(span("warning", "[user] slams [M] against \the [src]!")) M.apply_damage(7, damtype, def_zone, blocked, src) hit(10) if(2) - M.visible_message("[user] bashes [M] against \the [src]!") + M.visible_message(span("danger", "[user] bashes [M] against \the [src]!")) if (prob(50)) M.Weaken(1) M.apply_damage(10, damtype, def_zone, blocked, src) hit(25) if(3) - M.visible_message("[user] crushes [M] against \the [src]!") + M.visible_message(span("danger", "[user] crushes [M] against \the [src]!")) M.Weaken(5) M.apply_damage(20, damtype, def_zone, blocked, src) hit(50) diff --git a/code/game/sound.dm b/code/game/sound.dm index d9dacc6e5f0..63c937ef1da 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -114,9 +114,9 @@ var/list/sand_footstep = list( var/list/footstepfx = list("blank", "catwalk", "wood", "tiles", "plating", "carpet", "asteroid", "grass", "water", "lava", "snow", "sand") var/list/shatter_sound = list( - 'sound/effects/Glassbr1.ogg', - 'sound/effects/Glassbr2.ogg', - 'sound/effects/Glassbr3.ogg' + 'sound/effects/glass_break1.ogg', + 'sound/effects/glass_break2.ogg', + 'sound/effects/glass_break3.ogg' ) var/list/explosion_sound = list( 'sound/effects/Explosion1.ogg', @@ -195,7 +195,13 @@ var/list/pickaxe_sound = list( 'sound/weapons/mine/pickaxe2.ogg', 'sound/weapons/mine/pickaxe3.ogg', 'sound/weapons/mine/pickaxe4.ogg' -) + ) +var/list/glasscrack_sound = list( + 'sound/effects/glass_crack1.ogg', + 'sound/effects/glass_crack2.ogg', + 'sound/effects/glass_crack3.ogg', + 'sound/effects/glass_crack4.ogg' + ) //var/list/gun_sound = list('sound/weapons/gunshot/gunshot1.ogg', 'sound/weapons/gunshot/gunshot2.ogg','sound/weapons/gunshot/gunshot3.ogg','sound/weapons/gunshot/gunshot4.ogg') /proc/playsound(atom/source, soundin, vol, vary, extrarange, falloff, is_global, usepressure = 1, environment = -1, required_preferences = 0, required_asfx_toggles = 0) @@ -406,6 +412,7 @@ var/list/pickaxe_sound = list( if ("pageturn") soundin = pick(page_sound) if ("fracture") soundin = pick(fracture_sound) //if ("gunshot") soundin = pick(gun_sound) + if ("glasscrack") soundin = pick(glasscrack_sound) if ("computerbeep") soundin = pick(computerbeep_sound) if ("switch") soundin = pick(switch_sound) if ("keyboard") soundin = pick(keyboard_sound) diff --git a/code/global.dm b/code/global.dm index dbb8915c031..29edf35ae8a 100644 --- a/code/global.dm +++ b/code/global.dm @@ -131,9 +131,9 @@ var/static/list/scarySounds = list( 'sound/voice/hiss4.ogg', 'sound/voice/hiss5.ogg', 'sound/voice/hiss6.ogg', - 'sound/effects/Glassbr1.ogg', - 'sound/effects/Glassbr2.ogg', - 'sound/effects/Glassbr3.ogg', + 'sound/effects/glass_break1.ogg', + 'sound/effects/glass_break2.ogg', + 'sound/effects/glass_break3.ogg', 'sound/items/Welder.ogg', 'sound/items/Welder2.ogg', 'sound/machines/airlock.ogg', diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 717b37a6291..d14136e5491 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -98,7 +98,8 @@ var/list/admin_verbs_admin = list( /client/proc/clear_toxins, /client/proc/wipe_ai, // allow admins to force-wipe AIs /client/proc/fix_player_list, - /client/proc/reset_openturf + /client/proc/reset_openturf, + /client/proc/listen_aooc ) var/list/admin_verbs_ban = list( /client/proc/unban_panel, @@ -342,7 +343,8 @@ var/list/admin_verbs_mod = list( /client/proc/check_words, /*displays cult-words*/ /client/proc/check_ai_laws, /*shows AI and borg laws*/ /client/proc/aooc, - /client/proc/print_logout_report + /client/proc/print_logout_report, + /client/proc/listen_aooc ) var/list/admin_verbs_dev = list( //will need to be altered - Ryan784 @@ -390,7 +392,8 @@ var/list/admin_verbs_cciaa = list( /datum/admins/proc/create_admin_fax, /client/proc/check_fax_history, /client/proc/aooc, - /client/proc/check_antagonists + /client/proc/check_antagonists, + /client/proc/listen_aooc ) /client/proc/add_admin_verbs() @@ -781,6 +784,18 @@ var/list/admin_verbs_cciaa = list( to_chat(src, "You now have the keys to control the planet, or atleast a small space station") verbs -= /client/proc/readmin_self +/client/proc/listen_aooc() + set name = "Show/Hide AOOC" + set category = "Preferences" + + if(!check_rights(R_ADMIN|R_MOD|R_CCIAA)) + return + prefs.toggles ^= CHAT_AOOC + if (prefs.toggles & CHAT_AOOC) + to_chat(usr, "You now will see all messages in AOOC.") + else + to_chat(usr, "You now won't see messages in aooc") + /client/proc/deadmin_self() set name = "De-admin self" set category = "Admin" diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm index 9350bbbedc2..8acad2ec765 100644 --- a/code/modules/admin/verbs/antag-ooc.dm +++ b/code/modules/admin/verbs/antag-ooc.dm @@ -14,6 +14,10 @@ if(!msg) return + if(!(prefs.toggles & CHAT_AOOC)) + to_chat(src, "You have AOOC muted.") + return + var/display_name = src.key if (holder) display_name = "[display_name]([holder.rank])" diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index 5d9355d33a2..95c2b51514b 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -237,14 +237,14 @@ STOCK_ITEM_COMMON(gloves, 3.3) /obj/item/clothing/gloves/swat/fluff/hawk_gloves, /obj/item/clothing/gloves/black/fluff/kathleen_glove, /obj/item/clothing/gloves/powerfist, - /obj/item/clothing/gloves/claws, - /obj/item/clothing/gloves/ballistic + /obj/item/clothing/gloves/claws ) exclusion += typesof(/obj/item/clothing/gloves/rig) exclusion += typesof(/obj/item/clothing/gloves/lightrig) exclusion += typesof(/obj/item/clothing/gloves/watch) exclusion += typesof(/obj/item/clothing/gloves/fluff) exclusion += typesof(/obj/item/clothing/gloves/yellow/fluff) + exclusion += typesof(/obj/item/clothing/gloves/ballistic) allgloves -= exclusion for (var/i in 1 to rand(1, 5)) diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 0fffff8d743..85ab6dc0837 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -110,7 +110,6 @@ to_chat(src, "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /client/verb/listen_looc() set name = "Show/Hide LOOC" set category = "Preferences" @@ -120,8 +119,7 @@ to_chat(src, "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.") feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - + /client/verb/toggle_chattags() set name = "Show/Hide Chat Tags" set category = "Preferences" @@ -214,4 +212,4 @@ if (prefs.toggles_secondary & PARALLAX_IS_STATIC) to_chat(src, "Space will no longer move.") else - to_chat(src, "Space will now move.") \ No newline at end of file + to_chat(src, "Space will now move.") diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 6868633ec70..2df1bba6d45 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -110,9 +110,9 @@ mob/living/carbon/proc/handle_hallucinations() if(prob(50)) sound_to(src, 'sound/effects/Explosion1.ogg') else sound_to(src, 'sound/effects/Explosion2.ogg') if(3) sound_to(src, 'sound/effects/explosionfar.ogg') - if(4) sound_to(src, 'sound/effects/Glassbr1.ogg') - if(5) sound_to(src, 'sound/effects/Glassbr2.ogg') - if(6) sound_to(src, 'sound/effects/Glassbr3.ogg') + if(4) sound_to(src, 'sound/effects/glass_break1.ogg') + if(5) sound_to(src, 'sound/effects/glass_break2.ogg') + if(6) sound_to(src, 'sound/effects/glass_break3.ogg') if(7) sound_to(src, 'sound/machines/twobeep.ogg') if(8) sound_to(src, 'sound/machines/windowdoor.ogg') if(9) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index ec12c3f06ca..6151b9214bb 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -178,7 +178,7 @@ update_nearby_icons() step(src, get_dir(user, src)) else - playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(loc, 'sound/effects/glass_hit.ogg', 75, 1) ..() return @@ -202,7 +202,7 @@ if(src.density && istype(I, /obj/item) && !istype(I, /obj/item/card)) var/aforce = I.force - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1) visible_message("[src] was hit by [I].") if(I.damtype == BRUTE || I.damtype == BURN) take_damage(aforce) diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index c233fc66a18..105e3c9546d 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -284,8 +284,8 @@ var/list/name_to_material reflectivity = 0.6 conductivity = 1 shard_type = SHARD_SHARD - tableslam_noise = 'sound/effects/Glasshit.ogg' - hitsound = 'sound/effects/Glasshit.ogg' + tableslam_noise = 'sound/effects/glass_hit.ogg' + hitsound = 'sound/effects/glass_hit.ogg' hardness = 100 stack_origin_tech = list(TECH_MATERIAL = 6) golem = "Diamond Golem" @@ -456,7 +456,7 @@ var/list/name_to_material opacity = 0.3 integrity = 100 shard_type = SHARD_SHARD - tableslam_noise = 'sound/effects/Glasshit.ogg' + tableslam_noise = 'sound/effects/glass_hit.ogg' hardness = 30 weight = 15 protectiveness = 0 // 0% @@ -550,7 +550,7 @@ var/list/name_to_material opacity = 0.3 integrity = 100 shard_type = SHARD_SHARD - tableslam_noise = 'sound/effects/Glasshit.ogg' + tableslam_noise = 'sound/effects/glass_hit.ogg' hardness = 40 weight = 30 stack_origin_tech = list(TECH_MATERIAL = 2) @@ -569,7 +569,7 @@ var/list/name_to_material opacity = 0.3 integrity = 100 shard_type = SHARD_SHARD - tableslam_noise = 'sound/effects/Glasshit.ogg' + tableslam_noise = 'sound/effects/glass_hit.ogg' hardness = 40 weight = 30 stack_origin_tech = list(TECH_MATERIAL = 2) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 835a483ab3a..4921f674125 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -248,9 +248,9 @@ P.stamped += /obj/item/stamp P.add_overlay(stampoverlay) P.stamps += "
This paper has been stamped by the NT Ore Processing System." - - playsound(loc, "sound/bureaucracy/print.ogg", 75, 1) - user.visible_message("\The [src] spits out a piece of paper.") + + user.visible_message("\The [src] rattles and prints out a sheet of paper.") + playsound(loc, "sound/bureaucracy/print_short.ogg", 50, 1) // reset output_mats = list() diff --git a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm index d30b4c8a5d4..87b4e6d5269 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm @@ -416,7 +416,7 @@ qdel(O) var/structure_path = diona_structures[chosen_structure] var/turf/T = get_turf(src) - if(isturf(structure_path)) + if(ispath(structure_path, /turf)) T.ChangeTurf(structure_path) else - new structure_path(T) + new structure_path(T) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/golem.dm b/code/modules/mob/living/carbon/human/species/station/golem.dm index b19f02304cc..72bb044f5c6 100644 --- a/code/modules/mob/living/carbon/human/species/station/golem.dm +++ b/code/modules/mob/living/carbon/human/species/station/golem.dm @@ -356,7 +356,7 @@ death_message = "shatters into many shards!" death_message_range = 7 - death_sound = 'sound/effects/Glassbr1.ogg' + death_sound = "shatter" heat_level_1 = T0C+350 heat_level_2 = T0C+550 diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 6dd7154b36e..67411c7bd1c 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -65,7 +65,7 @@ VUEUI_MONITOR_VARS(/obj/machinery/photocopier, photocopiermonitor) if(copyitem) copyitem.forceMove(usr.loc) usr.put_in_hands(copyitem) - to_chat(usr, "You take \the [copyitem] out of \the [src].") + to_chat(usr, span("notice", "You take \the [copyitem] out of \the [src].")) copyitem = null SSvueui.check_uis_for_change(src) else if(href_list["aipic"]) @@ -96,30 +96,30 @@ VUEUI_MONITOR_VARS(/obj/machinery/photocopier, photocopiermonitor) if(!copyitem) user.drop_from_inventory(O,src) copyitem = O - to_chat(user, "You insert \the [O] into \the [src].") + to_chat(user, span("notice", "You insert \the [O] into \the [src].")) flick(insert_anim, src) playsound(loc, 'sound/bureaucracy/scan.ogg', 75, 1) SSvueui.check_uis_for_change(src) else - to_chat(user, "There is already something in \the [src].") + to_chat(user, span("notice", "There is already something in \the [src].")) else if(istype(O, /obj/item/device/toner)) if(toner <= 10) //allow replacing when low toner is affecting the print darkness - to_chat(user, "You insert \the [O] into \the [src].") + to_chat(user, span("notice", "You insert \the [O] into \the [src].")) flick("photocopier_toner", src) - playsound(loc, 'sound/effects/Switch1.ogg', 50, 1) + playsound(loc, "switchsounds", 50, 1) var/obj/item/device/toner/T = O toner += T.toner_amount user.drop_from_inventory(O,get_turf(src)) qdel(O) SSvueui.check_uis_for_change(src) else - to_chat(user, "This cartridge is not yet ready for replacement! Use up the rest of the toner.") + to_chat(user, span("notice", "This cartridge is not yet ready for replacement! Use up the rest of the toner.")) flick("photocopier_notoner", src) playsound(loc, 'sound/machines/buzz-two.ogg', 75, 1) else if(O.iswrench()) playsound(loc, O.usesound, 50, 1) anchored = !anchored - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + to_chat(user, span("notice", "You [anchored ? "wrench" : "unwrench"] \the [src].")) return /obj/machinery/photocopier/proc/copy_type(var/c_item = copyitem) // helper proc to reduce ctrl+c ctrl+v @@ -136,7 +136,7 @@ VUEUI_MONITOR_VARS(/obj/machinery/photocopier, photocopiermonitor) sleep(15*B.pages.len) return B else - to_chat(usr, "\The [c_item] can't be copied by \the [src].") + to_chat(usr, span("warning", "\The [c_item] can't be copied by \the [src].")) return FALSE /obj/machinery/photocopier/ex_act(severity) @@ -193,7 +193,7 @@ VUEUI_MONITOR_VARS(/obj/machinery/photocopier, photocopiermonitor) toner-- if(toner == 0) - visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") + visible_message(span("notice", "A red light on \the [src] flashes, indicating that it is out of toner.")) flick("photocopier_notoner", src) playsound(loc, 'sound/machines/buzz-two.ogg', 75, 1) return @@ -221,7 +221,7 @@ VUEUI_MONITOR_VARS(/obj/machinery/photocopier, photocopiermonitor) toner -= 5 //photos use a lot of ink! if(toner < 0) toner = 0 - visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") + visible_message(span("notice", "A red light on \the [src] flashes, indicating that it is out of toner.")) flick("photocopier_notoner", src) playsound(loc, 'sound/machines/buzz-two.ogg', 75, 1) return p @@ -232,7 +232,7 @@ VUEUI_MONITOR_VARS(/obj/machinery/photocopier, photocopiermonitor) for(var/obj/item/W in bundle.pages) if(toner <= 0 && need_toner) toner = 0 - visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") + visible_message(span("notice", "A red light on \the [src] flashes, indicating that it is out of toner.")) flick("photocopier_notoner", src) playsound(loc, 'sound/machines/buzz-two.ogg', 75, 1) break diff --git a/code/modules/power/lights/bulbs.dm b/code/modules/power/lights/bulbs.dm index 2d1f8b2a22a..0fa39518267 100644 --- a/code/modules/power/lights/bulbs.dm +++ b/code/modules/power/lights/bulbs.dm @@ -181,5 +181,5 @@ status = LIGHT_BROKEN force = 5 sharp = 1 - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1) update() diff --git a/code/modules/power/lights/fixtures.dm b/code/modules/power/lights/fixtures.dm index 927f3f70b96..2c3bdd04915 100644 --- a/code/modules/power/lights/fixtures.dm +++ b/code/modules/power/lights/fixtures.dm @@ -520,7 +520,7 @@ if(!skip_sound_and_sparks) if(status == LIGHT_OK || status == LIGHT_BURNED) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1) if(!stat) spark(src, 3) status = LIGHT_BROKEN diff --git a/code/modules/random_map/automata/diona.dm b/code/modules/random_map/automata/diona.dm index 2228fdeb7e0..7178b15af27 100644 --- a/code/modules/random_map/automata/diona.dm +++ b/code/modules/random_map/automata/diona.dm @@ -42,6 +42,25 @@ light_power = 3 light_range = 3 light_color = "#557733" + density = 0 + +/obj/structure/diona/bulb/attackby(obj/item/W, mob/user) + if(W.iswelder()) + var/obj/item/weldingtool/WT = W + if (!WT.welding) + to_chat(user, "\The [WT] must be turned on!") + return + else if (WT.remove_fuel(0,user)) + to_chat(user, "You begin slicing through the skin of \the [src].") + if(do_after(user, 20/W.toolspeed, act_target = src)) + if(QDELETED(src) || !WT.isOn()) + return + playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) + user.visible_message("\ [user] slices through the skin of \the [src], revealing a confused diona nymph.") + else + return + spawn_diona_nymph(src.loc) + qdel(src) /obj/structure/diona/bulb/unpowered name = "unpowered glow bulb" diff --git a/html/changelog.html b/html/changelog.html index 54254296b5b..8afe99556d0 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,20 @@ -->
+

02 February 2020

+

Geeves updated:

+ +

Wowzewow (Wezzy) updated:

+ +

01 February 2020

Geeves updated: