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/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/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/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/html/changelogs/wezzy_optable_autopsy.yml b/html/changelogs/wezzy_optable_autopsy.yml
new file mode 100644
index 00000000000..9f157e20a9f
--- /dev/null
+++ b/html/changelogs/wezzy_optable_autopsy.yml
@@ -0,0 +1,43 @@
+################################
+# 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
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# 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:
+ - soundadd: "Switching the operating table's neural suppressor on and off should play a sound now."
+ - tweak: "Tweaks the autopsy scanner sprite, and printing autopsy reports play a sound now."
+
diff --git a/icons/obj/autopsy_scanner.dmi b/icons/obj/autopsy_scanner.dmi
deleted file mode 100644
index 82c47de4c1a..00000000000
Binary files a/icons/obj/autopsy_scanner.dmi and /dev/null differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index c6e8e92b314..b5a4fa32689 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/sound/bureaucracy/print_short.ogg b/sound/bureaucracy/print_short.ogg
new file mode 100644
index 00000000000..d2475b6fddb
Binary files /dev/null and b/sound/bureaucracy/print_short.ogg differ
diff --git a/sound/effects/switch1.ogg b/sound/effects/switch1.ogg
deleted file mode 100644
index b9ece70204d..00000000000
Binary files a/sound/effects/switch1.ogg and /dev/null differ