Merge pull request #3791 from Fox-McCloud/goon-immersion-sounds

Implements a Few Goon Sounds
This commit is contained in:
TheDZD
2016-03-09 17:08:05 -05:00
52 changed files with 164 additions and 18 deletions
@@ -151,6 +151,7 @@
for(var/mob/O in viewers(usr))
O.show_message("\red \the [src] rattles and prints out a sheet of paper.", 1)
playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1)
sleep(10)
var/obj/item/weapon/paper/P = new(usr.loc)
@@ -93,7 +93,7 @@
mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [M.name] exclaims, \"[msg]\""
return
mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [M.name] says, \"[msg]\""
/obj/item/device/taperecorder/hear_message(mob/living/M as mob, msg)
if(mytape && recording)
mytape.timestamp += mytape.used_capacity
@@ -221,6 +221,7 @@
return
usr << "<span class='notice'>Transcript printed.</span>"
playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1)
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src))
var/t1 = "<B>Transcript:</B><BR><BR>"
for(var/i = 1, mytape.storedinfo.len >= i, i++)
+1 -5
View File
@@ -50,11 +50,7 @@
species_hair = hair_styles_list
var/h_new_style = input(user, "Select a hair style", "Grooming") as null|anything in species_hair
user.visible_message("<span class='notice'>[user] starts cutting [M]'s hair!</span>", "<span class='notice'>You start cutting [M]'s hair!</span>") //arguments for this are: 1. what others see 2. what the user sees. --Fixed grammar, (TGameCo)
playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
spawn(5)
playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
spawn(10)
playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
playsound(loc, "sound/goonstation/misc/Scissor.ogg", 100, 1)
if(do_after(user, 50, target = H)) //this is the part that adds a delay. delay is in deciseconds. --Made it 5 seconds, because hair isn't cut in one second in real life, and I want at least a little bit longer time, (TGameCo)
if(!(M in view(1))) //Adjacency test
user.visible_message("<span class='notice'>[user] stops cutting [M]'s hair.</span>", "<span class='notice'>You stop cutting [M]'s hair.</span>")
@@ -583,6 +583,7 @@
W.lit = 1
W.icon_state = "match_lit"
processing_objects.Add(W)
playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1)
W.update_icon()
return