From b44924b156ee952bae495b7876e26b9bc0c04955 Mon Sep 17 00:00:00 2001
From: Belsima <31827220+Belsima@users.noreply.github.com>
Date: Mon, 27 Nov 2017 16:38:00 -0500
Subject: [PATCH] Boop! (#4348)
* Cleanbot sounds.
* Floorbot sounds.
* grammer
* Update floorbot.dm
---
code/modules/mob/living/bot/cleanbot.dm | 10 ++++++----
code/modules/mob/living/bot/floorbot.dm | 7 +++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm
index d4cb723861..4f9f81156f 100644
--- a/code/modules/mob/living/bot/cleanbot.dm
+++ b/code/modules/mob/living/bot/cleanbot.dm
@@ -1,6 +1,6 @@
/mob/living/bot/cleanbot
name = "Cleanbot"
- desc = "A little cleaning robot, he looks so excited!"
+ desc = "A little cleaning robot, it looks so excited!"
icon_state = "cleanbot0"
req_one_access = list(access_robotics, access_janitor)
botcard_access = list(access_janitor, access_maint_tunnels)
@@ -21,7 +21,8 @@
/mob/living/bot/cleanbot/handleIdle()
if(!screwloose && !oddbutton && prob(5))
- custom_emote(2, "makes an excited beeping booping sound!")
+ custom_emote(2, "makes an excited booping sound!")
+ playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0)
if(screwloose && prob(5)) // Make a mess
if(istype(loc, /turf/simulated))
@@ -29,7 +30,7 @@
T.wet_floor()
if(oddbutton && prob(5)) // Make a big mess
- visible_message("Something flies out of [src]. He seems to be acting oddly.")
+ visible_message("Something flies out of [src]. It seems to be acting oddly.")
var/obj/effect/decal/cleanable/blood/gibs/gib = new /obj/effect/decal/cleanable/blood/gibs(loc)
// TODO - I have a feeling weakrefs will not work in ignore_list, verify this ~Leshana
var/weakref/g = weakref(gib)
@@ -150,6 +151,7 @@
if(!screwloose || !oddbutton)
if(user)
user << "The [src] buzzes and beeps."
+ playsound(src.loc, 'sound/machines/buzzbeep.ogg', 50, 0)
oddbutton = 1
screwloose = 1
return 1
@@ -199,4 +201,4 @@
return
if(!in_range(src, usr) && src.loc != usr)
return
- created_name = t
\ No newline at end of file
+ created_name = t
diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm
index a843206e5e..95c83dcaa0 100644
--- a/code/modules/mob/living/bot/floorbot.dm
+++ b/code/modules/mob/living/bot/floorbot.dm
@@ -6,7 +6,7 @@
/mob/living/bot/floorbot
name = "Floorbot"
- desc = "A little floor repairing robot, he looks so excited!"
+ desc = "A little floor repairing robot, it looks so excited!"
icon_state = "floorbot0"
req_one_access = list(access_robotics, access_construction)
wait_if_pulled = 1
@@ -58,6 +58,7 @@
emagged = 1
if(user)
user << "The [src] buzzes and beeps."
+ playsound(src.loc, 'sound/machines/buzzbeep.ogg', 50, 0)
return 1
/mob/living/bot/floorbot/Topic(href, href_list)
@@ -100,7 +101,8 @@
addTiles(1)
if(prob(1))
- custom_emote(2, "makes an excited booping beeping sound!")
+ custom_emote(2, "makes an excited beeping sound!")
+ playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
/mob/living/bot/floorbot/handleAdjacentTarget()
if(get_turf(target) == src.loc)
@@ -276,6 +278,7 @@
/mob/living/bot/floorbot/explode()
turn_off()
visible_message("\The [src] blows apart!")
+ playsound(src.loc, "sparks", 50, 1)
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)