diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 197848d9ad..6993fa6e0f 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -206,7 +206,7 @@
else if((occupant.health >= heal_level || occupant.health == occupant.getMaxHealth()) && (!eject_wait))
playsound(src, 'sound/machines/medbayscanner1.ogg', 50, 1)
- audible_message("\The [src] signals that the cloning process is complete.", runemessage = "* ding *")
+ audible_message("\The [src] signals that the cloning process is complete.", runemessage = "ding")
connected_message("Cloning Process Complete.")
locked = 0
go_out()
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index df72c0d767..14fae598ff 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -519,9 +519,9 @@
if(electronics)
sleep(10)
if(oldfuel > fuel && oldfood > food)
- src.audible_message("\The [src] lets out a somehow reassuring chime.", runemessage = "* reassuring chime *")
+ src.audible_message("\The [src] lets out a somehow reassuring chime.", runemessage = "reassuring chime")
else if(oldfuel < fuel || oldfood < food)
- src.audible_message("\The [src] lets out a somehow ominous chime.", runemessage = "* ominous chime *")
+ src.audible_message("\The [src] lets out a somehow ominous chime.", runemessage = "ominous chime")
food = oldfood
fuel = oldfuel
diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm
index 3741366e41..ba6248bf70 100644
--- a/code/game/objects/items/devices/defib.dm
+++ b/code/game/objects/items/devices/defib.dm
@@ -460,7 +460,7 @@
return
playsound(src, 'sound/machines/defib_charge.ogg', 50, 0)
- audible_message("\The [src] lets out a steadily rising hum...", runemessage = "* whines *")
+ audible_message("\The [src] lets out a steadily rising hum...", runemessage = "whines")
if(!do_after(user, chargetime, H))
return
@@ -527,7 +527,7 @@
H.setBrainLoss(brain_damage)
/obj/item/weapon/shockpaddles/proc/make_announcement(var/message, var/msg_class)
- audible_message("\The [src] [message]", "\The [src] vibrates slightly.", runemessage = "* buzz *")
+ audible_message("\The [src] [message]", "\The [src] vibrates slightly.", runemessage = "buzz")
/obj/item/weapon/shockpaddles/emag_act(mob/user)
if(safety)
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 3e16975fbe..4e5032b6b9 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -264,7 +264,7 @@
playsleepseconds = 1
sleep(10)
T = get_turf(src)
- T.audible_message("Tape Recorder: End of recording.", runemessage = "* click *")
+ T.audible_message("Tape Recorder: End of recording.", runemessage = "click")
break
else
playsleepseconds = mytape.timestamp[i+1] - mytape.timestamp[i]
@@ -272,7 +272,7 @@
if(playsleepseconds > 14)
sleep(10)
T = get_turf(src)
- T.audible_message("Tape Recorder: Skipping [playsleepseconds] seconds of silence", runemessage = "* tape winding *")
+ T.audible_message("Tape Recorder: Skipping [playsleepseconds] seconds of silence", runemessage = "tape winding")
playsleepseconds = 1
sleep(10 * playsleepseconds)
@@ -282,7 +282,7 @@
if(emagged)
var/turf/T = get_turf(src)
- T.audible_message("Tape Recorder: This tape recorder will self-destruct in... Five.", runemessage = "* beep beep *")
+ T.audible_message("Tape Recorder: This tape recorder will self-destruct in... Five.", runemessage = "beep beep")
sleep(10)
T = get_turf(src)
T.audible_message("Tape Recorder: Four.")
diff --git a/code/game/objects/items/devices/text_to_speech.dm b/code/game/objects/items/devices/text_to_speech.dm
index edbb49b6a8..e962124022 100644
--- a/code/game/objects/items/devices/text_to_speech.dm
+++ b/code/game/objects/items/devices/text_to_speech.dm
@@ -24,6 +24,6 @@
var/message = sanitize(input(user,"Choose a message to relay to those around you.") as text|null)
if(message)
- audible_message("[bicon(src)] \The [src.name] states, \"[message]\"", runemessage = "* synthesized speech *")
+ audible_message("[bicon(src)] \The [src.name] states, \"[message]\"", runemessage = "synthesized speech")
if(ismob(loc))
loc.audible_message("", runemessage = "\[TTS Voice\] [message]")
diff --git a/code/modules/admin/verbs/smite_vr.dm b/code/modules/admin/verbs/smite_vr.dm
index f065293a26..e8441b1b31 100644
--- a/code/modules/admin/verbs/smite_vr.dm
+++ b/code/modules/admin/verbs/smite_vr.dm
@@ -104,7 +104,7 @@
sleep(1 SECOND)
shadekin.dir = SOUTH
sleep(1 SECOND)
- shadekin.audible_message("[shadekin] belches loudly!", runemessage = "* URRRRRP *")
+ shadekin.audible_message("[shadekin] belches loudly!", runemessage = "URRRRRP")
sleep(2 SECONDS)
shadekin.phase_shift()
target.transforming = FALSE //Undo cheap hack
diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm
index 7ecd123cd0..b799e58bf6 100644
--- a/code/modules/clothing/under/accessories/accessory_vr.dm
+++ b/code/modules/clothing/under/accessories/accessory_vr.dm
@@ -144,7 +144,7 @@
if(usr.stat) return
if(!jingled)
- usr.audible_message("[usr] jingles the [src]'s bell.", runemessage = "* jingle *")
+ usr.audible_message("[usr] jingles the [src]'s bell.", runemessage = "jingle")
playsound(src, 'sound/items/pickup/ring.ogg', 50, 1)
jingled = 1
addtimer(CALLBACK(src, .proc/jingledreset), 50)
diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index 3baccce8e3..bd1dfc0bd6 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -87,7 +87,7 @@
if(use_emote.message_type == AUDIBLE_MESSAGE && is_muzzled())
var/muffle_message = use_emote.emote_message_muffled || "makes a muffled sound."
- audible_message("\The [src] [muffle_message]", runemessage = "* [muffle_message] *")
+ audible_message("\The [src] [muffle_message]", runemessage = "[muffle_message]")
return
next_emote = world.time + use_emote.emote_delay
diff --git a/code/modules/multiz/ladders.dm b/code/modules/multiz/ladders.dm
index c979720302..b1f5b08f6d 100644
--- a/code/modules/multiz/ladders.dm
+++ b/code/modules/multiz/ladders.dm
@@ -98,7 +98,7 @@
"You begin climbing [direction] \the [src]!",
"You hear the grunting and clanging of a metal ladder being used.")
- target_ladder.audible_message("You hear something coming [direction] \the [src]", runemessage = "* clank clank *")
+ target_ladder.audible_message("You hear something coming [direction] \the [src]", runemessage = "clank clank")
if(do_after(M, climb_time, src))
var/turf/T = get_turf(target_ladder)
diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index 3a01921cb6..195ad86a38 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -59,7 +59,7 @@
if(lattice)
var/pull_up_time = max(5 SECONDS + (src.movement_delay() * 10), 1)
to_chat(src, "You grab \the [lattice] and start pulling yourself upward...")
- destination.audible_message("You hear something climbing up \the [lattice].", runemessage = "* clank clang *")
+ destination.audible_message("You hear something climbing up \the [lattice].", runemessage = "clank clang")
if(do_after(src, pull_up_time))
to_chat(src, "You pull yourself up.")
else
@@ -74,7 +74,7 @@
if(!destination?.Enter(src, old_dest))
to_chat(src, "There's something in the way up above in that direction, try another.")
return 0
- destination.audible_message("You hear something climbing up \the [catwalk].", runemessage = "* clank clang *")
+ destination.audible_message("You hear something climbing up \the [catwalk].", runemessage = "clank clang")
if(do_after(src, pull_up_time))
to_chat(src, "You pull yourself up.")
else
@@ -90,8 +90,8 @@
return 0
var/fly_time = max(7 SECONDS + (H.movement_delay() * 10), 1) //So it's not too useful for combat. Could make this variable somehow, but that's down the road.
to_chat(src, "You begin to fly upwards...")
- destination.audible_message("You hear the flapping of wings.", runemessage = "* flap flap *")
- H.audible_message("[H] begins to flap \his wings, preparing to move upwards!", runemessage = "* flap flap *")
+ destination.audible_message("You hear the flapping of wings.", runemessage = "flap flap")
+ H.audible_message("[H] begins to flap \his wings, preparing to move upwards!", runemessage = "flap flap")
if(do_after(H, fly_time) && H.flying)
to_chat(src, "You fly upwards.")
else
diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm
index 182fd6c3f3..40f2183dc7 100644
--- a/code/modules/overmap/ships/engines/gas_thruster.dm
+++ b/code/modules/overmap/ships/engines/gas_thruster.dm
@@ -150,7 +150,7 @@
if(!is_on())
return 0
if(!check_fuel() || (use_power_oneoff(charge_per_burn) < charge_per_burn) || check_blockage())
- audible_message(src,"[src] coughs once and goes silent!", runemessage = "* sputtercough *")
+ audible_message(src,"[src] coughs once and goes silent!", runemessage = "sputtercough")
update_use_power(USE_POWER_OFF)
return 0
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 08e3e6b5ef..10812e2486 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -111,28 +111,28 @@
playsound(src, "sound/machines/copier.ogg", 100, 1)
sleep(11)
copy(copyitem)
- audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "* whirr *")
+ audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr")
playsound(src, "sound/machines/buzzbeep.ogg", 30)
else if (istype(copyitem, /obj/item/weapon/photo))
playsound(src, "sound/machines/copier.ogg", 100, 1)
sleep(11)
photocopy(copyitem)
- audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "* whirr *")
+ audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr")
playsound(src, "sound/machines/buzzbeep.ogg", 30)
else if (istype(copyitem, /obj/item/weapon/paper_bundle))
sleep(11)
playsound(src, "sound/machines/copier.ogg", 100, 1)
var/obj/item/weapon/paper_bundle/B = bundlecopy(copyitem)
sleep(11*B.pages.len)
- audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "* whirr *")
+ audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr")
playsound(src, "sound/machines/buzzbeep.ogg", 30)
else if (has_buckled_mobs()) // VOREStation EDIT: For ass-copying.
playsound(src, "sound/machines/copier.ogg", 100, 1)
- audible_message("You can hear [src] whirring as it attempts to scan.", runemessage = "* whirr *")
+ audible_message("You can hear [src] whirring as it attempts to scan.", runemessage = "whirr")
sleep(rand(20,45)) // Sit with your bare ass on the copier for a random time, feel like a fool, get stared at.
copyass(user)
sleep(15)
- audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "* whirr *")
+ audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr")
playsound(src, "sound/machines/buzzbeep.ogg", 30)
else
to_chat(user, "\The [copyitem] can't be copied by [src].")
diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm
index a39e383aff..eea444fbf6 100644
--- a/code/modules/projectiles/guns/magnetic/bore.dm
+++ b/code/modules/projectiles/guns/magnetic/bore.dm
@@ -208,7 +208,7 @@
/obj/item/weapon/gun/magnetic/matfed/phoronbore/process()
if(generator_state && !mat_storage)
- audible_message(SPAN_NOTICE("\The [src] goes quiet."),SPAN_NOTICE("A motor noise cuts out."), runemessage = "* goes quiet *")
+ audible_message(SPAN_NOTICE("\The [src] goes quiet."),SPAN_NOTICE("A motor noise cuts out."), runemessage = "goes quiet")
soundloop.stop()
generator_state = GEN_OFF
@@ -258,12 +258,12 @@
soundloop.start()
time_started = world.time
cell?.use(100)
- audible_message(SPAN_NOTICE("\The [src] starts chugging."),SPAN_NOTICE("A motor noise starts up."), runemessage = "* whirr *")
+ audible_message(SPAN_NOTICE("\The [src] starts chugging."),SPAN_NOTICE("A motor noise starts up."), runemessage = "whirr")
generator_state = GEN_IDLE
else if(generator_state > GEN_OFF && time_started + 3 SECONDS < world.time)
soundloop.stop()
- audible_message(SPAN_NOTICE("\The [src] goes quiet."),SPAN_NOTICE("A motor noise cuts out."), runemessage = "* goes quiet *")
+ audible_message(SPAN_NOTICE("\The [src] goes quiet."),SPAN_NOTICE("A motor noise cuts out."), runemessage = "goes quiet")
generator_state = GEN_OFF
/obj/item/weapon/gun/magnetic/matfed/phoronbore/loaded
diff --git a/code/modules/projectiles/guns/magnetic/magnetic.dm b/code/modules/projectiles/guns/magnetic/magnetic.dm
index ce96a138d8..e49966256b 100644
--- a/code/modules/projectiles/guns/magnetic/magnetic.dm
+++ b/code/modules/projectiles/guns/magnetic/magnetic.dm
@@ -271,6 +271,7 @@
if(loaded) //Safety.
if(istype(loaded, /obj/item/weapon/fuel_assembly))
var/obj/item/weapon/fuel_assembly/rod = loaded
+<<<<<<< HEAD
//CHOMPEdit Begin
switch(rod.fuel_type)
if("composite") //Safety check for rods spawned in without a fueltype.
@@ -287,6 +288,47 @@
spawn(5)
visible_message("\The [src] begins to rattle, its acceleration chamber collapsing in on itself!")
removable_components = FALSE
+||||||| parent of defb874fe3... Merge pull request #10511 from VOREStation/Arokha/runestars
+ if(rod.fuel_type == "composite" || rod.fuel_type == "deuterium") //Safety check for rods spawned in without a fueltype.
+ projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod
+ else if(rod.fuel_type == "tritium")
+ projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/tritium
+ else if(rod.fuel_type == "phoron")
+ projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/phoron
+ else if(rod.fuel_type == "supermatter")
+ projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/supermatter
+ visible_message("The barrel of \the [src] glows a blinding white!")
+ spawn(5)
+ visible_message("\The [src] begins to rattle, its acceleration chamber collapsing in on itself!")
+ removable_components = FALSE
+ spawn(15)
+ audible_message("\The [src]'s power supply begins to overload as the device crumples!", runemessage = "* VWRRRRRRRR *") //Why are you still holding this?
+ playsound(src, 'sound/effects/grillehit.ogg', 10, 1)
+ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
+ var/turf/T = get_turf(src)
+ sparks.set_up(2, 1, T)
+ sparks.start()
+=======
+ if(rod.fuel_type == "composite" || rod.fuel_type == "deuterium") //Safety check for rods spawned in without a fueltype.
+ projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod
+ else if(rod.fuel_type == "tritium")
+ projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/tritium
+ else if(rod.fuel_type == "phoron")
+ projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/phoron
+ else if(rod.fuel_type == "supermatter")
+ projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/supermatter
+ visible_message("The barrel of \the [src] glows a blinding white!")
+ spawn(5)
+ visible_message("\The [src] begins to rattle, its acceleration chamber collapsing in on itself!")
+ removable_components = FALSE
+ spawn(15)
+ audible_message("\The [src]'s power supply begins to overload as the device crumples!", runemessage = "VWRRRRRRRR") //Why are you still holding this?
+ playsound(src, 'sound/effects/grillehit.ogg', 10, 1)
+ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
+ var/turf/T = get_turf(src)
+ sparks.set_up(2, 1, T)
+ sparks.start()
+>>>>>>> defb874fe3... Merge pull request #10511 from VOREStation/Arokha/runestars
spawn(15)
audible_message("\The [src]'s power supply begins to overload as the device crumples!", runemessage = "* VWRRRRRRRR *") //Why are you still holding this?
playsound(src, 'sound/effects/grillehit.ogg', 10, 1)
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index c5f53897c6..044f627a6b 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -130,12 +130,12 @@ var/global/list/obj/machinery/message_server/message_servers = list()
if(2)
if(!Console.silent)
playsound(Console, 'sound/machines/twobeep.ogg', 50, 1)
- Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5, runemessage = "* beep! beep! *")
+ Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5, runemessage = "beep! beep!")
Console.message_log += list(list("High Priority message from [sender]", "[authmsg]"))
else
if(!Console.silent)
playsound(Console, 'sound/machines/twobeep.ogg', 50, 1)
- Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'Message from [sender]'"),,4, runemessage = "* beep beep *")
+ Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'Message from [sender]'"),,4, runemessage = "beep beep")
Console.message_log += list(list("Message from [sender]", "[authmsg]"))
Console.set_light(2)
diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index c94a4eca8a..53d4910776 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -154,7 +154,7 @@
else if(((occupant.health == occupant.maxHealth)) && (!eject_wait))
playsound(src, 'sound/machines/ding.ogg', 50, 1)
- audible_message("\The [src] signals that the growing process is complete.", runemessage = "* ding *")
+ audible_message("\The [src] signals that the growing process is complete.", runemessage = "ding")
connected_message("Growing Process Complete.")
locked = 0
go_out()
diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm
index 7f4cc22aba..1112a384fe 100644
--- a/code/modules/shuttles/shuttles_web.dm
+++ b/code/modules/shuttles/shuttles_web.dm
@@ -119,7 +119,7 @@
continue
if(!H.shuttle_comp || !(get_area(H) in shuttle_area))
H.shuttle_comp = null
- H.audible_message("\The [H] pings as it loses it's connection with the ship.", runemessage = "* ping *")
+ H.audible_message("\The [H] pings as it loses it's connection with the ship.", runemessage = "ping")
H.update_hud("discon")
helmets -= H
else
diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm
index d8f8373f09..9468179122 100644
--- a/code/modules/turbolift/turbolift.dm
+++ b/code/modules/turbolift/turbolift.dm
@@ -28,7 +28,7 @@
priority_mode = TRUE
cancel_pending_floors()
update_ext_panel_icons()
- control_panel_interior.audible_message("This turbolift is responding to a priority call. Please exit the lift when it stops and make way.", runemessage = "* BUZZ *")
+ control_panel_interior.audible_message("This turbolift is responding to a priority call. Please exit the lift when it stops and make way.", runemessage = "BUZZ")
spawn(time)
priority_mode = FALSE
update_ext_panel_icons()
@@ -158,7 +158,7 @@
doors_closing = 0
if(!fire_mode)
open_doors()
- control_panel_interior.audible_message("\The [current_floor.ext_panel] buzzes loudly.", runemessage = "* BUZZ *")
+ control_panel_interior.audible_message("\The [current_floor.ext_panel] buzzes loudly.", runemessage = "BUZZ")
playsound(control_panel_interior, "sound/machines/buzz-two.ogg", 50, 1)
return 0
diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm
index e3719bc97e..dddfb4e60f 100644
--- a/code/modules/turbolift/turbolift_console.dm
+++ b/code/modules/turbolift/turbolift_console.dm
@@ -130,10 +130,10 @@
return
lift.update_fire_mode(!lift.fire_mode)
if(lift.fire_mode)
- audible_message("Firefighter Mode Activated. Door safeties disabled. Manual control engaged.", runemessage = "* SCREECH *")
+ audible_message("Firefighter Mode Activated. Door safeties disabled. Manual control engaged.", runemessage = "SCREECH")
playsound(src, 'sound/machines/airalarm.ogg', 25, 0, 4, volume_channel = VOLUME_CHANNEL_ALARMS)
else
- audible_message("Firefighter Mode Deactivated. Door safeties enabled. Automatic control engaged.", runemessage = "* ding *")
+ audible_message("Firefighter Mode Deactivated. Door safeties enabled. Automatic control engaged.", runemessage = "ding")
return
. = ..()
diff --git a/code/modules/turbolift/turbolift_door.dm b/code/modules/turbolift/turbolift_door.dm
index d21e344097..7a41056ca1 100644
--- a/code/modules/turbolift/turbolift_door.dm
+++ b/code/modules/turbolift/turbolift_door.dm
@@ -40,7 +40,7 @@
if(!moved) // nowhere to go....
LM.gib()
else // the mob is too big to just move, so we need to give up what we're doing
- audible_message("\The [src]'s motors grind as they quickly reverse direction, unable to safely close.", runemessage = "* WRRRRR *")
+ audible_message("\The [src]'s motors grind as they quickly reverse direction, unable to safely close.", runemessage = "WRRRRR")
cur_command = null // the door will just keep trying otherwise
return 0
return ..()
\ No newline at end of file