diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm
index 4e62c20d74b65..0876b69f520f9 100644
--- a/_maps/shuttles/emergency_medisim.dmm
+++ b/_maps/shuttles/emergency_medisim.dmm
@@ -693,17 +693,7 @@
/turf/open/misc/sandy_dirt,
/area/shuttle/escape/simulation)
"Cv" = (
-/obj/machinery/drone_dispenser{
- desc = "A hefty machine that periodically creates a pair of binoculars. Really, Nanotrasen? We're getting this lazy?";
- dispense_type = /obj/item/binoculars;
- end_create_message = "dispenses a pair of binoculars.";
- glass_cost = 0;
- iron_cost = 0;
- maximum_idle = 1;
- name = "binoculars fabricator";
- energy_used = 0;
- starting_amount = 25000
- },
+/obj/machinery/drone_dispenser/binoculars,
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"Cy" = (
diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm
index 5495033651a89..af39257973cce 100644
--- a/code/game/machinery/droneDispenser.dm
+++ b/code/game/machinery/droneDispenser.dm
@@ -27,7 +27,7 @@
var/mode = DRONE_READY
var/timer
- var/cooldownTime = 1800 //3 minutes
+ var/cooldownTime = 3 MINUTES
var/production_time = 30
//The item the dispenser will create
var/dispense_type = /obj/effect/mob_spawn/ghost_role/drone
@@ -59,7 +59,8 @@
MATCONTAINER_EXAMINE, \
allowed_items = /obj/item/stack \
)
- materials.insert_amount_mat(starting_amount)
+ materials.insert_amount_mat(starting_amount, /datum/material/iron)
+ materials.insert_amount_mat(starting_amount, /datum/material/glass)
materials.precise_insertion = TRUE
using_materials = list(/datum/material/iron = iron_cost, /datum/material/glass = glass_cost)
REGISTER_REQUIRED_MAP_ITEM(1, 1)
@@ -136,6 +137,19 @@
recharge_sound = null
recharge_message = null
+// A dispenser that produces binoculars, for the MediSim shuttle.
+/obj/machinery/drone_dispenser/binoculars
+ name = "binoculars fabricator"
+ desc = "A hefty machine that periodically creates a pair of binoculars. Really, Nanotrasen? We're getting this lazy?"
+ dispense_type = /obj/item/binoculars
+ starting_amount = SHEET_MATERIAL_AMOUNT * 2.5 //Redudant
+ maximum_idle = 1
+ cooldownTime = 5 SECONDS
+ iron_cost = 0
+ glass_cost = 0
+ energy_used = 0
+ end_create_message = "dispenses a pair of binoculars."
+
/obj/machinery/drone_dispenser/examine(mob/user)
. = ..()
var/material_requirement_string = "It needs "
@@ -155,7 +169,7 @@
if((machine_stat & (NOPOWER|BROKEN)) || !anchored)
return
- if(!materials.has_materials(using_materials))
+ if((glass_cost != 0 || iron_cost != 0) && !materials.has_materials(using_materials))
return // We require more minerals
// We are currently in the middle of something
diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm
index 4a3de80959f53..2aec478162445 100644
--- a/code/game/objects/items/mail.dm
+++ b/code/game/objects/items/mail.dm
@@ -488,7 +488,7 @@
/obj/item/storage/mail_counterfeit_device
name = "GLA-2 mail counterfeit device"
- desc = "Device that actually able to counterfeit NT's mail. This device also able to place a trap inside of mail for malicious actions. Trap will \"activate\" any item inside of mail. Also it might be used for contraband purposes. Integrated micro-computer will give you great configuration optionality for your needs."
+ desc = "A single-use device for spoofing official NT envelopes. Can hold one normal sized object, and can be programmed to arm its contents when opened."
w_class = WEIGHT_CLASS_NORMAL
icon = 'icons/obj/antags/syndicate_tools.dmi'
icon_state = "mail_counterfeit_device"
@@ -501,7 +501,7 @@
/obj/item/storage/mail_counterfeit_device/examine_more(mob/user)
. = ..()
- . += span_notice("You notice the manufacture marking on the side of the device...")
+ . += span_notice("You notice the manufacturer information on the side of the device...")
. += "\t[span_info("Guerilla Letter Assembler")]"
. += "\t[span_info("GLA Postal Service, right on schedule.")]"
return .
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 3a4ce82d85e51..96b2d10440d4e 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -449,7 +449,7 @@
/obj/item/storage/box/syndie_kit/mail_counterfeit
name = "mail counterfeit kit"
- desc = "A box full of mail counterfeit devices. Nothing stops the mail."
+ desc = "A GLA Postal Service branded box. It's emblazoned with the motto: *Nothing stops the mail*."
/obj/item/storage/box/syndie_kit/mail_counterfeit/PopulateContents()
for(var/i in 1 to 6)
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index cf5d5a83e8dfe..c72c97fb73402 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -61,6 +61,8 @@ GLOBAL_LIST_EMPTY(antagonists)
var/default_custom_objective = "Cause chaos on the space station."
/// Whether we give a hardcore random bonus for greentexting as this antagonist while playing hardcore random
var/hardcore_random_bonus = FALSE
+ /// A path to the audio stinger that plays upon gaining this datum.
+ var/stinger_sound
//ANTAG UI
@@ -342,6 +344,14 @@ GLOBAL_LIST_EMPTY(antagonists)
/datum/antagonist/proc/greet()
if(!silent)
to_chat(owner.current, span_big("You are \the [src]."))
+ play_stinger()
+
+/// Plays the antag stinger sound, if we have one
+/datum/antagonist/proc/play_stinger()
+ if(isnull(stinger_sound))
+ return
+
+ owner.current.playsound_local(get_turf(owner.current), stinger_sound, 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
/**
* Proc that sends fluff or instructional messages to the player when they lose this antag datum.
diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm
index a4e1f2e5dcc8a..9f02e5cb167f9 100644
--- a/code/modules/antagonists/abductor/abductor.dm
+++ b/code/modules/antagonists/abductor/abductor.dm
@@ -74,6 +74,7 @@
objectives += team.objectives
finalize_abductor()
ADD_TRAIT(owner, TRAIT_ABDUCTOR_TRAINING, ABDUCTOR_ANTAGONIST)
+ owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ayylien.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
return ..()
/datum/antagonist/abductor/on_removal()
diff --git a/code/modules/antagonists/battlecruiser/battlecruiser.dm b/code/modules/antagonists/battlecruiser/battlecruiser.dm
index 8560300698f80..bcc2fc963309a 100644
--- a/code/modules/antagonists/battlecruiser/battlecruiser.dm
+++ b/code/modules/antagonists/battlecruiser/battlecruiser.dm
@@ -20,6 +20,7 @@
antag_hud_name = "battlecruiser_crew"
antagpanel_category = ANTAG_GROUP_SYNDICATE
job_rank = ROLE_BATTLECRUISER_CREW
+ stinger_sound = 'sound/ambience/antag/ops.ogg'
/// Team to place the crewmember on.
var/datum/team/battlecruiser/battlecruiser_team
@@ -27,7 +28,7 @@
return battlecruiser_team
/datum/antagonist/battlecruiser/greet()
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0, use_reverb = FALSE)
+ play_stinger()
to_chat(owner, span_big("You are a [name]!"))
owner.announce_objectives()
diff --git a/code/modules/antagonists/blob/blob_antag.dm b/code/modules/antagonists/blob/blob_antag.dm
index 07ca14586e1f5..9cad238bb0011 100644
--- a/code/modules/antagonists/blob/blob_antag.dm
+++ b/code/modules/antagonists/blob/blob_antag.dm
@@ -6,6 +6,7 @@
show_in_antagpanel = FALSE
job_rank = ROLE_BLOB
ui_name = "AntagInfoBlob"
+ stinger_sound = 'sound/ambience/antag/blobalert.ogg'
/// Action to release a blob infection
var/datum/action/innate/blobpop/pop_action
/// Initial points for a human blob
@@ -31,8 +32,6 @@
else
has_already_popped = TRUE
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/blobalert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
-
/datum/antagonist/blob/on_gain()
create_objectives()
. = ..()
diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm
index 9cfd0cbf55d94..b62b18a02aedf 100644
--- a/code/modules/antagonists/brother/brother.dm
+++ b/code/modules/antagonists/brother/brother.dm
@@ -9,6 +9,7 @@
suicide_cry = "FOR MY BROTHER!!"
antag_moodlet = /datum/mood_event/focused
hardcore_random_bonus = TRUE
+ stinger_sound = 'sound/ambience/antag/tatoralert.ogg'
VAR_PRIVATE
datum/team/brother_team/team
@@ -172,7 +173,7 @@
owner.announce_objectives()
/datum/antagonist/brother/proc/finalize_brother()
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
+ play_stinger()
team.update_name()
/datum/antagonist/brother/admin_add(datum/mind/new_owner,mob/admin)
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index 8d1068baa1368..d0aaa2671c414 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -14,6 +14,7 @@
can_assign_self_objectives = TRUE
default_custom_objective = "Consume the station's most valuable genomes."
hardcore_random_bonus = TRUE
+ stinger_sound = 'sound/ambience/antag/ling_alert.ogg'
/// Whether to give this changeling objectives or not
var/give_objectives = TRUE
/// Weather we assign objectives which compete with other lings
@@ -127,7 +128,6 @@
if(give_objectives)
forge_objectives()
owner.current.get_language_holder().omnitongue = TRUE
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ling_alert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
return ..()
/datum/antagonist/changeling/apply_innate_effects(mob/living/mob_override)
@@ -1023,6 +1023,7 @@
total_chem_storage = 50
/datum/antagonist/changeling/headslug/greet()
+ play_stinger()
to_chat(owner, span_boldannounce("You are a fresh changeling birthed from a headslug! \
You aren't as strong as a normal changeling, as you are newly born."))
@@ -1035,6 +1036,7 @@
return finish_preview_icon(final_icon)
/datum/antagonist/changeling/space/greet()
+ play_stinger()
to_chat(src, span_changeling("Our mind stirs to life, from the depths of an endless slumber..."))
/datum/outfit/changeling
diff --git a/code/modules/antagonists/cult/datums/cultist.dm b/code/modules/antagonists/cult/datums/cultist.dm
index 1129af14055f2..b0fbea4421aa9 100644
--- a/code/modules/antagonists/cult/datums/cultist.dm
+++ b/code/modules/antagonists/cult/datums/cultist.dm
@@ -7,6 +7,7 @@
preview_outfit = /datum/outfit/cultist
job_rank = ROLE_CULTIST
antag_hud_name = "cult"
+ stinger_sound = 'sound/ambience/antag/bloodcult/bloodcult_gain.ogg'
///The vote ability Cultists have to elect someone to be the leader.
var/datum/action/innate/cult/mastervote/vote_ability
@@ -23,7 +24,6 @@
/datum/antagonist/cult/greet()
. = ..()
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/bloodcult/bloodcult_gain.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)//subject to change
owner.announce_objectives()
/datum/antagonist/cult/on_gain()
diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm
index 416dbe390e16f..2c31529ed3386 100644
--- a/code/modules/antagonists/heretic/heretic_antag.dm
+++ b/code/modules/antagonists/heretic/heretic_antag.dm
@@ -26,6 +26,7 @@
can_assign_self_objectives = TRUE
default_custom_objective = "Turn a department into a testament for your dark knowledge."
hardcore_random_bonus = TRUE
+ stinger_sound = 'sound/ambience/antag/heretic/heretic_gain.ogg'
/// Whether we give this antagonist objectives on gain.
var/give_objectives = TRUE
/// Whether we've ascended! (Completed one of the final rituals)
@@ -206,8 +207,6 @@
if(give_objectives)
forge_primary_objectives()
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/heretic/heretic_gain.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
-
for(var/starting_knowledge in GLOB.heretic_start_knowledge)
gain_knowledge(starting_knowledge)
diff --git a/code/modules/antagonists/heretic/heretic_monsters.dm b/code/modules/antagonists/heretic/heretic_monsters.dm
index 1f95ed62ea92f..31b18b6a83353 100644
--- a/code/modules/antagonists/heretic/heretic_monsters.dm
+++ b/code/modules/antagonists/heretic/heretic_monsters.dm
@@ -8,13 +8,10 @@
antag_hud_name = "heretic_beast"
suicide_cry = "MY MASTER SMILES UPON ME!!"
show_in_antagpanel = FALSE
+ stinger_sound = 'sound/ambience/antag/heretic/heretic_gain.ogg'
/// Our master (a heretic)'s mind.
var/datum/mind/master
-/datum/antagonist/heretic_monster/on_gain()
- . = ..()
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/heretic/heretic_gain.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
-
/datum/antagonist/heretic_monster/on_removal()
if(!silent)
if(master?.current)
diff --git a/code/modules/antagonists/nukeop/datums/operative.dm b/code/modules/antagonists/nukeop/datums/operative.dm
index 3b4c9fa4da7ce..9eca88d33852d 100644
--- a/code/modules/antagonists/nukeop/datums/operative.dm
+++ b/code/modules/antagonists/nukeop/datums/operative.dm
@@ -8,6 +8,7 @@
show_to_ghosts = TRUE
hijack_speed = 2 //If you can't take out the station, take the shuttle instead.
suicide_cry = "FOR THE SYNDICATE!!"
+ stinger_sound = 'sound/ambience/antag/ops.ogg'
/// Which nukie team are we on?
var/datum/team/nuclear/nuke_team
/// If not assigned a team by default ops will try to join existing ones, set this to TRUE to always create new team.
@@ -30,7 +31,7 @@
var/discount_limited_amount = 10
/datum/antagonist/nukeop/greet()
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0, use_reverb = FALSE)
+ play_stinger()
to_chat(owner, span_big("You are a [nuke_team ? nuke_team.syndicate_name : "syndicate"] agent!"))
owner.announce_objectives()
diff --git a/code/modules/antagonists/nukeop/datums/operative_leader.dm b/code/modules/antagonists/nukeop/datums/operative_leader.dm
index 0c583bfe794b0..c2995e5575326 100644
--- a/code/modules/antagonists/nukeop/datums/operative_leader.dm
+++ b/code/modules/antagonists/nukeop/datums/operative_leader.dm
@@ -21,7 +21,7 @@
H.update_icons()
/datum/antagonist/nukeop/leader/greet()
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0, use_reverb = FALSE)
+ play_stinger()
to_chat(owner, "You are the Syndicate [title] for this mission. You are responsible for guiding the team and your ID is the only one who can open the launch bay doors.")
to_chat(owner, "If you feel you are not up to this task, give your ID and radio to another operative.")
if(!CONFIG_GET(flag/disable_warops))
diff --git a/code/modules/antagonists/obsessed/obsessed.dm b/code/modules/antagonists/obsessed/obsessed.dm
index db934c90df604..7316102e2ce09 100644
--- a/code/modules/antagonists/obsessed/obsessed.dm
+++ b/code/modules/antagonists/obsessed/obsessed.dm
@@ -12,6 +12,7 @@
suicide_cry = "FOR MY LOVE!!"
preview_outfit = /datum/outfit/obsessed
hardcore_random_bonus = TRUE
+ stinger_sound = 'sound/ambience/antag/creepalert.ogg'
var/datum/brain_trauma/special/obsessed/trauma
/datum/antagonist/obsessed/admin_add(datum/mind/new_owner,mob/admin)
@@ -28,7 +29,7 @@
C.gain_trauma(/datum/brain_trauma/special/obsessed)//ZAP
/datum/antagonist/obsessed/greet()
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/creepalert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
+ play_stinger()
owner.announce_objectives()
/datum/antagonist/obsessed/Destroy()
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index e34907d64ae46..fa07215cf6715 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -6,6 +6,7 @@
antag_moodlet = /datum/mood_event/revolution
antag_hud_name = "rev"
suicide_cry = "VIVA LA REVOLUTION!!"
+ stinger_sound = 'sound/ambience/antag/revolutionary_tide.ogg'
var/datum/team/revolution/rev_team
/// When this antagonist is being de-antagged, this is the source. Can be a mob (for mindshield/blunt force trauma) or a #define string.
@@ -67,7 +68,6 @@
/datum/antagonist/rev/greet()
. = ..()
to_chat(owner, span_userdanger("Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!"))
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/revolutionary_tide.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
owner.announce_objectives()
/datum/antagonist/rev/create_team(datum/team/revolution/new_team)
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index aba8c279456df..733e22461c795 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -17,6 +17,7 @@
can_assign_self_objectives = TRUE
default_custom_objective = "Perform an overcomplicated heist on valuable Nanotrasen assets."
hardcore_random_bonus = TRUE
+ stinger_sound = 'sound/ambience/antag/tatoralert.ogg'
///The flag of uplink that this traitor is supposed to have.
var/uplink_flag_given = UPLINK_TRAITORS
@@ -114,8 +115,6 @@
owner.teach_crafting_recipe(/datum/crafting_recipe/syndicate_uplink_beacon)
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
-
return ..()
/datum/antagonist/traitor/on_removal()
diff --git a/code/modules/mining/equipment/grapple_gun.dm b/code/modules/mining/equipment/grapple_gun.dm
index 6a8b2ec305328..4e61b5d0fb3fd 100644
--- a/code/modules/mining/equipment/grapple_gun.dm
+++ b/code/modules/mining/equipment/grapple_gun.dm
@@ -2,7 +2,7 @@
/obj/item/grapple_gun
name = "grapple gun"
- desc = "A handy tool for traversing the land-scape of lava-land!"
+ desc = "A small specialised airgun capable of launching a climbing hook into a distant rock face and pulling the user toward it via motorised zip-line. A handy tool for traversing the craggy landscape of lavaland!"
icon = 'icons/obj/mining.dmi'
icon_state = "grapple_gun"
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm
index 40e0092d434dc..98378a9422a03 100644
--- a/code/modules/uplink/uplink_items/job.dm
+++ b/code/modules/uplink/uplink_items/job.dm
@@ -18,7 +18,7 @@
/datum/uplink_item/role_restricted/mail_counterfeit_kit
name = "GLA Brand Mail Counterfeit Kit"
- desc = "A box full of mail counterfeit devices. Devices that actually able to counterfeit NT's mail. Those devices also able to place a trap inside of mail for malicious actions. Trap will \"activate\" any item inside of mail. Also counterfieted mail might be used for contraband purposes. Integrated micro-computer will give you great configuration optionality for your needs. \nNothing stops the mail."
+ desc = "A box of five (5) counterfeit devices. Each single-use device can hold one normal sized object, and impersonate an ordinary postal envelope addressed to whoever you choose. Optionally, can be rigged to activate held items - great for if you want to surprise someone with a primed grenade!"
item = /obj/item/storage/box/syndie_kit/mail_counterfeit
cost = 2
illegal_tech = FALSE
diff --git a/html/changelogs/AutoChangeLog-pr-84070.yml b/html/changelogs/AutoChangeLog-pr-84070.yml
deleted file mode 100644
index 0f52be52df6b4..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84070.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LucyGrind"
-delete-after: True
-changes:
- - bugfix: "crayons interact with washing machine once again"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84155.yml b/html/changelogs/AutoChangeLog-pr-84155.yml
new file mode 100644
index 0000000000000..5b99d012a7a91
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84155.yml
@@ -0,0 +1,5 @@
+author: "Rhials"
+delete-after: True
+changes:
+ - bugfix: "Drone fabricator subtypes that spawn pre-loaded now actually start with materials inside."
+ - bugfix: "The binocular fabriactor on the MediSim shuttle works again."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84175.yml b/html/changelogs/AutoChangeLog-pr-84175.yml
deleted file mode 100644
index 8a5aadd5d189a..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84175.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "GoblinBackwards"
-delete-after: True
-changes:
- - rscadd: "Breathing nitrium now has a chance to make you burp."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84176.yml b/html/changelogs/AutoChangeLog-pr-84176.yml
deleted file mode 100644
index 646d9e0f796f8..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84176.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - rscadd: "Adds an effect for emagging a fake emag"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84178.yml b/html/changelogs/AutoChangeLog-pr-84178.yml
deleted file mode 100644
index 6c733f8e7b635..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84178.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LT3"
-delete-after: True
-changes:
- - bugfix: "Smartfridge will now correctly respond 'no power' instead of 'forbidden item' when it doesn't have power"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84180.yml b/html/changelogs/AutoChangeLog-pr-84180.yml
new file mode 100644
index 0000000000000..ba812904516a5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84180.yml
@@ -0,0 +1,4 @@
+author: "Rhials"
+delete-after: True
+changes:
+ - sound: "The abductor team now has their own antag stinger."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84181.yml b/html/changelogs/AutoChangeLog-pr-84181.yml
new file mode 100644
index 0000000000000..7631a664e9f59
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84181.yml
@@ -0,0 +1,4 @@
+author: "DaCoolBoss"
+delete-after: True
+changes:
+ - spellcheck: "Grapple gun's description has been updated."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84182.yml b/html/changelogs/AutoChangeLog-pr-84182.yml
deleted file mode 100644
index d1a9c48888d7d..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84182.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - bugfix: "Touch Spells now apply click CD again"
- - bugfix: "Touch Spells now apply fingerprints again"
- - bugfix: "Touch Spells now check if your hands are blocked again"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84183.yml b/html/changelogs/AutoChangeLog-pr-84183.yml
deleted file mode 100644
index 7157e07f3274f..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84183.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DATA, with sounds by Beebblie"
-delete-after: True
-changes:
- - sound: "Added sounds for turning on and off internals."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84193.yml b/html/changelogs/AutoChangeLog-pr-84193.yml
deleted file mode 100644
index 973f83442ebb4..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84193.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Bisar"
-delete-after: True
-changes:
- - balance: "Sparks have been heavily adjusted; they only affect items made of plasma, pools of welding fuel, flammable people, cigarettes, and items that contain reagents... for now. Their long-standing behavior of igniting flammable gas has been untouched."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84212.yml b/html/changelogs/AutoChangeLog-pr-84212.yml
deleted file mode 100644
index 6487a3d5f8930..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84212.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Rhials"
-delete-after: True
-changes:
- - bugfix: "Admin-only deadchat broadcasts don't append a second \"this message is for admins only\" string for every admin online."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84213.yml b/html/changelogs/AutoChangeLog-pr-84213.yml
deleted file mode 100644
index cd7df37946b71..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84213.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes:
- - rscadd: "The game settings menu can now actually be accessed through the escape menu."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84215.yml b/html/changelogs/AutoChangeLog-pr-84215.yml
new file mode 100644
index 0000000000000..7466a3b2006aa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84215.yml
@@ -0,0 +1,4 @@
+author: "DaCoolBoss"
+delete-after: True
+changes:
+ - spellcheck: "rewrote GLA device's description for clarity"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84216.yml b/html/changelogs/AutoChangeLog-pr-84216.yml
deleted file mode 100644
index ea8d9d1294f2e..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84216.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - bugfix: "Bloody footprints now go until you run out of blood on your feet instead if only a single tile"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84219.yml b/html/changelogs/AutoChangeLog-pr-84219.yml
deleted file mode 100644
index f21db76dfdb94..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84219.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - rscadd: "Adds an effect for emagging an emag"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84221.yml b/html/changelogs/AutoChangeLog-pr-84221.yml
deleted file mode 100644
index fdad8684400c5..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84221.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Paxilmaniac"
-delete-after: True
-changes:
- - rscadd: "Electric eels now prefer used car batteries for bait."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84224.yml b/html/changelogs/AutoChangeLog-pr-84224.yml
deleted file mode 100644
index ab53e5b1013a5..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84224.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes:
- - qol: "Oven trays now count as valid trays to cut food on."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84227.yml b/html/changelogs/AutoChangeLog-pr-84227.yml
deleted file mode 100644
index 341482fef14e2..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84227.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - bugfix: "Fixed plate shards not randomizing icon correctly"
- - qol: "Gives plate sharts a more fitting hitsound / caltrop sound, gives them a set caltrop stun duration (instead of default)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84236.yml b/html/changelogs/AutoChangeLog-pr-84236.yml
deleted file mode 100644
index f45e9aae81aa7..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84236.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kocma-san"
-delete-after: True
-changes:
- - bugfix: "you can hold Ian in your arms"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84243.yml b/html/changelogs/AutoChangeLog-pr-84243.yml
deleted file mode 100644
index 59c4dc8544400..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84243.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - bugfix: "Fix DNA vault probes"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml
index 87b304d39cdab..c7345de5701b7 100644
--- a/html/changelogs/archive/2024-06.yml
+++ b/html/changelogs/archive/2024-06.yml
@@ -1008,3 +1008,41 @@
by clicking the hololadder and netpod respectively.
- rscdel: Removed the starfront saloon BR map.
- bugfix: 'Syndicate assault map: Added pistols, reduced exploits.'
+2024-06-24:
+ Bisar:
+ - balance: Sparks have been heavily adjusted; they only affect items made of plasma,
+ pools of welding fuel, flammable people, cigarettes, and items that contain
+ reagents... for now. Their long-standing behavior of igniting flammable gas
+ has been untouched.
+ DATA, with sounds by Beebblie:
+ - sound: Added sounds for turning on and off internals.
+ GoblinBackwards:
+ - rscadd: Breathing nitrium now has a chance to make you burp.
+ Kocma-san:
+ - bugfix: you can hold Ian in your arms
+ LT3:
+ - bugfix: Smartfridge will now correctly respond 'no power' instead of 'forbidden
+ item' when it doesn't have power
+ LucyGrind:
+ - bugfix: crayons interact with washing machine once again
+ Melbert:
+ - bugfix: Touch Spells now apply click CD again
+ - bugfix: Touch Spells now apply fingerprints again
+ - bugfix: Touch Spells now check if your hands are blocked again
+ - bugfix: Fixed plate shards not randomizing icon correctly
+ - qol: Gives plate sharts a more fitting hitsound / caltrop sound, gives them a
+ set caltrop stun duration (instead of default)
+ - bugfix: Fix DNA vault probes
+ - bugfix: Bloody footprints now go until you run out of blood on your feet instead
+ if only a single tile
+ - rscadd: Adds an effect for emagging an emag
+ - rscadd: Adds an effect for emagging a fake emag
+ Paxilmaniac:
+ - rscadd: Electric eels now prefer used car batteries for bait.
+ Rhials:
+ - bugfix: Admin-only deadchat broadcasts don't append a second "this message is
+ for admins only" string for every admin online.
+ ShizCalev:
+ - qol: Oven trays now count as valid trays to cut food on.
+ - rscadd: The game settings menu can now actually be accessed through the escape
+ menu.
diff --git a/sound/ambience/antag/ayylien.ogg b/sound/ambience/antag/ayylien.ogg
new file mode 100644
index 0000000000000..cfcb748fd775d
Binary files /dev/null and b/sound/ambience/antag/ayylien.ogg differ
diff --git a/sound/attributions.txt b/sound/attributions.txt
index 29c86945dd1a1..528542e59ca78 100644
--- a/sound/attributions.txt
+++ b/sound/attributions.txt
@@ -192,3 +192,7 @@ https://freesound.org/people/BMacZero/sounds/96137/
valve_opening.ogg was made by mixing water flowing samples from:
https://freesound.org/people/scriotxstudios/sounds/349111/?attribution=1 and squeaky scrape sound from:
https://freesound.org/people/Department64/sounds/669028/ which was modified with lower pitch
+
+ayylien.ogg was made by remixing:
+SCIRetro_Energy Swells Synth_Funky Audio_Sonics Spices by Funky_Audio under CC0 -- https://freesound.org/people/realtheremin/sounds/119011/
+scifi_scare_a.aiff by realtheremin under CC0 -- https://freesound.org/people/Funky_Audio/sounds/729392/
\ No newline at end of file